From 7107bb0b2836f0f9b1ffed1f5189e269ee25e5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 16 Apr 2015 14:25:44 +0200 Subject: ARM: at91/dt: drop deprecated mainck node from pmc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The clock-frequency property became obsolete since the rework of the main clock driver in 3.16 (see commit 27cb1c2083373a44130d50d4d2fb64cf7eff2d90). It now get and uses the clock-frequency from the main_xtal node. Signed-off-by: Gaël PORTAY Acked-by: Boris Brezillon Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9rlek.dts | 6 ------ 1 file changed, 6 deletions(-) (limited to 'arch/arm/boot/dts/at91sam9rlek.dts') diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts index 9be5b540eebf..d9299be3dfe9 100644 --- a/arch/arm/boot/dts/at91sam9rlek.dts +++ b/arch/arm/boot/dts/at91sam9rlek.dts @@ -181,12 +181,6 @@ }; }; - pmc: pmc@fffffc00 { - main: mainck { - clock-frequency = <12000000>; - }; - }; - watchdog@fffffd40 { status = "okay"; }; -- cgit v1.2.3 From ee3b67ccd25199a8db492f27d25d01518b3103a9 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:04 +0200 Subject: 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(+) (limited to 'arch/arm/boot/dts/at91sam9rlek.dts') 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 @@ watchdog@fffffd40 { status = "okay"; }; + + rtc@fffffe00 { + status = "okay"; + }; }; }; -- cgit v1.2.3 From 956275739edb2745e778e8684faa4b419aba05e5 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 3 Jun 2015 14:24:12 +0200 Subject: 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(-) (limited to 'arch/arm/boot/dts/at91sam9rlek.dts') 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 { -- cgit v1.2.3