summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2014-12-12 16:15:19 -0600
committerJesse Gilles <jgilles@multitech.com>2014-12-12 16:15:19 -0600
commitfcc093ec82bd3098a206bd7680843860ab1c806d (patch)
tree2cca2cf308c55efd33c508840c4b2da2b728d7e4 /recipes-kernel/linux
parentdb6e4e99d8015af8e43c0b5848d8486bd081113e (diff)
downloadmeta-multitech-fcc093ec82bd3098a206bd7680843860ab1c806d.tar.gz
meta-multitech-fcc093ec82bd3098a206bd7680843860ab1c806d.tar.bz2
meta-multitech-fcc093ec82bd3098a206bd7680843860ab1c806d.zip
linux-3.12.27: mtcdt.dts: update SPI CS pins, add spidev on CS2
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch40
-rw-r--r--recipes-kernel/linux/linux_3.12.27.bb2
2 files changed, 25 insertions, 17 deletions
diff --git a/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch b/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch
index b0ef132..5c58a80 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch
+++ b/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch
@@ -1,8 +1,8 @@
Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
===================================================================
---- /dev/null
-+++ linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
-@@ -0,0 +1,268 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.12.27/arch/arm/boot/dts/mtcdt.dts 2014-12-11 17:31:08.539654648 -0600
+@@ -0,0 +1,276 @@
+/*
+ * DTS file for Multi-Tech Systems MTCDT Hardware
+ */
@@ -112,7 +112,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+ /* runs to Accessory Port 1 */
+ spi0: spi@f0000000 {
+ status = "okay";
-+ cs-gpios = <&pioA 4 0>, <&pioA 2 0>, <&pioA 5 0>, <0>;
++ cs-gpios = <&pioA 4 0>, <&pioA 2 0>, <&pioA 3 0>, <&pioA 5 0>;
+
+ ap1-adc@0 {
+ compatible = "mts-io-ap1-adc";
@@ -124,10 +124,14 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+ spi-max-frequency = <1000000>;
+ reg = <1>;
+ };
-+ ap1-din@2 {
++ ap1-spi@2 {
++ compatible = "spidev";
++ reg = <2>;
++ }
++ ap1-din@3 {
+ compatible = "mts-io-ap1-din";
+ spi-max-frequency = <1000000>;
-+ reg = <2>;
++ reg = <3>;
+ };
+ };
+
@@ -135,7 +139,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+ spi1: spi@f0004000 {
+ status = "okay";
+
-+ cs-gpios = <&pioC 15 0>, <&pioC 16 0>, <&pioC 18 0>, <0>;
++ cs-gpios = <&pioC 15 0>, <&pioC 16 0>, <&pioC 17 0>, <&pioC 18 0>;
+
+ ap2-adc@0 {
+ compatible = "mts-io-ap2-adc";
@@ -147,10 +151,14 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+ spi-max-frequency = <1000000>;
+ reg = <1>;
+ };
-+ ap2-din@2 {
++ ap2-spi@2 {
++ compatible = "spidev";
++ reg = <2>;
++ }
++ ap2-din@3 {
+ compatible = "mts-io-ap2-din";
+ spi-max-frequency = <1000000>;
-+ reg = <2>;
++ reg = <3>;
+ };
+ };
+ };
@@ -273,8 +281,8 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+};
Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi
===================================================================
---- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi
-+++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi
+--- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi 2014-11-20 11:34:48.131938966 -0600
++++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi 2014-11-20 11:34:49.227920922 -0600
@@ -40,48 +40,8 @@
atmel,has-pmecc; /* Enable PMECC */
atmel,pmecc-cap = <2>;
@@ -333,8 +341,8 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi
};
Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi
===================================================================
---- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi
-+++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi
+--- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi 2014-11-20 11:34:48.131938966 -0600
++++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi 2014-11-20 11:34:49.227920922 -0600
@@ -24,23 +24,11 @@
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
@@ -442,9 +450,9 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi
};
Index: linux-3.12.27/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.12.27.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.12.27/arch/arm/boot/dts/Makefile
-@@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek
+--- linux-3.12.27.orig/arch/arm/boot/dts/Makefile 2014-11-20 11:34:48.131938966 -0600
++++ linux-3.12.27/arch/arm/boot/dts/Makefile 2014-11-20 11:34:49.227920922 -0600
+@@ -35,6 +35,7 @@
dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
diff --git a/recipes-kernel/linux/linux_3.12.27.bb b/recipes-kernel/linux/linux_3.12.27.bb
index 64e6810..eb6029c 100644
--- a/recipes-kernel/linux/linux_3.12.27.bb
+++ b/recipes-kernel/linux/linux_3.12.27.bb
@@ -2,7 +2,7 @@ inherit kernel
# mts class to build dtb and append to kernel image
inherit linux-append-dtb
-PR = "r7"
+PR = "r8"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"