summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk2
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--package/bcm28xx-bootloader/Makefile12
-rw-r--r--target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch (renamed from target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch)3312
-rw-r--r--target/arm/bcm28xx/patches/3.18.10/0001-i2s-allow-to-enable-ALSA-MMAP.patch54
-rw-r--r--target/arm/bcm28xx/patches/3.18.9/0001-add-support-for-rpi-proto-hardware.patch282
-rw-r--r--target/arm/bcm28xx/patches/3.18.9/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch37
-rw-r--r--target/arm/solidrun-imx6/patches/3.18.10/solidrun-imx6-wlan.patch (renamed from target/arm/solidrun-imx6/patches/3.18.9/solidrun-imx6-wlan.patch)0
-rw-r--r--target/config/Config.in.kernelversion.choice6
-rw-r--r--target/config/Config.in.kernelversion.default2
-rw-r--r--target/linux/config/Config.in.kernel6
-rw-r--r--target/linux/patches/3.18.10/bsd-compatibility.patch (renamed from target/linux/patches/3.18.9/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.18.10/cleankernel.patch (renamed from target/linux/patches/3.18.9/cleankernel.patch)0
-rw-r--r--target/linux/patches/3.18.10/cris-header.patch (renamed from target/linux/patches/3.18.9/cris-header.patch)0
-rw-r--r--target/linux/patches/3.18.10/defaults.patch (renamed from target/linux/patches/3.18.9/defaults.patch)0
-rw-r--r--target/linux/patches/3.18.10/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.18.9/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.18.10/fblogo.patch (renamed from target/linux/patches/3.18.9/fblogo.patch)0
-rw-r--r--target/linux/patches/3.18.10/gemalto.patch (renamed from target/linux/patches/3.18.9/gemalto.patch)0
-rw-r--r--target/linux/patches/3.18.10/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.18.9/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.18.10/lemote-rfkill.patch (renamed from target/linux/patches/3.18.9/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.18.10/microblaze-ethernet.patch (renamed from target/linux/patches/3.18.9/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.18.10/mkpiggy.patch (renamed from target/linux/patches/3.18.9/mkpiggy.patch)0
-rw-r--r--target/linux/patches/3.18.10/mtd-rootfs.patch (renamed from target/linux/patches/3.18.9/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.18.10/nfsv3-tcp.patch (renamed from target/linux/patches/3.18.9/nfsv3-tcp.patch)0
-rw-r--r--target/linux/patches/3.18.10/non-static.patch (renamed from target/linux/patches/3.18.9/non-static.patch)0
-rw-r--r--target/linux/patches/3.18.10/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.18.9/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.18.10/realtime.patch (renamed from target/linux/patches/3.18.9/realtime.patch)18131
-rw-r--r--target/linux/patches/3.18.10/regmap-bool.patch (renamed from target/linux/patches/3.18.9/regmap-bool.patch)0
-rw-r--r--target/linux/patches/3.18.10/relocs.patch (renamed from target/linux/patches/3.18.9/relocs.patch)0
-rw-r--r--target/linux/patches/3.18.10/sgidefs.patch (renamed from target/linux/patches/3.18.9/sgidefs.patch)0
-rw-r--r--target/linux/patches/3.18.10/sortext.patch (renamed from target/linux/patches/3.18.9/sortext.patch)0
-rw-r--r--target/linux/patches/3.18.10/startup.patch (renamed from target/linux/patches/3.18.9/startup.patch)0
-rw-r--r--target/linux/patches/3.18.10/wlan-cf.patch (renamed from target/linux/patches/3.18.9/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.18.10/xargs.patch (renamed from target/linux/patches/3.18.9/xargs.patch)0
-rw-r--r--target/linux/patches/3.18.10/yaffs2.patch (renamed from target/linux/patches/3.18.9/yaffs2.patch)0
-rw-r--r--target/m68k/qemu-m68k/patches/3.18.10/m68k-coldfire-fec.patch (renamed from target/m68k/qemu-m68k/patches/3.18.9/m68k-coldfire-fec.patch)0
-rw-r--r--target/m68k/qemu-m68k/patches/3.18.10/qemu-coldfire.patch (renamed from target/m68k/qemu-m68k/patches/3.18.9/qemu-coldfire.patch)0
-rw-r--r--target/mips64/lemote-yeelong/patches/3.18.10/sm7xx-fb.patch (renamed from target/mips64/lemote-yeelong/patches/3.18.9/sm7xx-fb.patch)0
38 files changed, 3993 insertions, 17857 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 2d88f6061..96740e3e8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -104,7 +104,7 @@ POSTCONFIG= -@\
rebuild=1;\
fi; \
done; \
- for i in ADK_KERNEL_BCM2708_DT ADK_KERNEL_BCM2709_DT ADK_TARGET_GPU_MEM ADK_KERNEL_SND_BCM2708;do \
+ for i in ADK_TARGET_GPU_MEM ADK_KERNEL_SND_BCM2708;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
touch .rebuild.bcm28xx-bootloader;\
rebuild=1;\
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 42efb22e5..757fe9f33 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_HASH:= 717f36a65735bdd7afcb452578cc221c7fde8f6a0073e2feb62473466bdfa763
endif
-ifeq ($(ADK_KERNEL_VERSION_3_18_9),y)
-KERNEL_VERSION:= 3.18.9
+ifeq ($(ADK_KERNEL_VERSION_3_18_10),y)
+KERNEL_VERSION:= 3.18.10
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_HASH:= b1b7719a4bad027f2efc8477a19c6625d51d127640e3373fcd03b41334319501
+KERNEL_HASH:= d03015f01235ae046d9d39c0a70ad21a7a97fec0620741ea2d8306289707b04e
endif
ifeq ($(ADK_KERNEL_VERSION_3_14_35),y)
KERNEL_VERSION:= 3.14.35
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile
index 642cde66b..f9623bb48 100644
--- a/package/bcm28xx-bootloader/Makefile
+++ b/package/bcm28xx-bootloader/Makefile
@@ -36,6 +36,18 @@ do-install:
$(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot
$(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/
printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
+ printf "console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y)
+ printf "console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y)
+ printf "console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y)
+ printf "console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y)
$(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/
printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
diff --git a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch b/target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch
index 1e7b73230..d9b021fc0 100644
--- a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch
+++ b/target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch
@@ -1,6 +1,93 @@
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi
---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/ads7846-overlay.dts linux-rpi/arch/arm/boot/dts/ads7846-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/ads7846-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/ads7846-overlay.dts 2015-03-26 11:46:41.692226515 +0100
+@@ -0,0 +1,83 @@
++/*
++ * Generic Device Tree overlay for the ADS7846 touch controller
++ *
++ */
++
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
++
++ fragment@0 {
++ target = <&spi0>;
++ __overlay__ {
++ status = "okay";
++
++ spidev@0{
++ status = "disabled";
++ };
++
++ spidev@1{
++ status = "disabled";
++ };
++ };
++ };
++
++ fragment@1 {
++ target = <&gpio>;
++ __overlay__ {
++ ads7846_pins: ads7846_pins {
++ brcm,pins = <255>; /* illegal default value */
++ brcm,function = <0>; /* in */
++ brcm,pull = <0>; /* none */
++ };
++ };
++ };
++
++ fragment@2 {
++ target = <&spi0>;
++ __overlay__ {
++ /* needed to avoid dtc warning */
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ ads7846: ads7846@1 {
++ compatible = "ti,ads7846";
++ reg = <1>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&ads7846_pins>;
++
++ spi-max-frequency = <2000000>;
++ interrupts = <255 2>; /* high-to-low edge triggered */
++ interrupt-parent = <&gpio>;
++ pendown-gpio = <&gpio 255 0>;
++
++ /* driver defaults */
++ ti,x-min = /bits/ 16 <0>;
++ ti,y-min = /bits/ 16 <0>;
++ ti,x-max = /bits/ 16 <0x0FFF>;
++ ti,y-max = /bits/ 16 <0x0FFF>;
++ ti,pressure-min = /bits/ 16 <0>;
++ ti,pressure-max = /bits/ 16 <0xFFFF>;
++ ti,x-plate-ohms = /bits/ 16 <400>;
++ };
++ };
++ };
++ __overrides__ {
++ cs = <&ads7846>,"reg:0";
++ speed = <&ads7846>,"spi-max-frequency:0";
++ penirq = <&ads7846_pins>,"brcm,pins:0", /* REQUIRED */
++ <&ads7846>,"interrupts:0",
++ <&ads7846>,"pendown-gpio:4";
++ penirq_pull = <&ads7846_pins>,"brcm,pull:0";
++ swapxy = <&ads7846>,"ti,swap-xy?";
++ xmin = <&ads7846>,"ti,x-min;0";
++ ymin = <&ads7846>,"ti,y-min;0";
++ xmax = <&ads7846>,"ti,x-max;0";
++ ymax = <&ads7846>,"ti,y-max;0";
++ pmin = <&ads7846>,"ti,pressure-min;0";
++ pmax = <&ads7846>,"ti,pressure-max;0";
++ xohms = <&ads7846>,"ti,x-plate-ohms;0";
++ };
++};
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi
+--- linux-3.18.10/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,109 @@
+/include/ "skeleton.dtsi"
+
@@ -111,9 +198,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi linux-3.18.9/arch/arm
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts
+--- linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,107 @@
+/dts-v1/;
+
@@ -222,9 +309,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-3.18.9/arc
+ act_led_trigger = <&act_led>,"linux,default-trigger";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+--- linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,117 @@
+/dts-v1/;
+
@@ -343,9 +430,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-3.18.
+ pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi
---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dts/bcm2709.dtsi
+--- linux-3.18.10/arch/arm/boot/dts/bcm2709.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2709.dtsi 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,160 @@
+/include/ "skeleton.dtsi"
+
@@ -507,9 +594,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi linux-3.18.9/arch/arm
+ <&v7_cpu3>, "clock-frequency:0";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+--- linux-3.18.10/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,117 @@
+/dts-v1/;
+
@@ -628,9 +715,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-3.18.9/a
+ pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-26 11:46:41.696226518 +0100
@@ -0,0 +1,23 @@
+// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec
+/dts-v1/;
@@ -655,9 +742,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linu
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,22 @@
+// Definitions for DS1307 Real Time Clock
+/dts-v1/;
@@ -681,9 +768,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-3.18.
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/enc28j60-overlay.dts linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/enc28j60-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,29 @@
+// Overlay for the Microchip ENC28J60 Ethernet Controller
+/dts-v1/;
@@ -714,9 +801,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts linux-3.18.9/
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,39 @@
+// Definitions for HiFiBerry Amp/Amp+
+/dts-v1/;
@@ -757,9 +844,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-3.
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,34 @@
+// Definitions for HiFiBerry DAC
+/dts-v1/;
@@ -795,9 +882,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-3.
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,39 @@
+// Definitions for HiFiBerry DAC+
+/dts-v1/;
@@ -838,9 +925,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linu
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,39 @@
+// Definitions for HiFiBerry Digi
+/dts-v1/;
@@ -881,9 +968,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-3
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hy28a-overlay.dts linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hy28a-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,87 @@
+/*
+ * Device Tree overlay for HY28A display
@@ -972,9 +1059,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts linux-3.18.9/arc
+ <&hy28a_pins>, "brcm,pins:2";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/hy28b-overlay.dts linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/hy28b-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-26 11:46:41.700226520 +0100
@@ -0,0 +1,142 @@
+/*
+ * Device Tree overlay for HY28b display shield by Texy
@@ -1118,10 +1205,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts linux-3.18.9/arc
+ <&hy28b_pins>, "brcm,pins:2";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500
-@@ -0,0 +1,43 @@
+diff -Nur linux-3.18.10/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/i2c-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-26 11:46:41.700226520 +0100
+@@ -0,0 +1,49 @@
+// Definitions for several I2C based Real Time Clocks
+/dts-v1/;
+/plugin/;
@@ -1156,6 +1243,11 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/a
+ reg = <0x68>;
+ status = "disable";
+ };
++ pcf8563: pcf8563@51 {
++ compatible = "nxp,pcf8563";
++ reg = <0x51>;
++ status = "disable";
++ };
+ };
+ };
+ __overrides__ {
@@ -1163,11 +1255,12 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/a
+ ds3231 = <&ds3231>,"status";
+ pcf2127 = <&pcf2127>,"status";
+ pcf8523 = <&pcf8523>,"status";
++ pcf8563 = <&pcf8563>,"status";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-03-26 11:46:41.712226533 +0100
@@ -0,0 +1,39 @@
+// Definitions for IQaudIO DAC
+/dts-v1/;
@@ -1208,9 +1301,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-3.18
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-03-26 11:46:41.712226533 +0100
@@ -0,0 +1,39 @@
+// Definitions for IQaudIO DAC+
+/dts-v1/;
@@ -1251,9 +1344,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-
+ };
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-03-26 11:46:41.712226533 +0100
@@ -0,0 +1,57 @@
+// Definitions for lirc-rpi module
+/dts-v1/;
@@ -1312,10 +1405,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-3.18.9/
+ debug = <&lirc_rpi>,"rpi,debug:0";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boot/dts/Makefile
---- linux-3.18.9.orig/arch/arm/boot/dts/Makefile 2015-03-06 16:53:42.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/Makefile 2015-03-08 03:38:45.266040943 -0500
-@@ -53,7 +53,41 @@
+diff -Nur linux-3.18.10/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile
+--- linux-3.18.10/arch/arm/boot/dts/Makefile 2015-03-24 02:05:12.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/Makefile 2015-03-26 11:46:41.692226515 +0100
+@@ -53,7 +53,46 @@
dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
@@ -1330,6 +1423,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo
+dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb
+dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb
+dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb
++dtb-$(RPI_DT_OVERLAYS) += ads7846-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += ds1307-rtc-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += enc28j60-overlay.dtb
@@ -1342,12 +1436,16 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo
+dtb-$(RPI_DT_OVERLAYS) += hy28b-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += iqaudio-dac-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += iqaudio-dacplus-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += rpi-proto-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += lirc-rpi-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += pcf2127-rtc-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += pcf8523-rtc-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += rpi-display-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += tinylcd35-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += w1-gpio-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += w1-gpio-pullup-overlay.dtb
+dtb-$(RPI_DT_OVERLAYS) += spi-bcm2835-overlay.dtb
@@ -1357,7 +1455,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo
dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
-@@ -519,6 +553,12 @@
+@@ -519,6 +558,12 @@
targets += dtbs dtbs_install
targets += $(dtb-y)
@@ -1370,9 +1468,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo
endif
# *.dtb used to be generated in the directory above. Clean out the
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-26 11:46:41.716226537 +0100
@@ -0,0 +1,69 @@
+/*
+ * Device tree overlay for mcp251x/can0 on spi0.0
@@ -1443,9 +1541,122 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-3.1
+ interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0";
+ };
+};
-diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts
---- linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500
+diff -Nur linux-3.18.10/arch/arm/boot/dts/mz61581-overlay.dts linux-rpi/arch/arm/boot/dts/mz61581-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/mz61581-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/mz61581-overlay.dts 2015-03-26 11:46:41.716226537 +0100
+@@ -0,0 +1,109 @@
++/*
++ * Device Tree overlay for MZ61581-PI-EXT 2014.12.28 by Tontec
++ *
++ */
++
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
++
++ fragment@0 {
++ target = <&spi0>;
++ __overlay__ {
++ status = "okay";
++
++ spidev@0{
++ status = "disabled";
++ };
++
++ spidev@1{
++ status = "disabled";
++ };
++ };
++ };
++
++ fragment@1 {
++ target = <&gpio>;
++ __overlay__ {
++ mz61581_pins: mz61581_pins {
++ brcm,pins = <4 15 18 25>;
++ brcm,function = <0 1 1 1>; /* in out out out */
++ };
++ };
++ };
++
++ fragment@2 {
++ target = <&spi0>;
++ __overlay__ {
++ /* needed to avoid dtc warning */
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ mz61581: mz61581@0{
++ compatible = "samsung,s6d02a1";
++ reg = <0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&mz61581_pins>;
++
++ spi-max-frequency = <128000000>;
++ spi-cpol;
++ spi-cpha;
++
++ width = <320>;
++ height = <480>;
++ rotate = <270>;
++ bgr;
++ fps = <30>;
++ buswidth = <8>;
++
++ reset-gpios = <&gpio 15 0>;
++ dc-gpios = <&gpio 25 0>;
++ led-gpios = <&gpio 18 0>;
++
++ init = <0x10000b0 00
++ 0x1000011
++ 0x20000ff
++ 0x10000b3 0x02 0x00 0x00 0x00
++ 0x10000c0 0x13 0x3b 0x00 0x02 0x00 0x01 0x00 0x43
++ 0x10000c1 0x08 0x16 0x08 0x08
++ 0x10000c4 0x11 0x07 0x03 0x03
++ 0x10000c6 0x00
++ 0x10000c8 0x03 0x03 0x13 0x5c 0x03 0x07 0x14 0x08 0x00 0x21 0x08 0x14 0x07 0x53 0x0c 0x13 0x03 0x03 0x21 0x00
++ 0x1000035 0x00
++ 0x1000036 0xa0
++ 0x100003a 0x55
++ 0x1000044 0x00 0x01
++ 0x10000d0 0x07 0x07 0x1d 0x03
++ 0x10000d1 0x03 0x30 0x10
++ 0x10000d2 0x03 0x14 0x04
++ 0x1000029
++ 0x100002c>;
++
++ /* This is a workaround to make sure the init sequence slows down and doesn't fail */
++ debug = <3>;
++ };
++
++ mz61581_ts: mz61581_ts@1 {
++ compatible = "ti,ads7846";
++ reg = <1>;
++
++ spi-max-frequency = <2000000>;
++ interrupts = <4 2>; /* high-to-low edge triggered */
++ interrupt-parent = <&gpio>;
++ pendown-gpio = <&gpio 4 0>;
++
++ ti,x-plate-ohms = /bits/ 16 <60>;
++ ti,pressure-max = /bits/ 16 <255>;
++ };
++ };
++ };
++ __overrides__ {
++ speed = <&mz61581>, "spi-max-frequency:0";
++ rotate = <&mz61581>, "rotate:0";
++ fps = <&mz61581>, "fps:0";
++ debug = <&mz61581>, "debug:0";
++ xohms = <&mz61581_ts>,"ti,x-plate-ohms;0";
++ };
++};
+diff -Nur linux-3.18.10/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts
+--- linux-3.18.10/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-26 11:46:41.720226540 +0100
@@