linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/15] ARM: shmobile: r8a7790: switch console back to scif0
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 02/15] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Simon Horman
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

The boot loader uses scif0, and so must we if we want earlycon to work.

Partially reverts 7c0558941 ("ARM: shmobile: r8a7790: switch from scif
to scifa").

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index e2174d816e78..79f141188d99 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -47,13 +47,13 @@
 	compatible = "renesas,lager", "renesas,r8a7790";
 
 	aliases {
-		serial0 = &scifa0;
+		serial0 = &scif0;
 		serial1 = &scifa1;
 	};
 
 	chosen {
 		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
-		stdout-path = &scifa0;
+		stdout-path = &scif0;
 	};
 
 	memory at 40000000 {
@@ -296,9 +296,9 @@
 		renesas,function = "du";
 	};
 
-	scifa0_pins: serial0 {
-		renesas,groups = "scifa0_data";
-		renesas,function = "scifa0";
+	scif0_pins: serial0 {
+		renesas,groups = "scif0_data";
+		renesas,function = "scif0";
 	};
 
 	ether_pins: ether {
@@ -467,8 +467,8 @@
 	};
 };
 
-&scifa0 {
-	pinctrl-0 = <&scifa0_pins>;
+&scif0 {
+	pinctrl-0 = <&scif0_pins>;
 	pinctrl-names = "default";
 
 	status = "okay";
-- 
2.1.4

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

* [PATCH 02/15] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
  2015-11-27  1:55 ` [PATCH 01/15] ARM: shmobile: r8a7790: switch console back to scif0 Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 03/15] ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port Simon Horman
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled.

This is one of two features from the DT reference platform that are
still missing in MP.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 90543b12d7e2..8a5407678717 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -137,10 +137,14 @@
 	};
 
 	sdhi0_pins: sd0 {
-		renesas,groups = "sdhi0_data4", "sdhi0_ctrl",
-				  "sdhi0_cd";
+		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
 		renesas,function = "sdhi0";
 	};
+	sdhi0_pup_pins: sd0_pup {
+		renesas,groups = "sdhi0_cd", "sdhi0_wp";
+		renesas,function = "sdhi0";
+		bias-pull-up;
+	};
 
 	hspi0_pins: hspi0 {
 		renesas,groups = "hspi0_a";
@@ -169,7 +173,7 @@
 };
 
 &sdhi0 {
-	pinctrl-0 = <&sdhi0_pins>;
+	pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;
 	pinctrl-names = "default";
 
 	vmmc-supply = <&fixedregulator3v3>;
-- 
2.1.4

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

* [PATCH 03/15] ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
  2015-11-27  1:55 ` [PATCH 01/15] ARM: shmobile: r8a7790: switch console back to scif0 Simon Horman
  2015-11-27  1:55 ` [PATCH 02/15] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 04/15] ARM: shmobile: r8a7793: Add DU node to device tree Simon Horman
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm+renesas@opensource.se>

Tie in r8a7794 PFC DU support to the VGA port on the
r8a7794 ALT board.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index fd1cfcdd65ef..b255a8791841 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -80,6 +80,8 @@
 };
 
 &du {
+	pinctrl-0 = <&du_pins>;
+	pinctrl-names = "default";
 	status = "okay";
 
 	clocks = <&mstp7_clks R8A7794_CLK_DU0>,
@@ -101,6 +103,11 @@
 };
 
 &pfc {
+	du_pins: du {
+		renesas,groups = "du1_rgb666", "du1_sync", "du1_disp", "du1_dotclkout0";
+		renesas,function = "du";
+	};
+
 	scif2_pins: serial2 {
 		renesas,groups = "scif2_data";
 		renesas,function = "scif2";
-- 
2.1.4

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

* [PATCH 04/15] ARM: shmobile: r8a7793: Add DU node to device tree
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (2 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 03/15] ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 05/15] ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi Simon Horman
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Add the DU device with a disabled state. Boards that want to enable the
DU need to specify the output topology.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7793.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 2378df52aa32..cbcda80f4658 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -344,6 +344,36 @@
 		status = "disabled";
 	};
 
+	du: display at feb00000 {
+		compatible = "renesas,du-r8a7793";
+		reg = <0 0xfeb00000 0 0x40000>,
+		      <0 0xfeb90000 0 0x1c>;
+		reg-names = "du", "lvds.0";
+		interrupts = <0 256 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 268 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp7_clks R8A7793_CLK_DU0>,
+			 <&mstp7_clks R8A7793_CLK_DU1>,
+			 <&mstp7_clks R8A7793_CLK_LVDS0>;
+		clock-names = "du.0", "du.1", "lvds.0";
+		status = "disabled";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port at 0 {
+				reg = <0>;
+				du_out_rgb: endpoint {
+				};
+			};
+			port at 1 {
+				reg = <1>;
+				du_out_lvds0: endpoint {
+				};
+			};
+		};
+	};
+
 	clocks {
 		#address-cells = <2>;
 		#size-cells = <2>;
-- 
2.1.4

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

* [PATCH 05/15] ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (3 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 04/15] ARM: shmobile: r8a7793: Add DU node to device tree Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 06/15] ARM: shmobile: r8a7794: " Simon Horman
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

Commit a1bc260bb5f5d9 ("gpio: clean up gpio-ranges documentation")
declares the above property deprecated. That was more than 2 years ago.
Remove it, so it doesn't get copied around needlessly.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 3776974e3273..12b2b0f95806 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -509,7 +509,6 @@
 	pfc: pfc at e6060000 {
 		compatible = "renesas,pfc-r8a7791";
 		reg = <0 0xe6060000 0 0x250>;
-		#gpio-range-cells = <3>;
 	};
 
 	mmcif0: mmc at ee200000 {
-- 
2.1.4

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

* [PATCH 06/15] ARM: shmobile: r8a7794: remove deprecated #gpio-range-cells from dtsi
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (4 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 05/15] ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 07/15] ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI Simon Horman
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

Commit a1bc260bb5f5d9 ("gpio: clean up gpio-ranges documentation")
declares the above property deprecated. That was more than 2 years ago.
Remove it, so it doesn't get copied around needlessly.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 57d188c2bf6d..89e914f2a2cf 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -217,7 +217,6 @@
 	pfc: pin-controller at e6060000 {
 		compatible = "renesas,pfc-r8a7794";
 		reg = <0 0xe6060000 0 0x11c>;
-		#gpio-range-cells = <3>;
 	};
 
 	dmac0: dma-controller at e6700000 {
-- 
2.1.4

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

* [PATCH 07/15] ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (5 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 06/15] ARM: shmobile: r8a7794: " Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 08/15] ARM: shmobile: bockw: Move SPI FLASH partition to subnode Simon Horman
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The signals output by the DU to the HDMI transmitter use full 24-bit
RGB. Make sure all pins are properly muxed.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 4ec2d1fba7c9..50d7b17c6ebd 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -326,7 +326,7 @@
 	};
 
 	du_pins: du {
-		renesas,groups = "du_rgb666", "du_sync", "du_disp", "du_clk_out_0";
+		renesas,groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
 		renesas,function = "du";
 	};
 
-- 
2.1.4

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

* [PATCH 08/15] ARM: shmobile: bockw: Move SPI FLASH partition to subnode
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (6 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 07/15] ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 09/15] ARM: shmobile: porter: Move SPI FLASH partitions " Simon Horman
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partition to a
"partitions" subnode.

Based on similar work for the koelsch board by Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 8a5407678717..3c03e6b8261e 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -188,16 +188,19 @@
 	status = "okay";
 
 	flash: flash at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "spansion,s25fl008k", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <104000000>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "data(spi)";
-			reg = <0x00000000 0x00100000>;
+		partitions {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "data(spi)";
+				reg = <0x00000000 0x00100000>;
+			};
 		};
 	};
 };
-- 
2.1.4

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

* [PATCH 09/15] ARM: shmobile: porter: Move SPI FLASH partitions to subnode
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (7 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 08/15] ARM: shmobile: bockw: Move SPI FLASH partition to subnode Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 10/15] ARM: shmobile: lager: " Simon Horman
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partitions to a
"partitions" subnode.

Based on similar work for the koelsch board by Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-porter.dts | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 3e198e7b3ee4..f2dd5356eac8 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -192,8 +192,6 @@
 	status = "okay";
 
 	flash at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "spansion,s25fl512s", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <30000000>;
@@ -201,19 +199,24 @@
 		spi-rx-bus-width = <4>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "loader_prg";
-			reg = <0x00000000 0x00040000>;
-			read-only;
-		};
-		partition at 40000 {
-			label = "user_prg";
-			reg = <0x00040000 0x00400000>;
-			read-only;
-		};
-		partition at 440000 {
-			label = "flash_fs";
-			reg = <0x00440000 0x03bc0000>;
+		partitions {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "loader_prg";
+				reg = <0x00000000 0x00040000>;
+				read-only;
+			};
+			partition at 40000 {
+				label = "user_prg";
+				reg = <0x00040000 0x00400000>;
+				read-only;
+			};
+			partition at 440000 {
+				label = "flash_fs";
+				reg = <0x00440000 0x03bc0000>;
+			};
 		};
 	};
 };
-- 
2.1.4

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

* [PATCH 10/15] ARM: shmobile: lager: Move SPI FLASH partitions to subnode
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (8 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 09/15] ARM: shmobile: porter: Move SPI FLASH partitions " Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 11/15] ARM: shmobile: silk: " Simon Horman
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partitions to a
"partitions" subnode.

Based on similar work for the koelsch board by Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 79f141188d99..c46295afb08a 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -439,8 +439,6 @@
 	status = "okay";
 
 	flash: flash at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "spansion,s25fl512s", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <30000000>;
@@ -450,19 +448,24 @@
 		spi-cpol;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "loader";
-			reg = <0x00000000 0x00040000>;
-			read-only;
-		};
-		partition at 40000 {
-			label = "user";
-			reg = <0x00040000 0x00400000>;
-			read-only;
-		};
-		partition at 440000 {
-			label = "flash";
-			reg = <0x00440000 0x03bc0000>;
+		partitions {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "loader";
+				reg = <0x00000000 0x00040000>;
+				read-only;
+			};
+			partition at 40000 {
+				label = "user";
+				reg = <0x00040000 0x00400000>;
+				read-only;
+			};
+			partition at 440000 {
+				label = "flash";
+				reg = <0x00440000 0x03bc0000>;
+			};
 		};
 	};
 };
-- 
2.1.4

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

* [PATCH 11/15] ARM: shmobile: silk: Move SPI FLASH partitions to subnode
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (9 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 10/15] ARM: shmobile: lager: " Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 12/15] ARM: shmobile: alt: Correct scif2 pfc Simon Horman
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partitions to a
"partitions" subnode.

Based on similar work for the koelsch board by Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index a49942b626c8..58f0ddf21c17 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -194,8 +194,6 @@
 	status = "okay";
 
 	flash at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "spansion,s25fl512s", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <30000000>;
@@ -205,19 +203,24 @@
 		spi-cpha;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "loader";
-			reg = <0x00000000 0x00040000>;
-			read-only;
-		};
-		partition at 40000 {
-			label = "user";
-			reg = <0x00040000 0x00400000>;
-			read-only;
-		};
-		partition at 440000 {
-			label = "flash";
-			reg = <0x00440000 0x03bc0000>;
+		partitions {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "loader";
+				reg = <0x00000000 0x00040000>;
+				read-only;
+			};
+			partition at 40000 {
+				label = "user";
+				reg = <0x00040000 0x00400000>;
+				read-only;
+			};
+			partition at 440000 {
+				label = "flash";
+				reg = <0x00440000 0x03bc0000>;
+			};
 		};
 	};
 };
-- 
2.1.4

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

* [PATCH 12/15] ARM: shmobile: alt: Correct scif2 pfc
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (10 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 11/15] ARM: shmobile: silk: " Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 13/15] ARM: shmobile: alt: Correct ether pfc Simon Horman
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

22b160713cb6 ("ARM: shmobile: alt: Add pfc pins to DT") introduced pfc pins
to the alt device tree but did not reference them. This patch fixes scif2
pfc by adding references to the scif2 pins.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index b255a8791841..c8cafc1d55c3 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -189,5 +189,8 @@
 };
 
 &scif2 {
+	pinctrl-0 = <&scif2_pins>;
+	pinctrl-names = "default";
+
 	status = "okay";
 };
-- 
2.1.4

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

* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5
@ 2015-11-27  1:55 Simon Horman
  2015-11-27  1:55 ` [PATCH 01/15] ARM: shmobile: r8a7790: switch console back to scif0 Simon Horman
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC DT updates for v4.5.

This pull request extends support for Renesas ARM Based SoCs via DT
and includes several minor fixes and cleanups.


The following changes since commit 998f468f34f41905051556a9897dbc204b1b75b4:

  Merge tag 'v4.4-rc1' into HEAD (2015-11-24 12:00:02 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v4.5

for you to fetch changes up to c8d9fdbe2d648caaa510d45dc13eba2e9957140b:

  ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node (2015-11-25 10:42:38 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v4.5

* sh73a0, r8a7740: Add L2 cache-controller node
* r8a7791, r8a7794: remove deprecated #gpio-range-cells
* r8a7793: Add DU support and enable for VGA port
* r8a7790: switch console back to scif0
* alt: Correct ether and scif2 pinmux
* koelsch: Correct hdmi pinmux
* silk, lager, porter, bockw: Move SPI FLASH partitions to subnode
* bockw: Add schi0 pinmux

----------------------------------------------------------------
Geert Uytterhoeven (6):
      ARM: shmobile: bockw: Move SPI FLASH partition to subnode
      ARM: shmobile: porter: Move SPI FLASH partitions to subnode
      ARM: shmobile: lager: Move SPI FLASH partitions to subnode
      ARM: shmobile: silk: Move SPI FLASH partitions to subnode
      ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node
      ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node

Laurent Pinchart (2):
      ARM: shmobile: r8a7793: Add DU node to device tree
      ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI

Magnus Damm (1):
      ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port

Simon Horman (2):
      ARM: shmobile: alt: Correct scif2 pfc
      ARM: shmobile: alt: Correct ether pfc

Ulrich Hecht (2):
      ARM: shmobile: r8a7790: switch console back to scif0
      ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups

Wolfram Sang (2):
      ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi
      ARM: shmobile: r8a7794: remove deprecated #gpio-range-cells from dtsi

 arch/arm/boot/dts/r8a7740.dtsi        | 13 ++++++++++
 arch/arm/boot/dts/r8a7778-bockw.dts   | 23 +++++++++++------
 arch/arm/boot/dts/r8a7790-lager.dts   | 47 +++++++++++++++++++----------------
 arch/arm/boot/dts/r8a7791-koelsch.dts |  2 +-
 arch/arm/boot/dts/r8a7791-porter.dts  | 33 +++++++++++++-----------
 arch/arm/boot/dts/r8a7791.dtsi        |  1 -
 arch/arm/boot/dts/r8a7793.dtsi        | 30 ++++++++++++++++++++++
 arch/arm/boot/dts/r8a7794-alt.dts     | 19 +++++++++++---
 arch/arm/boot/dts/r8a7794-silk.dts    | 33 +++++++++++++-----------
 arch/arm/boot/dts/r8a7794.dtsi        |  1 -
 arch/arm/boot/dts/sh73a0.dtsi         | 14 +++++++++++
 11 files changed, 150 insertions(+), 66 deletions(-)

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

* [PATCH 13/15] ARM: shmobile: alt: Correct ether pfc
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (11 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 12/15] ARM: shmobile: alt: Correct scif2 pfc Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 14/15] ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node Simon Horman
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

22b160713cb6 ("ARM: shmobile: alt: Add pfc pins to DT") introduced pfc pins
to the alt device tree but did not reference them. This patch fixes ether
pfc by:

* Referencing ether pins
* Adding and referencing phy1 pins
* Removing ether b pins. These are not used in the configuration
  of the alt board used for testing and empirically their presence
  prevents ethernet from functioning correctly in that environment.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index c8cafc1d55c3..767d9224d6cc 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -118,9 +118,9 @@
 		renesas,function = "eth";
 	};
 
-	ether_b_pins: ether {
-		renesas,groups = "eth_link_b", "eth_mdio_b", "eth_rmii_b";
-		renesas,function = "eth";
+	phy1_pins: phy1 {
+		renesas,groups = "intc_irq8";
+		renesas,function = "intc";
 	};
 
 	i2c1_pins: i2c1 {
@@ -139,6 +139,9 @@
 };
 
 &ether {
+	pinctrl-0 = <&ether_pins &phy1_pins>;
+	pinctrl-names = "default";
+
 	phy-handle = <&phy1>;
 	renesas,ether-link-active-low;
 	status = "okay";
-- 
2.1.4

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

* [PATCH 14/15] ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (12 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 13/15] ARM: shmobile: alt: Correct ether pfc Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-11-27  1:55 ` [PATCH 15/15] ARM: shmobile: sh73a0 " Simon Horman
  2015-12-11 23:16 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Arnd Bergmann
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

Add the missing L2 cache-controller node, and link the CPU node to it.
This will allow migration to the generic l2c OF initialization.

The L2 cache is an ARM L2C-310 (r3p1-150rel0), of size 256 KiB (32 KiB x
8 ways).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7740.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index e14cb1438216..7676646f7085 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -26,6 +26,7 @@
 			reg = <0x0>;
 			clock-frequency = <800000000>;
 			power-domains = <&pd_a3sm>;
+			next-level-cache = <&L2>;
 		};
 	};
 
@@ -37,6 +38,18 @@
 		      <0xc2000000 0x1000>;
 	};
 
+	L2: cache-controller {
+		compatible = "arm,pl310-cache";
+		reg = <0xf0100000 0x1000>;
+		interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
+		power-domains = <&pd_a3sm>;
+		arm,data-latency = <3 3 3>;
+		arm,tag-latency = <2 2 2>;
+		arm,shared-override;
+		cache-unified;
+		cache-level = <2>;
+	};
+
 	dbsc3: memory-controller at fe400000 {
 		compatible = "renesas,dbsc3-r8a7740";
 		reg = <0xfe400000 0x400>;
-- 
2.1.4

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

* [PATCH 15/15] ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (13 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 14/15] ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node Simon Horman
@ 2015-11-27  1:55 ` Simon Horman
  2015-12-11 23:16 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Arnd Bergmann
  15 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2015-11-27  1:55 UTC (permalink / raw)
  To: linux-arm-kernel

From: Geert Uytterhoeven <geert+renesas@glider.be>

Add the missing L2 cache-controller node, and link the CPU nodes to it.
This will allow migration to the generic l2c OF initialization.

The L2 cache is an ARM L2C-310 (r3p1), of size 512 KiB (64 KiB x 8
ways).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0.dtsi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index ff7c8f298f30..319551f0fcdb 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -28,6 +28,7 @@
 			reg = <0>;
 			clock-frequency = <1196000000>;
 			power-domains = <&pd_a2sl>;
+			next-level-cache = <&L2>;
 		};
 		cpu at 1 {
 			device_type = "cpu";
@@ -35,6 +36,7 @@
 			reg = <1>;
 			clock-frequency = <1196000000>;
 			power-domains = <&pd_a2sl>;
+			next-level-cache = <&L2>;
 		};
 	};
 
@@ -53,6 +55,18 @@
 		      <0xf0000100 0x100>;
 	};
 
+	L2: cache-controller {
+		compatible = "arm,pl310-cache";
+		reg = <0xf0100000 0x1000>;
+		interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+		power-domains = <&pd_a3sm>;
+		arm,data-latency = <3 3 3>;
+		arm,tag-latency = <2 2 2>;
+		arm,shared-override;
+		cache-unified;
+		cache-level = <2>;
+	};
+
 	sbsc2: memory-controller at fb400000 {
 		compatible = "renesas,sbsc-sh73a0";
 		reg = <0xfb400000 0x400>;
-- 
2.1.4

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

* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5
  2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
                   ` (14 preceding siblings ...)
  2015-11-27  1:55 ` [PATCH 15/15] ARM: shmobile: sh73a0 " Simon Horman
@ 2015-12-11 23:16 ` Arnd Bergmann
  15 siblings, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-11 23:16 UTC (permalink / raw)
  To: linux-arm-kernel

On Friday 27 November 2015 10:55:56 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of Renesas ARM based SoC DT updates for v4.5.
> 
> This pull request extends support for Renesas ARM Based SoCs via DT
> and includes several minor fixes and cleanups.
> 

Pulled first and second round of this into next/dt, thanks!

	Arnd

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

end of thread, other threads:[~2015-12-11 23:16 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-27  1:55 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Simon Horman
2015-11-27  1:55 ` [PATCH 01/15] ARM: shmobile: r8a7790: switch console back to scif0 Simon Horman
2015-11-27  1:55 ` [PATCH 02/15] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Simon Horman
2015-11-27  1:55 ` [PATCH 03/15] ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port Simon Horman
2015-11-27  1:55 ` [PATCH 04/15] ARM: shmobile: r8a7793: Add DU node to device tree Simon Horman
2015-11-27  1:55 ` [PATCH 05/15] ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi Simon Horman
2015-11-27  1:55 ` [PATCH 06/15] ARM: shmobile: r8a7794: " Simon Horman
2015-11-27  1:55 ` [PATCH 07/15] ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI Simon Horman
2015-11-27  1:55 ` [PATCH 08/15] ARM: shmobile: bockw: Move SPI FLASH partition to subnode Simon Horman
2015-11-27  1:55 ` [PATCH 09/15] ARM: shmobile: porter: Move SPI FLASH partitions " Simon Horman
2015-11-27  1:55 ` [PATCH 10/15] ARM: shmobile: lager: " Simon Horman
2015-11-27  1:55 ` [PATCH 11/15] ARM: shmobile: silk: " Simon Horman
2015-11-27  1:55 ` [PATCH 12/15] ARM: shmobile: alt: Correct scif2 pfc Simon Horman
2015-11-27  1:55 ` [PATCH 13/15] ARM: shmobile: alt: Correct ether pfc Simon Horman
2015-11-27  1:55 ` [PATCH 14/15] ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node Simon Horman
2015-11-27  1:55 ` [PATCH 15/15] ARM: shmobile: sh73a0 " Simon Horman
2015-12-11 23:16 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.5 Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).