Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1379678 > unrolled thread

[PATCH 0/2] arm64: dts: uniphier: UniPhier DT updates for Linux 4.7-rc1

Started byMasahiro Yamada <yamada.masahiro@socionext.com>
First post2016-04-15 12:40 +0200
Last post2016-04-23 22:20 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 0/2] arm64: dts: uniphier: UniPhier DT updates for Linux 4.7-rc1 Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-15 12:40 +0200
    [PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20 Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-15 12:40 +0200
      Re: [PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20 Arnd Bergmann <arnd@arndb.de> - 2016-04-23 22:20 +0200

#1379678 — [PATCH 0/2] arm64: dts: uniphier: UniPhier DT updates for Linux 4.7-rc1

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-04-15 12:40 +0200
Subject[PATCH 0/2] arm64: dts: uniphier: UniPhier DT updates for Linux 4.7-rc1
Message-ID<ro9km-1wo-15@gated-at.bofh.it>
Masahiro Yamada (2):
  arm64: dts: uniphier: fix I2C nodes of PH1-LD20
  arm64: dts: uniphier: change release address of spin-table

 .../boot/dts/socionext/uniphier-ph1-ld20-ref.dts   |  1 -
 .../boot/dts/socionext/uniphier-ph1-ld20.dtsi      | 28 +++++++---------------
 2 files changed, 9 insertions(+), 20 deletions(-)

-- 
1.9.1

[toc] | [next] | [standalone]


#1379689 — [PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-04-15 12:40 +0200
Subject[PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20
Message-ID<ro9kn-1wo-49@gated-at.bofh.it>
In reply to#1379678
The I2C hardware blocks on this SoC are connected as follows:

  I2C0: external connection
  I2C1: external connection
  I2C2: internal connection
  I2C3: external connection
  I2C4: external connection
  I2C5: internal connection
  I2C6: no connection (not accessible)

Delete pinctrl from Ch2, add pinctrl to Ch4, and remove the Ch6 node.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 .../boot/dts/socionext/uniphier-ph1-ld20-ref.dts     |  1 -
 arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi | 20 +++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
index 727ae5f..b0ed443 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
@@ -70,7 +70,6 @@
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
-		i2c6 = &i2c6;
 	};
 };
 
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
index e682a3f..651c9d9 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
@@ -201,15 +201,12 @@
 
 		i2c2: i2c@58782000 {
 			compatible = "socionext,uniphier-fi2c";
-			status = "disabled";
 			reg = <0x58782000 0x80>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			interrupts = <0 43 4>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_i2c2>;
 			clocks = <&i2c_clk>;
-			clock-frequency = <100000>;
+			clock-frequency = <400000>;
 		};
 
 		i2c3: i2c@58783000 {
@@ -227,12 +224,15 @@
 
 		i2c4: i2c@58784000 {
 			compatible = "socionext,uniphier-fi2c";
+			status = "disabled";
 			reg = <0x58784000 0x80>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			interrupts = <0 45 4>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c4>;
 			clocks = <&i2c_clk>;
-			clock-frequency = <400000>;
+			clock-frequency = <100000>;
 		};
 
 		i2c5: i2c@58785000 {
@@ -245,16 +245,6 @@
 			clock-frequency = <400000>;
 		};
 
-		i2c6: i2c@58786000 {
-			compatible = "socionext,uniphier-fi2c";
-			reg = <0x58786000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <0 26 4>;
-			clocks = <&i2c_clk>;
-			clock-frequency = <400000>;
-		};
-
 		system_bus: system-bus@58c00000 {
 			compatible = "socionext,uniphier-system-bus";
 			status = "disabled";
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]


#1385723 — Re: [PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20

FromArnd Bergmann <arnd@arndb.de>
Date2016-04-23 22:20 +0200
SubjectRe: [PATCH 1/2] arm64: dts: uniphier: fix I2C nodes of PH1-LD20
Message-ID<rrcc2-K6-13@gated-at.bofh.it>
In reply to#1379689
On Friday 15 April 2016 19:30:46 Masahiro Yamada wrote:
> The I2C hardware blocks on this SoC are connected as follows:
> 
>   I2C0: external connection
>   I2C1: external connection
>   I2C2: internal connection
>   I2C3: external connection
>   I2C4: external connection
>   I2C5: internal connection
>   I2C6: no connection (not accessible)
> 
> Delete pinctrl from Ch2, add pinctrl to Ch4, and remove the Ch6 node.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> 


Applied patch 1/2 to the fixes branch now, thanks!

	Arnd

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web