[PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1
@ 2016-06-14  2:59 Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 1/3] ARM: dts: uniphier: add System Bus pinmux node Masahiro Yamada
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-06-14  2:59 UTC (permalink / raw)
  To: arm; +Cc: Masahiro Yamada, linux-arm-kernel, Russell King, linux-kernel




Masahiro Yamada (3):
  ARM: dts: uniphier: add System Bus pinmux node
  ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs
  ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards

 arch/arm/boot/dts/uniphier-common32.dtsi          | 12 +++++++++---
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi           |  2 +-
 arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi          |  2 +-
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi          |  2 +-
 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi          |  2 +-
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi          |  2 +-
 arch/arm/boot/dts/uniphier-pinctrl.dtsi           |  5 +++++
 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts |  8 ++++----
 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts  |  8 ++++----
 arch/arm/boot/dts/uniphier-proxstream2.dtsi       |  2 +-
 10 files changed, 28 insertions(+), 17 deletions(-)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] ARM: dts: uniphier: add System Bus pinmux node
  2016-06-14  2:59 [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Masahiro Yamada
@ 2016-06-14  2:59 ` Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 2/3] ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs Masahiro Yamada
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-06-14  2:59 UTC (permalink / raw)
  To: arm; +Cc: Masahiro Yamada, linux-arm-kernel, Russell King, linux-kernel

This pin-muxing is needed to get access to the UniPhier System Bus.

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

 arch/arm/boot/dts/uniphier-common32.dtsi | 2 ++
 arch/arm/boot/dts/uniphier-pinctrl.dtsi  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi
index 61a0955..891327f 100644
--- a/arch/arm/boot/dts/uniphier-common32.dtsi
+++ b/arch/arm/boot/dts/uniphier-common32.dtsi
@@ -105,6 +105,8 @@
 			reg = <0x58c00000 0x400>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_system_bus>;
 		};
 
 		smpctrl@59800000 {
diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
index f2f3fbe..10a7110 100644
--- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
@@ -78,6 +78,11 @@
 		function = "nand";
 	};
 
+	pinctrl_system_bus: system_bus_grp {
+		groups = "system_bus", "system_bus_cs1";
+		function = "system_bus";
+	};
+
 	pinctrl_uart0: uart0_grp {
 		groups = "uart0";
 		function = "uart0";
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs
  2016-06-14  2:59 [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 1/3] ARM: dts: uniphier: add System Bus pinmux node Masahiro Yamada
@ 2016-06-14  2:59 ` Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 3/3] ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards Masahiro Yamada
  2016-06-14 17:39 ` [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Olof Johansson
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-06-14  2:59 UTC (permalink / raw)
  To: arm; +Cc: Masahiro Yamada, linux-arm-kernel, Russell King, linux-kernel

This node consists of various system-level configuration registers.

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

 arch/arm/boot/dts/uniphier-common32.dtsi    | 10 +++++++---
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi     |  2 +-
 arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi    |  2 +-
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi    |  2 +-
 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi    |  2 +-
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi    |  2 +-
 arch/arm/boot/dts/uniphier-proxstream2.dtsi |  2 +-
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi
index 891327f..03f60ec 100644
--- a/arch/arm/boot/dts/uniphier-common32.dtsi
+++ b/arch/arm/boot/dts/uniphier-common32.dtsi
@@ -136,9 +136,13 @@
 			interrupt-controller;
 		};
 
-		pinctrl: pinctrl@5f801000 {
-			/* specify compatible in each SoC DTSI */
-			reg = <0x5f801000 0xe00>;
+		soc-glue@5f800000 {
+			compatible = "simple-mfd", "syscon";
+			reg = <0x5f800000 0x2000>;
+
+			pinctrl: pinctrl {
+				 /* specify compatible in each SoC DTSI */
+			};
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
index dadd860..debad7f 100644
--- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
@@ -182,5 +182,5 @@
 };
 
 &pinctrl {
-	compatible = "socionext,ph1-ld4-pinctrl", "syscon";
+	compatible = "socionext,uniphier-ld4-pinctrl";
 };
diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
index 5321152..19c107c 100644
--- a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
+++ b/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
@@ -63,5 +63,5 @@
  * which makes the pinctrl driver unshareable.
  */
 &pinctrl {
-	compatible = "socionext,ph1-ld6b-pinctrl", "syscon";
+	compatible = "socionext,uniphier-ld6b-pinctrl";
 };
diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
index 20f3f2a..7b9da08 100644
--- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
@@ -200,5 +200,5 @@
 };
 
 &pinctrl {
-	compatible = "socionext,ph1-pro4-pinctrl", "syscon";
+	compatible = "socionext,uniphier-pro4-pinctrl";
 };
diff --git a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
index 24f6f66..7e4aa2f 100644
--- a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
@@ -194,5 +194,5 @@
 };
 
 &pinctrl {
-	compatible = "socionext,ph1-pro5-pinctrl", "syscon";
+	compatible = "socionext,uniphier-pro5-pinctrl";
 };
diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
index 6bfd29a..467f9d8 100644
--- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
@@ -181,5 +181,5 @@
 };
 
 &pinctrl {
-	compatible = "socionext,ph1-sld8-pinctrl", "syscon";
+	compatible = "socionext,uniphier-sld8-pinctrl";
 };
diff --git a/arch/arm/boot/dts/uniphier-proxstream2.dtsi b/arch/arm/boot/dts/uniphier-proxstream2.dtsi
index 4ac484c..d00d6f5 100644
--- a/arch/arm/boot/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/boot/dts/uniphier-proxstream2.dtsi
@@ -205,5 +205,5 @@
 };
 
 &pinctrl {
-	compatible = "socionext,proxstream2-pinctrl", "syscon";
+	compatible = "socionext,uniphier-pxs2-pinctrl";
 };
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards
  2016-06-14  2:59 [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 1/3] ARM: dts: uniphier: add System Bus pinmux node Masahiro Yamada
  2016-06-14  2:59 ` [PATCH 2/3] ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs Masahiro Yamada
