diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2015-01-15 15:14:00 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2015-01-15 15:14:00 -0600 |
| commit | cc0995c685eefbbcb78c4252f56e521e0e2b3954 (patch) | |
| tree | 8f1948ffabf34480a7b2e50ab35130acf032ff62 /recipes-kernel | |
| parent | 981a78978c78a1ed5ea258c9215f7057b1a07d3f (diff) | |
| download | meta-multitech-cc0995c685eefbbcb78c4252f56e521e0e2b3954.tar.gz meta-multitech-cc0995c685eefbbcb78c4252f56e521e0e2b3954.tar.bz2 meta-multitech-cc0995c685eefbbcb78c4252f56e521e0e2b3954.zip | |
linux-3.12.27: mtcdt: disable ssc03.0.1
ssc0 is not used and this fixes LED behavior on boot
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-mtcdt-device-tree.patch | 39 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux_3.12.27.bb | 2 |
2 files changed, 22 insertions, 19 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 25622bb..aa96655 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,7 +1,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.12.27/arch/arm/boot/dts/mtcdt.dts 2014-12-12 08:48:21.214443710 -0600 ++++ linux-3.12.27/arch/arm/boot/dts/mtcdt.dts 2015-01-13 13:58:20.766078428 -0600 @@ -0,0 +1,278 @@ +/* + * DTS file for Multi-Tech Systems MTCDT Hardware @@ -283,8 +283,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 2014-12-11 17:40:17.010826336 -0600 -+++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi 2014-12-11 17:40:19.414787587 -0600 +--- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi 2014-08-26 07:12:26.000000000 -0500 ++++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi 2015-01-13 13:58:20.766078428 -0600 @@ -40,48 +40,8 @@ atmel,has-pmecc; /* Enable PMECC */ atmel,pmecc-cap = <2>; @@ -343,8 +343,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 2014-12-11 17:40:17.010826336 -0600 -+++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi 2014-12-11 17:40:19.438787200 -0600 +--- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi 2014-08-26 07:12:26.000000000 -0500 ++++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi 2015-01-15 14:57:35.931862696 -0600 @@ -24,23 +24,11 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 &pinctrl_mmc0_slot0_dat1_3>; @@ -371,7 +371,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi }; }; -@@ -48,24 +36,15 @@ +@@ -48,22 +36,13 @@ status = "okay"; }; @@ -382,23 +382,21 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi usb2: gadget@f803c000 { - atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>; +- status = "okay"; +- }; +- +- i2c0: i2c@f8010000 { + /* atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>; mtcdt: no vbus-gpio */ status = "okay"; - }; - -- i2c0: i2c@f8010000 { -- status = "okay"; - - wm8731: wm8731@1a { - compatible = "wm8731"; - reg = <0x1a>; - }; -- }; -- + }; + pinctrl@fffff400 { - mmc0 { - pinctrl_board_mmc0: mmc0-board { -@@ -82,16 +61,6 @@ +@@ -82,51 +61,24 @@ }; }; @@ -415,7 +413,12 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5ek.dtsi watchdog@fffffe40 { status = "okay"; }; -@@ -104,29 +73,15 @@ + +- ssc0: ssc@f0010000 { +- status = "okay"; +- }; + }; + usb0: ohci@00600000 { status = "okay"; num-ports = <3>; @@ -452,8 +455,8 @@ 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 2014-12-11 17:40:17.010826336 -0600 -+++ linux-3.12.27/arch/arm/boot/dts/Makefile 2014-12-11 17:40:19.454786942 -0600 +--- linux-3.12.27.orig/arch/arm/boot/dts/Makefile 2014-08-26 07:12:26.000000000 -0500 ++++ linux-3.12.27/arch/arm/boot/dts/Makefile 2015-01-13 13:58:20.766078428 -0600 @@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb diff --git a/recipes-kernel/linux/linux_3.12.27.bb b/recipes-kernel/linux/linux_3.12.27.bb index 55e15bb..e699109 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 = "r10" +PR = "r11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |