From patchwork Sun Mar 12 15:16:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 95181 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp830961qgd; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) X-Received: by 10.223.136.4 with SMTP id d4mr24332754wrd.44.1489331929390; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l91si21034877wrc.30.2017.03.12.08.18.49; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id F1360C21C34; Sun, 12 Mar 2017 15:18:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 98615C21C5E; Sun, 12 Mar 2017 15:17:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C7AAC21BE6; Sun, 12 Mar 2017 15:17:13 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 957F6C21C32 for ; Sun, 12 Mar 2017 15:17:11 +0000 (UTC) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id v2CFGnTt028763; Mon, 13 Mar 2017 00:16:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v2CFGnTt028763 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1489331815; bh=5FvJcrdrUgKYNWyb6Pac/11Gb2izUlYbthiW3mo7rGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUoaYwIcDgi0vEPHBfWtWUC46HMkxNSHChcC+U47v1ZXGIM8VLVgjsRYyRYEN7mc0 eg6U2UaFUCzb6Of0YcYsmJWZy7YdsUebrYB6G7bPLcgTXuZWhFT817QbOLBUZTeto4 atrEYtHqqroxv2V75Q107zV72J+mPVmUJPpQhatXKSICM3S5k4WvExY3piEi4eZ85Y N9qCooL9ki83JePCmH7Z8AW0FQ0wf+DVrLeF3mEYtgGYPVe+AS/lOE6ccl7F2aS/QL 4Xpcv9vg22qQb4xmJuwzxaCI5p/GT/FGfw5x5gpb+rK3x5gT9ynyajncJ1FcwTDwWJ Ywi2NQUol96YQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 13 Mar 2017 00:16:41 +0900 Message-Id: <1489331802-28231-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> References: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v2 3/3] ARM: dts: uniphier: more re-sync DT with Linux X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" For better maintainability. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-pxs2.dtsi | 22 ++++++++-------------- arch/arm/dts/uniphier-sld3.dtsi | 7 +++++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 8488984..2843adb 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -318,7 +318,7 @@ }; mioctrl@5b3e0000 { - compatible = "socionext,uniphier-mioctrl", + compatible = "socionext,uniphier-ld11-mioctrl", "simple-mfd", "syscon"; reg = <0x5b3e0000 0x800>; diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index 904320c..b0f6f94 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -112,12 +112,6 @@ compatible = "fixed-clock"; clock-frequency = <50000000>; }; - - i2c_clk: i2c_clk { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <50000000>; - }; }; soc { @@ -389,7 +383,7 @@ interrupts = <0 41 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c0>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 4>; clock-frequency = <100000>; }; @@ -402,7 +396,7 @@ interrupts = <0 42 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 5>; clock-frequency = <100000>; }; @@ -415,7 +409,7 @@ interrupts = <0 43 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 6>; clock-frequency = <100000>; }; @@ -428,7 +422,7 @@ interrupts = <0 44 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 7>; clock-frequency = <100000>; }; @@ -439,7 +433,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 45 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 8>; clock-frequency = <400000>; }; @@ -450,7 +444,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 25 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 9>; clock-frequency = <400000>; }; @@ -461,7 +455,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 26 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 10>; clock-frequency = <400000>; }; @@ -590,7 +584,7 @@ sysctrl@61840000 { compatible = "socionext,uniphier-pxs2-sysctrl", "simple-mfd", "syscon"; - reg = <0x61840000 0x4000>; + reg = <0x61840000 0x10000>; sys_clk: clock { compatible = "socionext,uniphier-pxs2-clock"; diff --git a/arch/arm/dts/uniphier-sld3.dtsi b/arch/arm/dts/uniphier-sld3.dtsi index 7578920..9e458d3 100644 --- a/arch/arm/dts/uniphier-sld3.dtsi +++ b/arch/arm/dts/uniphier-sld3.dtsi @@ -101,6 +101,7 @@ interrupts = <0 33 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -111,6 +112,7 @@ interrupts = <0 35 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -121,6 +123,7 @@ interrupts = <0 37 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -307,7 +310,7 @@ }; mioctrl@59810000 { - compatible = "socionext,uniphier-mioctrl", + compatible = "socionext,uniphier-sld3-mioctrl", "simple-mfd", "syscon"; reg = <0x59810000 0x800>; u-boot,dm-pre-reloc; @@ -427,7 +430,7 @@ sysctrl@f1840000 { compatible = "socionext,uniphier-sld3-sysctrl", "simple-mfd", "syscon"; - reg = <0xf1840000 0x4000>; + reg = <0xf1840000 0x10000>; sys_clk: clock { compatible = "socionext,uniphier-sld3-clock";