@ 2016-06-14  2:59 ` Masahiro Yamada
  2016-06-14 17:39 ` [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Olof Johansson
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-06-14  2:59 UTC (permalink / raw)
  To: arm; +Cc: Masahiro Yamada, linux-arm-kernel, Russell King, linux-kernel

On these two boards, the serial0 is used for inter-chip connection,
so cannot be used for login console.  The serial2 is used instead
for them, but it is tedious to use because upper level deployment
projects must switch login console per board.

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

 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 8 ++++----
 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts b/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
index bf2619e..98d895b 100644
--- a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
@@ -55,13 +55,13 @@
 	};
 
 	chosen {
-		stdout-path = "serial2:115200n8";
+		stdout-path = "serial0:115200n8";
 	};
 
 	aliases {
-		serial0 = &serial0;
-		serial1 = &serial1;
-		serial2 = &serial2;
+		serial0 = &serial2;
+		serial1 = &serial0;
+		serial2 = &serial1;
 		i2c0 = &i2c0;
 		i2c2 = &i2c2;
 		i2c4 = &i2c4;
diff --git a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts b/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
index 498acac..1fb8bd7 100644
--- a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
@@ -55,13 +55,13 @@
 	};
 
 	chosen {
-		stdout-path = "serial2:115200n8";
+		stdout-path = "serial0:115200n8";
 	};
 
 	aliases {
-		serial0 = &serial0;
-		serial1 = &serial1;
-		serial2 = &serial2;
+		serial0 = &serial2;
+		serial1 = &serial0;
+		serial2 = &serial1;
 		i2c0 = &i2c0;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1
  2016-06-14  2:59 [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Masahiro Yamada
                   ` (2 preceding siblings ...)
  2016-06-14  2:59 ` [PATCH 3/3] ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards Masahiro Yamada
@ 2016-06-14 17:39 ` Olof Johansson
  3 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2016-06-14 17:39 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: arm, linux-arm-kernel, Russell King, linux-kernel

On Tue, Jun 14, 2016 at 11:59:43AM +0900, Masahiro Yamada wrote:
> 
> 
> 
> Masahiro Yamada (3):
>   ARM: dts: uniphier: add System Bus pinmux node
>   ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs
>   ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards

Applied.


-Olof

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-06-14 17:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14  2:59 [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Masahiro Yamada
2016-06-14  2:59 ` [PATCH 1/3] ARM: dts: uniphier: add System Bus pinmux node Masahiro Yamada
2016-06-14  2:59 ` [PATCH 2/3] ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs Masahiro Yamada
2016-06-14  2:59 ` [PATCH 3/3] ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards Masahiro Yamada
2016-06-14 17:39 ` [PATCH 0/3] ARM: dts: uniphier: UniPhier DTS updates (32bit) for v4.8-rc1 Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox