summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in6
-rw-r--r--mk/kernel-ver.mk8
-rw-r--r--mk/modules.mk62
-rw-r--r--target/arm/cubox-i/patches/3.15-rc6/rmk.patch (renamed from target/arm/cubox-i/patches/3.15-rc5/rmk.patch)820
-rw-r--r--target/arm/cubox-i/patches/3.15-rc6/sdma-firmware-cubox-i.patch (renamed from target/arm/cubox-i/patches/3.15-rc5/sdma-firmware-cubox-i.patch)0
-rw-r--r--target/linux/config/Config.in.graphics2
-rw-r--r--target/linux/patches/3.15-rc6/bsd-compatibility.patch (renamed from target/linux/patches/3.15-rc5/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/defaults.patch (renamed from target/linux/patches/3.15-rc5/defaults.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/disable-netfilter.patch (renamed from target/linux/patches/3.15-rc5/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.15-rc5/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/gemalto.patch (renamed from target/linux/patches/3.15-rc5/gemalto.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.15-rc5/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/lemote-rfkill.patch (renamed from target/linux/patches/3.15-rc5/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/microblaze-axi.patch (renamed from target/linux/patches/3.15-rc5/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/microblaze-ethernet.patch (renamed from target/linux/patches/3.15-rc5/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/mtd-rootfs.patch (renamed from target/linux/patches/3.15-rc5/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/nfsv3-tcp.patch (renamed from target/linux/patches/3.15-rc5/nfsv3-tcp.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/non-static.patch (renamed from target/linux/patches/3.15-rc5/non-static.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.15-rc5/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/startup.patch (renamed from target/linux/patches/3.15-rc5/startup.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/uuid.patch (renamed from target/linux/patches/3.15-rc5/uuid.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/wlan-cf.patch (renamed from target/linux/patches/3.15-rc5/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/xargs.patch (renamed from target/linux/patches/3.15-rc5/xargs.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/yaffs2.patch (renamed from target/linux/patches/3.15-rc5/yaffs2.patch)0
-rw-r--r--target/linux/patches/3.15-rc6/zlib-inflate.patch (renamed from target/linux/patches/3.15-rc5/zlib-inflate.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.15-rc6/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.15-rc5/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.15-rc6/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.15-rc5/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.15-rc6/relocs.patch (renamed from toolchain/kernel-headers/patches/3.15-rc5/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.15-rc6/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.15-rc5/sgidefs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.15-rc6/sortext.patch (renamed from toolchain/kernel-headers/patches/3.15-rc5/sortext.patch)0
30 files changed, 437 insertions, 461 deletions
diff --git a/Config.in b/Config.in
index aa24b7f51..892fab4a4 100644
--- a/Config.in
+++ b/Config.in
@@ -104,8 +104,8 @@ choice
prompt "Kernel Version"
default ADK_KERNEL_VERSION_3_14_4
-config ADK_KERNEL_VERSION_3_15_RC5
- prompt "3.15-rc5"
+config ADK_KERNEL_VERSION_3_15_RC6
+ prompt "3.15-rc6"
boolean
config ADK_KERNEL_VERSION_3_14_4
@@ -143,7 +143,7 @@ endchoice
config ADK_KERNEL_VERSION
string
- default "3.15-rc5" if ADK_KERNEL_VERSION_3_15_RC5
+ default "3.15-rc6" if ADK_KERNEL_VERSION_3_15_RC6
default "3.14.4" if ADK_KERNEL_VERSION_3_14_4
default "3.13.11" if ADK_KERNEL_VERSION_3_13_11
default "3.12.20" if ADK_KERNEL_VERSION_3_12_20
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index d05998491..6a01710cd 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= c7c565d14833550faa39ef8279272182
endif
-ifeq ($(ADK_KERNEL_VERSION_3_15_RC5),y)
-KERNEL_VERSION:= 3.15-rc5
-KERNEL_MOD_VERSION:= 3.15.0-rc5
+ifeq ($(ADK_KERNEL_VERSION_3_15_RC6),y)
+KERNEL_VERSION:= 3.15-rc6
+KERNEL_MOD_VERSION:= 3.15.0-rc6
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= b030ddc3f1581c4675c31e51f3551089
+KERNEL_MD5SUM:= 2f6ee0845fa66391696db2be6cd69cf9
endif
ifeq ($(ADK_KERNEL_VERSION_3_14_4),y)
KERNEL_VERSION:= 3.14.4
diff --git a/mk/modules.mk b/mk/modules.mk
index 4192bda3c..9f6ef3cad 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1110,22 +1110,44 @@ $(eval $(call KMOD_template,SOUND,sound,\
$(eval $(call KMOD_template,SND,snd,\
$(MODULES_DIR)/kernel/sound/core/snd \
$(MODULES_DIR)/kernel/sound/core/snd-timer \
+,35))
+
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),10)
+$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
+ $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
+ $(MODULES_DIR)/kernel/sound/core/snd-pcm \
+,40))
+else
+$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
+ $(MODULES_DIR)/kernel/sound/core/snd-pcm \
,40))
+endif
+endif
$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
$(MODULES_DIR)/kernel/sound/core/snd-compress \
-,42))
+,45))
$(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
-,42))
+,45))
$(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\
$(MODULES_DIR)/kernel/sound/ac97_bus \
$(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \
,50))
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),10)
+$(eval $(call KMOD_template,SND_SOC_SPDIF,snd-soc-spdif,\
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-tx \
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-rx \
+,50))
+endif
+endif
+
$(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\
$(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \
$(MODULES_DIR)/kernel/sound/pci/snd-via82xx \
@@ -1143,27 +1165,6 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
-ifeq ($(KERNEL_BASE),3)
-ifeq ($(KERNEL_MAJ),10)
-$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
- $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
- $(MODULES_DIR)/kernel/sound/core/snd-pcm \
-,53))
-$(eval $(call KMOD_template,SND_SOC_SPDIF,snd-soc-spdif,\
- $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-tx \
- $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-spdif-rx \
-,56))
-else
-$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
- $(MODULES_DIR)/kernel/sound/core/snd-pcm \
-,53))
-endif
-endif
-
-$(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\
- $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
-,54))
-
$(eval $(call KMOD_template,SND_SOC,snd-soc,\
$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
,55))
@@ -1176,30 +1177,30 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
-,57, kmod-snd-soc))
+,60, kmod-snd-soc))
$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
$(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \
$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \
$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
-,57, kmod-snd-soc kmod-snd-compress))
+,60, kmod-snd-soc kmod-snd-compress))
$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
-,57))
+,60))
$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
-,57, kmod-snd-soc))
+,60, kmod-snd-soc))
$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
-,57, kmod-snd-bcm2709-soc-i2s))
+,65, kmod-snd-bcm2709-soc-i2s))
$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2709-soc-hifiberry-digi,\
$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
-,57, kmod-snd-bcm2709-soc-i2s))
+,65, kmod-snd-bcm2709-soc-i2s))
$(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
$(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
@@ -1348,9 +1349,8 @@ $(eval $(call KMOD_template,USB_HSO,usb-hso,\
$(MODULES_DIR)/kernel/drivers/net/usb/hso \
,75))
-SNDUSB:=snd-usbmidi-lib
$(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
- $(MODULES_DIR)/kernel/sound/usb/$(SNDUSB) \
+ $(MODULES_DIR)/kernel/sound/usb/snd-usbmidi-lib \
$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
,75))
diff --git a/target/arm/cubox-i/patches/3.15-rc5/rmk.patch b/target/arm/cubox-i/patches/3.15-rc6/rmk.patch
index ae847fc06..83afb1a78 100644
--- a/target/arm/cubox-i/patches/3.15-rc5/rmk.patch
+++ b/target/arm/cubox-i/patches/3.15-rc6/rmk.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.15-rc4/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-07 17:05:41.464107257 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.15-rc6/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-23 11:26:48.244939835 +0200
@@ -67,6 +67,14 @@
status = "okay";
};
@@ -57,9 +57,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.
pinctrl_hummingboard_spdif: hummingboard-spdif {
fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
};
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.15-rc4/arch/arm/boot/dts/imx6q-cubox-i.dts
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-07 17:05:41.464107257 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.15-rc6/arch/arm/boot/dts/imx6q-cubox-i.dts
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-23 11:26:48.244939835 +0200
@@ -13,4 +13,8 @@
&sata {
@@ -69,9 +69,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.15-rc4
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
};
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.15-rc4/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-07 17:05:41.464107257 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.15-rc6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -12,6 +12,19 @@
pinctrl-0 = <&pinctrl_cubox_i_ir>;
};
@@ -195,9 +195,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.15-
vmmc-supply = <&reg_3p3v>;
cd-gpios = <&gpio1 4 0>;
status = "okay";
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.15-rc4/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-07 17:05:41.464107257 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.15-rc6/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -128,6 +128,8 @@
cache-level = <2>;
arm,tag-latency = <4 2 3>;
@@ -207,9 +207,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.15-rc4/arch
};
pcie: pcie@0x01000000 {
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.15-rc4/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.15-rc6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -1,9 +1,69 @@
/*
* Copyright (C) 2013,2014 Russell King
@@ -340,9 +340,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.15
+ pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_microsom_usdhc1>;
+ vmmc-supply = <&reg_brcm>;
+};
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.15-rc4/arch/arm/boot/dts/imx6sl.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/imx6sl.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/imx6sl.dtsi 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.15-rc6/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/imx6sl.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/imx6sl.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -111,6 +111,8 @@
cache-level = <2>;
arm,tag-latency = <4 2 3>;
@@ -352,9 +352,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.15-rc4/arch/
};
pmu {
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/marco.dtsi linux-3.15-rc4/arch/arm/boot/dts/marco.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/marco.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/marco.dtsi 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/marco.dtsi linux-3.15-rc6/arch/arm/boot/dts/marco.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/marco.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/marco.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -36,7 +36,7 @@
ranges = <0x40000000 0x40000000 0xa0000000>;
@@ -364,9 +364,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/marco.dtsi linux-3.15-rc4/arch/a
reg = <0xc0030000 0x1000>;
interrupts = <0 59 0>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/prima2.dtsi linux-3.15-rc4/arch/arm/boot/dts/prima2.dtsi
---- linux-3.15-rc4.orig/arch/arm/boot/dts/prima2.dtsi 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/boot/dts/prima2.dtsi 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/boot/dts/prima2.dtsi linux-3.15-rc6/arch/arm/boot/dts/prima2.dtsi
+--- linux-3.15-rc6.orig/arch/arm/boot/dts/prima2.dtsi 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/boot/dts/prima2.dtsi 2014-05-23 11:26:48.244939835 +0200
@@ -48,7 +48,7 @@
ranges = <0x40000000 0x40000000 0x80000000>;
@@ -376,9 +376,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/boot/dts/prima2.dtsi linux-3.15-rc4/arch/
reg = <0x80040000 0x1000>;
interrupts = <59>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.15-rc4.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.15-rc4/arch/arm/configs/imx_v6_v7_defconfig
---- linux-3.15-rc4.orig/arch/arm/configs/imx_v6_v7_defconfig 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/configs/imx_v6_v7_defconfig 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.15-rc6/arch/arm/configs/imx_v6_v7_defconfig
+--- linux-3.15-rc6.orig/arch/arm/configs/imx_v6_v7_defconfig 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/configs/imx_v6_v7_defconfig 2014-05-23 11:26:48.248939848 +0200
@@ -245,6 +245,7 @@
CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_IPUV3_CORE=y
@@ -387,9 +387,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.15-rc
CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
-diff -Nur linux-3.15-rc4.orig/arch/arm/include/asm/hardware/cache-l2x0.h linux-3.15-rc4/arch/arm/include/asm/hardware/cache-l2x0.h
---- linux-3.15-rc4.orig/arch/arm/include/asm/hardware/cache-l2x0.h 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/include/asm/hardware/cache-l2x0.h 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/include/asm/hardware/cache-l2x0.h linux-3.15-rc6/arch/arm/include/asm/hardware/cache-l2x0.h
+--- linux-3.15-rc6.orig/arch/arm/include/asm/hardware/cache-l2x0.h 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/include/asm/hardware/cache-l2x0.h 2014-05-23 11:26:48.248939848 +0200
@@ -26,8 +26,8 @@
#define L2X0_CACHE_TYPE 0x004
#define L2X0_CTRL 0x100
@@ -528,9 +528,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/include/asm/hardware/cache-l2x0.h linux-3
#define L2X0_CTRL_EN 1
-diff -Nur linux-3.15-rc4.orig/arch/arm/include/asm/outercache.h linux-3.15-rc4/arch/arm/include/asm/outercache.h
---- linux-3.15-rc4.orig/arch/arm/include/asm/outercache.h 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/include/asm/outercache.h 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/include/asm/outercache.h linux-3.15-rc6/arch/arm/include/asm/outercache.h
+--- linux-3.15-rc6.orig/arch/arm/include/asm/outercache.h 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/include/asm/outercache.h 2014-05-23 11:26:48.248939848 +0200
@@ -21,6 +21,7 @@
#ifndef __ASM_OUTERCACHE_H
#define __ASM_OUTERCACHE_H
@@ -659,9 +659,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/include/asm/outercache.h linux-3.15-rc4/a
static inline void outer_sync(void)
{
if (outer_cache.sync)
-diff -Nur linux-3.15-rc4.orig/arch/arm/Kconfig linux-3.15-rc4/arch/arm/Kconfig
---- linux-3.15-rc4.orig/arch/arm/Kconfig 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/Kconfig 2014-05-07 17:05:49.488157029 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/Kconfig linux-3.15-rc6/arch/arm/Kconfig
+--- linux-3.15-rc6.orig/arch/arm/Kconfig 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/Kconfig 2014-05-23 11:26:48.248939848 +0200
@@ -1230,19 +1230,6 @@
register of the Cortex-A9 which reduces the linefill issuing
capabilities of the processor.
@@ -741,9 +741,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/Kconfig linux-3.15-rc4/arch/arm/Kconfig
config ARM_ERRATA_775420
bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
depends on CPU_V7
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-berlin/berlin.c linux-3.15-rc4/arch/arm/mach-berlin/berlin.c
---- linux-3.15-rc4.orig/arch/arm/mach-berlin/berlin.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-berlin/berlin.c 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-berlin/berlin.c linux-3.15-rc6/arch/arm/mach-berlin/berlin.c
+--- linux-3.15-rc6.orig/arch/arm/mach-berlin/berlin.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-berlin/berlin.c 2014-05-23 11:26:48.256939874 +0200
@@ -24,7 +24,7 @@
* with DT probing for L2CCs, berlin_init_machine can be removed.
* Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
@@ -753,9 +753,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-berlin/berlin.c linux-3.15-rc4/arch/
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-cns3xxx/core.c linux-3.15-rc4/arch/arm/mach-cns3xxx/core.c
---- linux-3.15-rc4.orig/arch/arm/mach-cns3xxx/core.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-cns3xxx/core.c 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-cns3xxx/core.c linux-3.15-rc6/arch/arm/mach-cns3xxx/core.c
+--- linux-3.15-rc6.orig/arch/arm/mach-cns3xxx/core.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-cns3xxx/core.c 2014-05-23 11:26:48.256939874 +0200
@@ -272,9 +272,9 @@
*
* 1 cycle of latency for setup, read and write accesses
@@ -784,9 +784,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-cns3xxx/core.c linux-3.15-rc4/arch/a
}
#endif /* CONFIG_CACHE_L2X0 */
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/common.h linux-3.15-rc4/arch/arm/mach-exynos/common.h
---- linux-3.15-rc4.orig/arch/arm/mach-exynos/common.h 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-exynos/common.h 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-exynos/common.h linux-3.15-rc6/arch/arm/mach-exynos/common.h
+--- linux-3.15-rc6.orig/arch/arm/mach-exynos/common.h 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-exynos/common.h 2014-05-23 11:26:48.256939874 +0200
@@ -55,7 +55,6 @@
NUM_SYS_POWERDOWN,
};
@@ -795,9 +795,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/common.h linux-3.15-rc4/arch/
struct exynos_pmu_conf {
void __iomem *reg;
unsigned int val[NUM_SYS_POWERDOWN];
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/exynos.c linux-3.15-rc4/arch/arm/mach-exynos/exynos.c
---- linux-3.15-rc4.orig/arch/arm/mach-exynos/exynos.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-exynos/exynos.c 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-exynos/exynos.c linux-3.15-rc6/arch/arm/mach-exynos/exynos.c
+--- linux-3.15-rc6.orig/arch/arm/mach-exynos/exynos.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-exynos/exynos.c 2014-05-23 11:26:48.256939874 +0200
@@ -32,9 +32,6 @@
#include "mfc.h"
#include "regs-pmu.h"
@@ -827,9 +827,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/exynos.c linux-3.15-rc4/arch/
}
early_initcall(exynos4_l2x0_cache_init);
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/sleep.S linux-3.15-rc4/arch/arm/mach-exynos/sleep.S
---- linux-3.15-rc4.orig/arch/arm/mach-exynos/sleep.S 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-exynos/sleep.S 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-exynos/sleep.S linux-3.15-rc6/arch/arm/mach-exynos/sleep.S
+--- linux-3.15-rc6.orig/arch/arm/mach-exynos/sleep.S 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-exynos/sleep.S 2014-05-23 11:26:48.256939874 +0200
@@ -16,8 +16,6 @@
*/
@@ -874,9 +874,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-exynos/sleep.S linux-3.15-rc4/arch/a
-l2x0_regs_phys:
- .long 0
-#endif
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-highbank/highbank.c linux-3.15-rc4/arch/arm/mach-highbank/highbank.c
---- linux-3.15-rc4.orig/arch/arm/mach-highbank/highbank.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-highbank/highbank.c 2014-05-07 17:05:49.492157054 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-highbank/highbank.c linux-3.15-rc6/arch/arm/mach-highbank/highbank.c
+--- linux-3.15-rc6.orig/arch/arm/mach-highbank/highbank.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-highbank/highbank.c 2014-05-23 11:26:48.256939874 +0200
@@ -51,11 +51,13 @@
}
@@ -910,9 +910,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-highbank/highbank.c linux-3.15-rc4/a
}
}
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.15-rc4/arch/arm/mach-imx/clk-pllv3.c
---- linux-3.15-rc4.orig/arch/arm/mach-imx/clk-pllv3.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-imx/clk-pllv3.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.15-rc6/arch/arm/mach-imx/clk-pllv3.c
+--- linux-3.15-rc6.orig/arch/arm/mach-imx/clk-pllv3.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-imx/clk-pllv3.c 2014-05-23 11:26:48.256939874 +0200
@@ -273,9 +273,10 @@
struct clk_pllv3 *pll = to_clk_pllv3(hw);
unsigned long min_rate = parent_rate * 27;
@@ -958,9 +958,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.15-rc4/arch/
}
static const struct clk_ops clk_pllv3_av_ops = {
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/mach-vf610.c linux-3.15-rc4/arch/arm/mach-imx/mach-vf610.c
---- linux-3.15-rc4.orig/arch/arm/mach-imx/mach-vf610.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-imx/mach-vf610.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-imx/mach-vf610.c linux-3.15-rc6/arch/arm/mach-imx/mach-vf610.c
+--- linux-3.15-rc6.orig/arch/arm/mach-imx/mach-vf610.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-imx/mach-vf610.c 2014-05-23 11:26:48.256939874 +0200
@@ -22,7 +22,7 @@
static void __init vf610_init_irq(void)
@@ -970,9 +970,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/mach-vf610.c linux-3.15-rc4/arch
irqchip_init();
}
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.15-rc4/arch/arm/mach-imx/suspend-imx6.S
---- linux-3.15-rc4.orig/arch/arm/mach-imx/suspend-imx6.S 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-imx/suspend-imx6.S 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.15-rc6/arch/arm/mach-imx/suspend-imx6.S
+--- linux-3.15-rc6.orig/arch/arm/mach-imx/suspend-imx6.S 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-imx/suspend-imx6.S 2014-05-23 11:26:48.256939874 +0200
@@ -334,28 +334,10 @@
* turned into relative ones.
*/
@@ -1005,9 +1005,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.15-rc4/ar
+#endif
b cpu_resume
ENDPROC(v7_cpu_resume)
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/system.c linux-3.15-rc4/arch/arm/mach-imx/system.c
---- linux-3.15-rc4.orig/arch/arm/mach-imx/system.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-imx/system.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-imx/system.c linux-3.15-rc6/arch/arm/mach-imx/system.c
+--- linux-3.15-rc6.orig/arch/arm/mach-imx/system.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-imx/system.c 2014-05-23 11:26:48.260939887 +0200
@@ -124,7 +124,7 @@
}
@@ -1034,9 +1034,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-imx/system.c linux-3.15-rc4/arch/arm
+ l2x0_of_init(0, ~0);
}
#endif
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-mvebu/board-v7.c linux-3.15-rc4/arch/arm/mach-mvebu/board-v7.c
---- linux-3.15-rc4.orig/arch/arm/mach-mvebu/board-v7.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-mvebu/board-v7.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-mvebu/board-v7.c linux-3.15-rc6/arch/arm/mach-mvebu/board-v7.c
+--- linux-3.15-rc6.orig/arch/arm/mach-mvebu/board-v7.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-mvebu/board-v7.c 2014-05-23 11:26:48.260939887 +0200
@@ -60,7 +60,7 @@
coherency_init();
BUG_ON(mvebu_mbus_dt_init());
@@ -1046,9 +1046,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-mvebu/board-v7.c linux-3.15-rc4/arch
#endif
if (of_machine_is_compatible("marvell,armada375"))
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-nomadik/cpu-8815.c linux-3.15-rc4/arch/arm/mach-nomadik/cpu-8815.c
---- linux-3.15-rc4.orig/arch/arm/mach-nomadik/cpu-8815.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-nomadik/cpu-8815.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-nomadik/cpu-8815.c linux-3.15-rc6/arch/arm/mach-nomadik/cpu-8815.c
+--- linux-3.15-rc6.orig/arch/arm/mach-nomadik/cpu-8815.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-nomadik/cpu-8815.c 2014-05-23 11:26:48.260939887 +0200
@@ -147,7 +147,7 @@
{
#ifdef CONFIG_CACHE_L2X0
@@ -1058,9 +1058,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-nomadik/cpu-8815.c linux-3.15-rc4/ar
#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/common.h linux-3.15-rc4/arch/arm/mach-omap2/common.h
---- linux-3.15-rc4.orig/arch/arm/mach-omap2/common.h 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-omap2/common.h 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-omap2/common.h linux-3.15-rc6/arch/arm/mach-omap2/common.h
+--- linux-3.15-rc6.orig/arch/arm/mach-omap2/common.h 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-omap2/common.h 2014-05-23 11:26:48.260939887 +0200
@@ -91,6 +91,7 @@
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
@@ -1069,9 +1069,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/common.h linux-3.15-rc4/arch/a
extern void omap5_realtime_timer_init(void);
void omap2420_init_early(void);
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/io.c linux-3.15-rc4/arch/arm/mach-omap2/io.c
---- linux-3.15-rc4.orig/arch/arm/mach-omap2/io.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-omap2/io.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-omap2/io.c linux-3.15-rc6/arch/arm/mach-omap2/io.c
+--- linux-3.15-rc6.orig/arch/arm/mach-omap2/io.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-omap2/io.c 2014-05-23 11:26:48.260939887 +0200
@@ -609,6 +609,7 @@
am43xx_clockdomains_init();
am43xx_hwmod_init();
@@ -1088,9 +1088,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/io.c linux-3.15-rc4/arch/arm/m
omap_clk_soc_init = omap4xxx_dt_clk_init;
}
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/Kconfig linux-3.15-rc4/arch/arm/mach-omap2/Kconfig
---- linux-3.15-rc4.orig/arch/arm/mach-omap2/Kconfig 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-omap2/Kconfig 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-omap2/Kconfig linux-3.15-rc6/arch/arm/mach-omap2/Kconfig
+--- linux-3.15-rc6.orig/arch/arm/mach-omap2/Kconfig 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-omap2/Kconfig 2014-05-23 11:26:48.260939887 +0200
@@ -65,6 +65,7 @@
select ARCH_HAS_OPP
select ARM_GIC
@@ -1099,9 +1099,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/Kconfig linux-3.15-rc4/arch/ar
config SOC_DRA7XX
bool "TI DRA7XX"
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/omap4-common.c linux-3.15-rc4/arch/arm/mach-omap2/omap4-common.c
---- linux-3.15-rc4.orig/arch/arm/mach-omap2/omap4-common.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-omap2/omap4-common.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-omap2/omap4-common.c linux-3.15-rc6/arch/arm/mach-omap2/omap4-common.c
+--- linux-3.15-rc6.orig/arch/arm/mach-omap2/omap4-common.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-omap2/omap4-common.c 2014-05-23 11:26:48.260939887 +0200
@@ -167,75 +167,57 @@
return l2cache_base;
}
@@ -1212,9 +1212,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/omap4-common.c linux-3.15-rc4/
#endif
void __iomem *omap4_get_sar_ram_base(void)
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-3.15-rc4/arch/arm/mach-omap2/omap-mpuss-lowpower.c
---- linux-3.15-rc4.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-3.15-rc6/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+--- linux-3.15-rc6.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-05-23 11:26:48.268939913 +0200
@@ -187,19 +187,15 @@
* in every restore MPUSS OFF path.
*/
@@ -1241,9 +1241,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-3.
{}
#endif
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-prima2/l2x0.c linux-3.15-rc4/arch/arm/mach-prima2/l2x0.c
---- linux-3.15-rc4.orig/arch/arm/mach-prima2/l2x0.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-prima2/l2x0.c 2014-05-07 17:05:51.040166651 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-prima2/l2x0.c linux-3.15-rc6/arch/arm/mach-prima2/l2x0.c
+--- linux-3.15-rc6.orig/arch/arm/mach-prima2/l2x0.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-prima2/l2x0.c 2014-05-23 11:26:48.268939913 +0200
@@ -8,42 +8,10 @@
#include <linux/init.h>
@@ -1288,9 +1288,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-prima2/l2x0.c linux-3.15-rc4/arch/ar
+ return l2x0_of_init(0, ~0);
}
early_initcall(sirfsoc_l2x0_init);
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-prima2/pm.c linux-3.15-rc4/arch/arm/mach-prima2/pm.c
---- linux-3.15-rc4.orig/arch/arm/mach-prima2/pm.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-prima2/pm.c 2014-05-07 17:05:51.044166676 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-prima2/pm.c linux-3.15-rc6/arch/arm/mach-prima2/pm.c
+--- linux-3.15-rc6.orig/arch/arm/mach-prima2/pm.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-prima2/pm.c 2014-05-23 11:26:48.268939913 +0200
@@ -71,7 +71,6 @@
case PM_SUSPEND_MEM:
sirfsoc_pre_suspend_power_off();
@@ -1299,9 +1299,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-prima2/pm.c linux-3.15-rc4/arch/arm/
outer_disable();
/* go zzz */
cpu_suspend(0, sirfsoc_finish_suspend);
-diff -Nur linux-3.15-rc4.orig/arch/arm/mach-realview/realview_eb.c linux-3.15-rc4/arch/arm/mach-realview/realview_eb.c
---- linux-3.15-rc4.orig/arch/arm/mach-realview/realview_eb.c 2014-05-05 03:14:42.000000000 +0200
-+++ linux-3.15-rc4/arch/arm/mach-realview/realview_eb.c 2014-05-07 17:05:51.044166676 +0200
+diff -Nur linux-3.15-rc6.orig/arch/arm/mach-realview/realview_eb.c linux-3.15-rc6/arch/arm/mach-realview/realview_eb.c
+--- linux-3.15-rc6.orig/arch/arm/mach-realview/realview_eb.c 2014-05-21 23:42:02.000000000 +0200
++++ linux-3.15-rc6/arch/arm/mach-realview/realview_eb.c 2014-05-23 11:26:48.268939913 +0200
@@ -442,8 +442,13 @@
realview_eb11mp_fixup();
@@ -1318,9 +1318,9 @@ diff -Nur linux-3.15-rc4.orig/arch/arm/mach-realview/realview_eb.c linux-3.15-rc
l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x007