From e24bf9c6ca0223752dc3da459c35f0723c4199d9 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:03 +0200 Subject: [PATCH 01/18] ARM: at91/dt: at91sam9rl: fix rtc node The RTC lives at 0xfffffe00. Also reorder the node properly. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9rl.dtsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index ebfd5ce9cb38..c9920c64791c 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -1065,13 +1065,6 @@ clk32k: slck { }; }; - rtc@fffffeb0 { - compatible = "atmel,at91rm9200-rtc"; - reg = <0xfffffeb0 0x40>; - interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; - status = "disabled"; - }; - rtc@fffffd20 { compatible = "atmel,at91sam9260-rtt"; reg = <0xfffffd20 0x10>; @@ -1085,6 +1078,14 @@ gpbr: syscon@fffffd60 { reg = <0xfffffd60 0x10>; status = "disabled"; }; + + rtc@fffffe00 { + compatible = "atmel,at91rm9200-rtc"; + reg = <0xfffffe00 0x40>; + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; + status = "disabled"; + }; + }; }; From ee3b67ccd25199a8db492f27d25d01518b3103a9 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:04 +0200 Subject: [PATCH 02/18] ARM: at91/dt: at91sam9rlek: add RTC Add RTC support to the at91sam9rlek. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9rlek.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts index d9299be3dfe9..724b9f54a60a 100644 --- a/arch/arm/boot/dts/at91sam9rlek.dts +++ b/arch/arm/boot/dts/at91sam9rlek.dts @@ -184,6 +184,10 @@ pinctrl_board_mmc0: mmc0-board { watchdog@fffffd40 { status = "okay"; }; + + rtc@fffffe00 { + status = "okay"; + }; }; }; From 7e5883b5b4a70ea3c12e2ba1c09082bc61ad0242 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:05 +0200 Subject: [PATCH 03/18] ARM: at91/dt: kizbox: use stdout-path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The kizbox dts are using the deprecated linux,stdout-path. Replace those by stdout-path. Signed-off-by: Alexandre Belloni Acked-by: Gaël PORTAY Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-kizbox.dts | 2 +- arch/arm/boot/dts/at91-kizbox2.dts | 2 +- arch/arm/boot/dts/at91-kizboxmini.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts index b567b5ff908f..d9b71065916d 100644 --- a/arch/arm/boot/dts/at91-kizbox.dts +++ b/arch/arm/boot/dts/at91-kizbox.dts @@ -16,7 +16,7 @@ / { chosen { bootargs = "ubi.mtd=ubi"; - linux,stdout-path = &dbgu; + stdout-path = &dbgu; }; memory { diff --git a/arch/arm/boot/dts/at91-kizbox2.dts b/arch/arm/boot/dts/at91-kizbox2.dts index a458e3791bb1..f0b1563cb3f1 100644 --- a/arch/arm/boot/dts/at91-kizbox2.dts +++ b/arch/arm/boot/dts/at91-kizbox2.dts @@ -15,7 +15,7 @@ / { chosen { bootargs = "ubi.mtd=ubi"; - linux,stdout-path = &dbgu; + stdout-path = &dbgu; }; memory { diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts index 4611f227d8d0..9f72b4932634 100644 --- a/arch/arm/boot/dts/at91-kizboxmini.dts +++ b/arch/arm/boot/dts/at91-kizboxmini.dts @@ -15,7 +15,7 @@ / { chosen { bootargs = "ubi.mtd=ubi"; - linux,stdout-path = &dbgu; + stdout-path = &dbgu; }; memory { From 927ccfe3299685e451fb69fea4b17dd75f3ea1f3 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:06 +0200 Subject: [PATCH 04/18] ARM: at91/dt: at91rm9200ek: use stdout-path Use stdout-path to specify the console. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91rm9200ek.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts index 2a5d21247d7e..8dab4b75ca97 100644 --- a/arch/arm/boot/dts/at91rm9200ek.dts +++ b/arch/arm/boot/dts/at91rm9200ek.dts @@ -12,6 +12,10 @@ / { model = "Atmel AT91RM9200 evaluation kit"; compatible = "atmel,at91rm9200ek", "atmel,at91rm9200"; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x20000000 0x4000000>; }; From a5a51ddc3dc83ad826515ccfdd0d893ab4fca9fa Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:07 +0200 Subject: [PATCH 05/18] ARM: at91/dt: at91sam9261ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9261ek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts index f4a765729c7a..2e92ac020f23 100644 --- a/arch/arm/boot/dts/at91sam9261ek.dts +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -13,7 +13,8 @@ / { compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", "atmel,at91sam9"; chosen { - bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw"; + bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw"; + stdout-path = "serial0:115200n8"; }; memory { From 11cfbde407c184ea62e3ce4355d55aa921a17e28 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:08 +0200 Subject: [PATCH 06/18] ARM: at91/dt: at91sam9263ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9263ek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts index 5cf93eecd8f1..23381276ffb8 100644 --- a/arch/arm/boot/dts/at91sam9263ek.dts +++ b/arch/arm/boot/dts/at91sam9263ek.dts @@ -13,7 +13,8 @@ / { compatible = "atmel,at91sam9263ek", "atmel,at91sam9263", "atmel,at91sam9"; chosen { - bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; + bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; + stdout-path = "serial0:115200n8"; }; memory { From 55f1ec71433fa075d34fbeee32340cc0dc6a0a1f Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:09 +0200 Subject: [PATCH 07/18] ARM: at91/dt: at91sam9g20ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index dfaacb113f2e..57548a2c5a1e 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -10,7 +10,8 @@ / { chosen { - bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; + bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; + stdout-path = "serial0:115200n8"; }; memory { From aa070464ba457c6a2a935b79b14a2d63ca742b77 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:10 +0200 Subject: [PATCH 08/18] ARM: at91/dt: at91sam9m10g45ek use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 33ce7ca2c404..1375d3362603 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -15,7 +15,8 @@ / { compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9"; chosen { - bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; + bootargs = "mem=64M root=/dev/mtdblock1 rw rootfstype=jffs2"; + stdout-path = "serial0:115200n8"; }; memory { From 7cb5852d9ca8201dbf7cefdc54f0c813c423abff Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:11 +0200 Subject: [PATCH 09/18] ARM: at91/dt: at91sam9n12ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9n12ek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index 6e067c8a3502..eab17fcace6d 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -14,7 +14,8 @@ / { compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9"; chosen { - bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; + bootargs = "root=/dev/mtdblock1 rw rootfstype=jffs2"; + stdout-path = "serial0:115200n8"; }; memory { From 956275739edb2745e778e8684faa4b419aba05e5 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:12 +0200 Subject: [PATCH 10/18] ARM: at91/dt: at91sam9rlek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9rlek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts index 724b9f54a60a..558c9f220bed 100644 --- a/arch/arm/boot/dts/at91sam9rlek.dts +++ b/arch/arm/boot/dts/at91sam9rlek.dts @@ -13,7 +13,8 @@ / { compatible = "atmel,at91sam9rlek", "atmel,at91sam9rl", "atmel,at91sam9"; chosen { - bootargs = "console=ttyS0,115200 rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw"; + bootargs = "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw"; + stdout-path = "serial0:115200n8"; }; memory { From 5bb27f091ed98c26c4a850ddee2142c633f2f2aa Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:13 +0200 Subject: [PATCH 11/18] ARM: at91/dt: at91sam9x5ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi index cc83a37a7311..d237c462dfc6 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi @@ -13,7 +13,8 @@ / { compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; chosen { - bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; + bootargs = "root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; + stdout-path = "serial0:115200n8"; }; ahb { From 980853a856055f52580f5d44a97ec8c70659fa61 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:14 +0200 Subject: [PATCH 12/18] ARM: at91/dt: sama5d3xek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/sama5d3xcm.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi index ef404e907026..2cf9c3611db6 100644 --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi @@ -11,7 +11,8 @@ / { compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; chosen { - bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs"; + bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs"; + stdout-path = "serial0:115200n8"; }; memory { From a08545db5423dbf6da8d066b120b17497fd034a2 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:15 +0200 Subject: [PATCH 13/18] ARM: at91/dt: sama5d3 xplained: use stdout-path Use stdout-path to specify the console and remove the bootargs. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts index 4799e88cdf5e..d81474e0bcd6 100644 --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts @@ -14,7 +14,7 @@ / { compatible = "atmel,sama5d3-xplained", "atmel,sama5d3", "atmel,sama5"; chosen { - bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; memory { From 9e73126e08b98ad965e979a83445e2d6baed2a19 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:16 +0200 Subject: [PATCH 14/18] ARM: at91/dt: sama5d4ek: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-sama5d4ek.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts index 89ef4a540db5..c8be7f82cf8c 100644 --- a/arch/arm/boot/dts/at91-sama5d4ek.dts +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts @@ -50,7 +50,8 @@ / { compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5"; chosen { - bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk"; + bootargs = "ignore_loglevel earlyprintk"; + stdout-path = "serial0:115200n8"; }; memory { From e1e6c32248d514278c95d67100eabcab81aaa1ce Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:17 +0200 Subject: [PATCH 15/18] ARM: at91/dt: sama5d4 xplained: use stdout-path Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-sama5d4_xplained.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts index 5dbc0fcfc5a8..22ad7c959103 100644 --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts @@ -50,7 +50,8 @@ / { compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5"; chosen { - bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk"; + bootargs = "ignore_loglevel earlyprintk"; + stdout-path = "serial0:115200n8"; }; memory { From a02d46dd60eb92e4b00f434700efad4e87d96e2e Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:18 +0200 Subject: [PATCH 16/18] ARM: at91/dt: Add Acme Arietta G25 Add a minimum Device Tree for Acme Arietta G25. http://acme.systems/arietta Signed-off-by: Alexandre Belloni Acked-by: Sergio Tanzilli Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8c3da289a00b..b224a3a56f09 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -31,6 +31,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ at91sam9n12ek.dtb \ at91sam9rlek.dtb \ at91-ariag25.dtb \ + at91-ariettag25.dtb \ at91-cosino_mega2560.dtb \ at91-kizboxmini.dtb \ at91sam9g15ek.dtb \ diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts new file mode 100644 index 000000000000..c514502081d2 --- /dev/null +++ b/arch/arm/boot/dts/at91-ariettag25.dts @@ -0,0 +1,79 @@ +/* + * Device Tree file for Arietta G25 + * This device tree is minimal, to activate more peripherals, see: + * http://dts.acmesystems.it/arietta/ + */ +/dts-v1/; +#include "at91sam9g25.dtsi" +/ { + model = "Acme Systems Arietta G25"; + compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9"; + + aliases { + serial0 = &dbgu; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory { + reg = <0x20000000 0x8000000>; + }; + + clocks { + slow_xtal { + clock-frequency = <32768>; + }; + + main_xtal { + clock-frequency = <12000000>; + }; + }; + + ahb { + apb { + mmc0: mmc@f0008000 { + pinctrl-0 = < + &pinctrl_mmc0_slot0_clk_cmd_dat0 + &pinctrl_mmc0_slot0_dat1_3>; + status = "okay"; + + slot@0 { + reg = <0>; + bus-width = <4>; + }; + }; + + usb2: gadget@f803c000 { + status = "okay"; + }; + + dbgu: serial@fffff200 { + status = "okay"; + }; + + rtc@fffffeb0 { + status = "okay"; + }; + }; + + usb0: ohci@00600000 { + status = "okay"; + num-ports = <3>; + }; + + usb1: ehci@00700000 { + status = "okay"; + }; + }; + + leds { + compatible = "gpio-leds"; + arietta_led { + label = "arietta_led"; + gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */ + linux,default-trigger = "heartbeat"; + }; + }; +}; From 87835a4baf41c41d599d4d60987f2dc0f291e611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 3 Jun 2015 11:44:23 +0200 Subject: [PATCH 17/18] ARM: at91/dt: kizbox: fix mismatch LED PWM device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The network_red LED uses the 4th PWM device. Signed-off-by: Gaël PORTAY Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-kizbox.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts index d9b71065916d..bf18ece0c027 100644 --- a/arch/arm/boot/dts/at91-kizbox.dts +++ b/arch/arm/boot/dts/at91-kizbox.dts @@ -126,7 +126,7 @@ network_green { network_red { label = "pwm:red:network"; - pwms = <&tcb_pwm 3 10000000 PWM_POLARITY_INVERTED>; + pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>; max-brightness = <255>; linux,default-trigger = "default-on"; }; From ea25525ce0d195724fead07fe6562fe478a3bf6f Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 28 May 2015 11:55:16 +0200 Subject: [PATCH 18/18] ARM: at91/dt: sama5d4ek: mci0 uses slot 0 Mci0 uses slot 0 not 1. Signed-off-by: Ludovic Desroches Fixes: 7a4752677c44 ("ARM: at91: dt: add device tree file for SAMA5D4ek board") Cc: stable@vger.kernel.org Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91-sama5d4ek.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts index c8be7f82cf8c..d782f2926b73 100644 --- a/arch/arm/boot/dts/at91-sama5d4ek.dts +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts @@ -109,8 +109,8 @@ adc0: adc@fc034000 { mmc0: mmc@f8000000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>; - slot@1 { - reg = <1>; + slot@0 { + reg = <0>; bus-width = <4>; cd-gpios = <&pioE 5 0>; };