Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934055Ab3GQUG3 (ORCPT ); Wed, 17 Jul 2013 16:06:29 -0400 Received: from 9.mo1.mail-out.ovh.net ([178.32.108.172]:32970 "EHLO mo1.mail-out.ovh.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932140Ab3GQUG1 (ORCPT ); Wed, 17 Jul 2013 16:06:27 -0400 From: Boris BREZILLON To: Nicolas Ferre , Ludovic Desroches , Jean-Christophe Plagniol-Villard , Mike Turquette , Russell King , Linus Walleij , Wenyou Yang Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Boris BREZILLON X-Ovh-Mailout: 178.32.228.1 (mo1.mail-out.ovh.net) Subject: [PATCH v2 36/42] ARM: at91/dt: move sam9260/sam9g20 to new at91 clk implem Date: Wed, 17 Jul 2013 22:06:11 +0200 Message-Id: <1374091571-21935-1-git-send-email-b.brezillon@overkiz.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374068069-13496-1-git-send-email-b.brezillon@overkiz.com> References: <1374068069-13496-1-git-send-email-b.brezillon@overkiz.com> X-Ovh-Tracer-Id: 17949377791234504812 X-Ovh-Remote: 78.236.240.82 (cha74-5-78-236-240-82.fbx.proxad.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeijedrvdehucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.5/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeijedrvdehucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4660 Lines: 208 Define the main clock frequency in every sam9260/sam9g20 boards. Remove the old main clock definition. Signed-off-by: Boris BREZILLON --- arch/arm/boot/dts/animeo_ip.dts | 17 ++++++----------- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 17 ++++++----------- arch/arm/boot/dts/ge863-pro3.dtsi | 16 ++++++---------- arch/arm/boot/dts/kizbox.dts | 5 +++++ arch/arm/boot/dts/tny_a9260_common.dtsi | 17 ++++++----------- arch/arm/boot/dts/usb_a9260_common.dtsi | 17 ++++++----------- 6 files changed, 35 insertions(+), 54 deletions(-) diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts index 3a1de9e..1843f15 100644 --- a/arch/arm/boot/dts/animeo_ip.dts +++ b/arch/arm/boot/dts/animeo_ip.dts @@ -31,17 +31,6 @@ reg = <0x20000000 0x4000000>; }; - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <18432000>; - }; - }; - ahb { apb { usart0: serial@fffb0000 { @@ -82,6 +71,12 @@ watchdog@fffffd40 { status = "okay"; }; + + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <18432000>; + }; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 1373546..b8c823d 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -17,17 +17,6 @@ reg = <0x20000000 0x4000000>; }; - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <18432000>; - }; - }; - ahb { apb { pinctrl@fffff400 { @@ -108,6 +97,12 @@ watchdog@fffffd40 { status = "okay"; }; + + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <18432000>; + }; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/ge863-pro3.dtsi b/arch/arm/boot/dts/ge863-pro3.dtsi index 230099b..b0b6aae 100644 --- a/arch/arm/boot/dts/ge863-pro3.dtsi +++ b/arch/arm/boot/dts/ge863-pro3.dtsi @@ -10,22 +10,18 @@ #include "at91sam9260.dtsi" / { - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <6000000>; - }; - }; ahb { apb { dbgu: serial@fffff200 { status = "okay"; }; + + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <6000000>; + }; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts index 02df191..091da2e 100644 --- a/arch/arm/boot/dts/kizbox.dts +++ b/arch/arm/boot/dts/kizbox.dts @@ -53,6 +53,11 @@ status = "okay"; }; + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <18432000>; + }; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/tny_a9260_common.dtsi b/arch/arm/boot/dts/tny_a9260_common.dtsi index 0e6d3de..1cecb7a 100644 --- a/arch/arm/boot/dts/tny_a9260_common.dtsi +++ b/arch/arm/boot/dts/tny_a9260_common.dtsi @@ -15,22 +15,17 @@ reg = <0x20000000 0x4000000>; }; - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <12000000>; - }; - }; - ahb { apb { dbgu: serial@fffff200 { status = "okay"; }; + + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <12000000>; + }; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/usb_a9260_common.dtsi b/arch/arm/boot/dts/usb_a9260_common.dtsi index 2859776..3ed4db8 100644 --- a/arch/arm/boot/dts/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/usb_a9260_common.dtsi @@ -7,17 +7,6 @@ */ / { - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <12000000>; - }; - }; - ahb { apb { dbgu: serial@fffff200 { @@ -33,6 +22,12 @@ atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; }; + + pmc: pmc@fffffc00 { + main: mainck { + clock-frequency = <12000000>; + }; + }; }; nand0: nand@40000000 { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/