From patchwork Wed Mar 2 06:11:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 8478121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DFF939F314 for ; Wed, 2 Mar 2016 06:22:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBAC820377 for ; Wed, 2 Mar 2016 06:22:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8CC2620374 for ; Wed, 2 Mar 2016 06:22:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ab09G-0000Ju-Bo; Wed, 02 Mar 2016 06:20:38 +0000 Received: from mail-by2on0134.outbound.protection.outlook.com ([207.46.100.134] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ab09D-0000IO-EO for linux-arm-kernel@lists.infradead.org; Wed, 02 Mar 2016 06:20:36 +0000 Received: from BY2PR03CA039.namprd03.prod.outlook.com (10.141.249.12) by CY1PR0301MB1658.namprd03.prod.outlook.com (10.162.166.144) with Microsoft SMTP Server (TLS) id 15.1.415.20; Wed, 2 Mar 2016 06:20:12 +0000 Received: from BL2FFO11FD031.protection.gbl (2a01:111:f400:7c09::164) by BY2PR03CA039.outlook.office365.com (2a01:111:e400:2c5d::12) with Microsoft SMTP Server (TLS) id 15.1.415.20 via Frontend Transport; Wed, 2 Mar 2016 06:20:12 +0000 Authentication-Results: spf=neutral (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Neutral (protection.outlook.com: 192.88.168.50 is neither permitted nor denied by domain of freescale.com) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD031.mail.protection.outlook.com (10.173.160.71) with Microsoft SMTP Server (TLS) id 15.1.427.7 via Frontend Transport; Wed, 2 Mar 2016 06:20:11 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u226K73o010264; Tue, 1 Mar 2016 23:20:08 -0700 From: Alison Wang To: , , , Subject: [PATCH] ARM: dts: ls102xa: Use new clock binding Date: Wed, 2 Mar 2016 14:11:22 +0800 Message-ID: <1456899082-29762-1-git-send-email-b18965@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CPI:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(104016004)(189998001)(6806005)(5008740100001)(5001770100001)(50986999)(33646002)(4326007)(2906002)(81156009)(5001960100004)(1096002)(92566002)(11100500001)(48376002)(586003)(47776003)(1220700001)(36756003)(105586002)(19580395003)(19580405001)(50466002)(2201001)(87936001)(229853001)(5003940100001)(575784001)(50226001)(106466001)(77096005)(7059030)(2101003)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1658; H:tx30smr01.am.freescale.net; FPR:; SPF:Neutral; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD031; 1:lnc9DBLGDAvOOfaVYQ5WRybUzeVSgrFAAhMwHNVlSXEidndYdOTGTNsayWYEOf8h6iisizn4ENLh4SD8Fxi8wPZ1PmtBWoBJqzmGbnlPHGx3sd2PomJZfaMl8S9++Ma7zyFrOdSeGRgMMG/MizfoPo+wBUmMSqhux6Hg/TvJBR8oPnLGeZINydcCXv6lmLDwDq8uD3jBDMLOE7AZW5HDmGLU863ox8qqpbrO3b8JaK2EocalAskJ353tNkubJTTi6CkGqvY7rTqjnlCW8jE6UUNALQK1rsrp/PB0PKdI6V+W1Sjy0SihpidZSBHYdHFSa0LX28K8SInbdU0Wb3EToQUfowgBFWh/2eRzKH08uFivqpcqE+Y1op4J7MYJN8zF2vlrQ15F0ULwbZ5hgEmXqwa0I/jaeu8mFNiu+rflcB3qJYlZX26vevK9iCk5Z76yJZT4VxmdIYCZ/B8WxOcHZg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fdc261d9-9fd6-4851-f591-08d34262b5bb X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1658; 2:NfK/DGQCRblQnJ1kzothoT2Y07tySpuvojtzVc5eCLCZX1m5RIlWIXQwSlHJZb7yxH1xmU/SgFMkH4niDtUSxaQudXp0tw8gmhApG8S9dx1YQy61tQh8at+dgTnmfGWJ5CIGp5HU4NyUDzBhbUqJ8LR9Mh3VLQnho7pH4etjojUISqZzjqr4eGxDvlCIY2e7; 3:PALbZawZnsX7JKEdpCIqzqJSkAAQkqDmZMRpit4j5mDXTbHS2cadWnHCjSSRreAAKKlFu6ySGqOiY3i5vYKrJJJmSVpg1xkDUtxEKzknR8fCXvgzC+HtwHJYYtUKSsT8KRh6zVDFtB4athCL+iqrHOmk0AhfQG3oCQ1eOahjMEmNhBF1SYsQat7aBInu8BKX; 25:n9M7wUyq1OGhlNd5E9PZzi0ytYWC6G5V47zvixmI//JwN/6VcGMSJid86TI3uF48dZsmRIQtoIWCafDjP7om0QsE4Odaomx5/SyN88e9nmY68eLz/I0As6JRfhSqY1iB+B0Lmp6ZVjhPbQ+AirZeNxoilXtrOuuNa0BWWRvOGq6xJp8RUUKLrT0bmCvgXsagG3REV6tB3LdvZ6FCcub7Hkf6jf4dMSOMD/3Z9ybbkEVGZ9DQbTQ2iLEYKBPaujk+vKLwKwaMR8I773SWo5W2p5lr/H9gsHAPpHCuCkFedLiucPt4wgiQxLquZzbMmoROAYzY0LJmJqrxUtAw0awS7A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1658; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1658; 20:Cf1xJ/CxwhEiwlcCSl/9MgIdHYZKcjymN8H8luQYuHiPTI2xA6NPNw82HvFSwkmLNdH7w77Kws7DWAYLqoiq7v9GMUDZLZRZQMtnA2mcGesQQ3qlFD0ZZCtpnVSR6LNBRFNX9uqMfpYcnIJmO5tqMQxsj4bkoxDVapVm4To7SiBSVh3yfNd18/OVzEvdHy0IHYwu7MfSpMJBxRw1kcyR64iY9xfpRCcFR5pF4DMfIU/6yzVo0gNddz7j8FpU754LeLjdczTU22NkXulnY1YF6AM4sFAE9ZFj+QkkxCvYo0K1/2zSb+1T/Frxw9OrdldLZzqyKU/WIiCwhDM1uuy9ec4gZv3/jsF2LOs1rAnpYwclDq0bj/5hM5Jj1JdvJPv6MdA3jHHSbTaB03VwVaJODjF6OdJ0IjaZPVbVFVEVJrGnkKnBp12PxZbCZ8gkPeoB; 4:4zL9P6rsc8ULOQsvHsPIlI9tIskyrv8/XfjcBxSR0AOp/0igiCMe8CVJoYpk5owOOsFYnGidI5ypLxoDqvp/0a48RGaLmQYiwFZ6cGIK8a2ZR6yf/VCvXNZ8yZwJuhZhFMVSwGW/l4fhFXnek4ZuYAkrs+wdYw6iw+L1Ot5k4jAy30URjaeL7+KM1flCcFZJoWqDL6rvPqgSDmy8WMvX3m0jpqEKJ0Q5oGCU1l3N8OTBKCEjaAxDaggN4/qQqWErGEpEiihUrriUqagNPH6qE52JfdiCRjpLday4ZUARZAPFs6bp3H1nWI+7nqm9WwM13Oyl6qYkTL7Ew/ej6RkPibvXRrzh6CW+zxK6bp0zO7+tpzZnoLtQEbJgq/yb0S8HA13xcby6Qidbaq/w4MEN+G2ubwS2tGGuslx140hLWgUdI3JR2NrQatNqEGal+LXDaRb4vomE/0uVXLUbUsNgJA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13018025)(13017025)(13015025)(13024025)(13023025)(8121501046)(3002001)(10201501046); SRVR:CY1PR0301MB1658; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1658; X-Forefront-PRVS: 086943A159 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1658; 23:VxXRaBfLaYyo2tRfhqgJEDd0U5zMNzGDxoh2qlU?= =?us-ascii?Q?8df1tGLXSrIpy1pZSJyvbrwj2+UiL1NZxk9KoEVufxK7HQ2L3JAb1newvpd+?= =?us-ascii?Q?qrMA3nOihyfm8ld2RUlAA7+7JnLQIJltoeNph7LzfvlMa1fvbKYIoYOBMUko?= =?us-ascii?Q?pSPDsH9znHbc8TM0SQtC+Gw+HMiItwGC0N1+J4/rg0gW0K3iiMjxxr1JYbqH?= =?us-ascii?Q?cO5MbB73f8IwcFE7yJ8nOiFhD1mMLFYd9OA5D/Bz5cdoYJTjIsk2ST5zRxYc?= =?us-ascii?Q?9tUg8OOs8V4ldZeHhwJyq5b5qVxF5/qQhLWrPm1HOLCN+DmRXZc2Rem0bsL9?= =?us-ascii?Q?OQcxOXtmgcdQ8EzN2pOtxEBcHUOcdc8P38eF+UyBHghk17Ioc6YrMODyJxmR?= =?us-ascii?Q?pdAe/vkR+84ekaUwqAmGm/LjhaCB2cRHcf9ejYwY0Z6zGPDuhJzkJbPGs2Pp?= =?us-ascii?Q?CeBRjpFFP4LZ4jMTxOetGvXu3ax4QUXKX93FtNO2vICbTnhihx0X3in3wn30?= =?us-ascii?Q?F4qKfevtDF4g42BaL+TYxDL6cYiKybVuc7+avL6oonKkYl6+rCkBiRqZ5Eor?= =?us-ascii?Q?KcW+lykJq9k8PplmwmdMmfD6wKXszhvteWFuJGvZ+5WZxhFnclXpAqM0XzFR?= =?us-ascii?Q?mbXT6QKDwdtQIBHLPTbahaBRiFvQt44jvShpgiOi8nYcxfkHInfBPfTXxr2j?= =?us-ascii?Q?vrEGDJj/aRNCvuqzp13OG57Jej4NUxNqlt3sF1PhYaYsyX4YYTtAo378klo/?= =?us-ascii?Q?U6Gf26Iv11mbQCkRG1fLPD/a5qVJSkWtbJGav8IzOZwT6K5eirt3JNdgOmrz?= =?us-ascii?Q?m/RV8vQrdWTsZzJBu0EbioWBNSJgltHWx7u7lW3BgHpaHBRAEwbI4b4cYiIB?= =?us-ascii?Q?pn+q/SrZ27bdPOVLtGbGonZiBJaF1IhR8ZsML3tbK/AHagGh1LhwtFfdQbFC?= =?us-ascii?Q?f3pwGBf1FepXKE1NMq+JZtIxT3NIZW1yFyLELksX7MVhA2kkEcVwaSZD8tAm?= =?us-ascii?Q?gfDYrSy0XLJzH8bKT46chnshv?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1658; 5:EGlFyt2YcY1lBsAs4Tlr+juMs4GrDJjf3TS0FR7jkZUyKu7jbzEa4L7bbbCT46KnxoM0JNNejLmM5qKuRqRCaob+ZDiLisfR3ubic5Y1uQUyaeRE1ntb10PJlexEovlKoaQTxPSINj/1R2fijMJO4w==; 24:C8hfjYTTzAcqfKXsb0EzAIRgIt/+lQ/MR4ME9axOS+7q2px/LmA+S/k32oKWGJ009ac600HLXlU6uZeVQfGoALXW0jnHA8cXCCD1gN5dHZw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2016 06:20:11.0722 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1658 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160301_222035_542418_41F864B8 X-CRM114-Status: GOOD ( 11.63 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alison Wang Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the current clock driver for Freescale QorIQ platform, new clock binding will be used for LS1021A. Signed-off-by: Alison Wang --- arch/arm/boot/dts/ls1021a.dtsi | 97 +++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 57 deletions(-) diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 726372d..5483728 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -74,14 +74,14 @@ compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <0xf00>; - clocks = <&cluster1_clk>; + clocks = <&clockgen 1 0>; }; cpu@f01 { compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <0xf01>; - clocks = <&cluster1_clk>; + clocks = <&clockgen 1 0>; }; }; @@ -99,6 +99,20 @@ ; }; + sysclk: sysclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + clock-output-names = "sysclk"; + }; + + clk32k: clk32k { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "clk32k"; + }; + soc { compatible = "simple-bus"; #address-cells = <2>; @@ -149,7 +163,7 @@ <0x0 0x20220520 0x0 0x4>; reg-names = "ahci", "sata-ecc"; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 0>; dma-coherent; status = "disabled"; }; @@ -200,41 +214,10 @@ }; clockgen: clocking@1ee1000 { - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x0 0x0 0x1ee1000 0x10000>; - - sysclk: sysclk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-output-names = "sysclk"; - }; - - cga_pll1: pll@800 { - compatible = "fsl,qoriq-core-pll-2.0"; - #clock-cells = <1>; - reg = <0x800 0x10>; - clocks = <&sysclk>; - clock-output-names = "cga-pll1", "cga-pll1-div2", - "cga-pll1-div4"; - }; - - platform_clk: pll@c00 { - compatible = "fsl,qoriq-core-pll-2.0"; - #clock-cells = <1>; - reg = <0xc00 0x10>; - clocks = <&sysclk>; - clock-output-names = "platform-clk", "platform-clk-div2"; - }; - - cluster1_clk: clk0c0@0 { - compatible = "fsl,qoriq-core-mux-2.0"; - #clock-cells = <0>; - reg = <0x0 0x10>; - clock-names = "pll1cga", "pll1cga-div2", "pll1cga-div4"; - clocks = <&cga_pll1 0>, <&cga_pll1 1>, <&cga_pll1 2>; - clock-output-names = "cluster1-clk"; - }; + compatible = "fsl,ls1021a-clockgen"; + reg = <0x0 0x1ee1000 0x0 0x1000>; + #clock-cells = <2>; + clocks = <&sysclk>; }; dspi0: dspi@2100000 { @@ -244,7 +227,7 @@ reg = <0x0 0x2100000 0x0 0x10000>; interrupts = ; clock-names = "dspi"; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; spi-num-chipselects = <5>; big-endian; status = "disabled"; @@ -257,7 +240,7 @@ reg = <0x0 0x2110000 0x0 0x10000>; interrupts = ; clock-names = "dspi"; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; spi-num-chipselects = <5>; big-endian; status = "disabled"; @@ -270,7 +253,7 @@ reg = <0x0 0x2180000 0x0 0x10000>; interrupts = ; clock-names = "i2c"; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; status = "disabled"; }; @@ -281,7 +264,7 @@ reg = <0x0 0x2190000 0x0 0x10000>; interrupts = ; clock-names = "i2c"; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; status = "disabled"; }; @@ -292,7 +275,7 @@ reg = <0x0 0x21a0000 0x0 0x10000>; interrupts = ; clock-names = "i2c"; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; status = "disabled"; }; @@ -336,7 +319,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2950000 0x0 0x1000>; interrupts = ; - clocks = <&sysclk>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -345,7 +328,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2960000 0x0 0x1000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -354,7 +337,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2970000 0x0 0x1000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -363,7 +346,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2980000 0x0 0x1000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -372,7 +355,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2990000 0x0 0x1000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -381,7 +364,7 @@ compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x29a0000 0x0 0x1000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clockgen 4 1>; clock-names = "ipg"; status = "disabled"; }; @@ -390,7 +373,7 @@ compatible = "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; interrupts = ; - clocks = <&platform_clk 1>; + clocks = <&clk32k>; clock-names = "wdog-en"; big-endian; }; @@ -400,8 +383,8 @@ compatible = "fsl,vf610-sai"; reg = <0x0 0x2b50000 0x0 0x10000>; interrupts = ; - clocks = <&platform_clk 1>, <&platform_clk 1>, - <&platform_clk 1>, <&platform_clk 1>; + clocks = <&clockgen 4 1>, <&clockgen 4 1>, + <&clockgen 4 1>, <&clockgen 4 1>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; dma-names = "tx", "rx"; dmas = <&edma0 1 47>, @@ -414,8 +397,8 @@ compatible = "fsl,vf610-sai"; reg = <0x0 0x2b60000 0x0 0x10000>; interrupts = ; - clocks = <&platform_clk 1>, <&platform_clk 1>, - <&platform_clk 1>, <&platform_clk 1>; + clocks = <&clockgen 4 1>, <&clockgen 4 1>, + <&clockgen 4 1>, <&clockgen 4 1>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; dma-names = "tx", "rx"; dmas = <&edma0 1 45>, @@ -435,15 +418,15 @@ dma-channels = <32>; big-endian; clock-names = "dmamux0", "dmamux1"; - clocks = <&platform_clk 1>, - <&platform_clk 1>; + clocks = <&clockgen 4 1>, + <&clockgen 4 1>; }; dcu: dcu@2ce0000 { compatible = "fsl,ls1021a-dcu"; reg = <0x0 0x2ce0000 0x0 0x10000>; interrupts = ; - clocks = <&platform_clk 0>; + clocks = <&clockgen 4 0>; clock-names = "dcu"; big-endian; status = "disabled";