Skip to contentSkip to conversation

Add R8A7791 EtherAVB DT support

PATCH New Sergei Shtylyov 2 participants 5 messages Dec 2, 2015 – Dec 7, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Add R8A7791 EtherAVB DT support

Hello.

Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20151201-v4.4-rc3' tag. Here we add the EtherAVB device tree support for the R8A7791 SoC. The 2nd patch depends on the Simon's recent EtherAVB driver patches in order to work...

[1/2] ARM: shmobile: r8a7791: add EtherAVB clock [2/2] ARM: shmobile: r8a7791: add EtherAVB DT support

WBR, Sergei

#1 lore raw

PATCH 1/2 ARM: shmobile: r8a7791: add EtherAVB clock

Add the EtherAVB clock to the R8A7791 device tree.

Based on the commit 63d2d750c902 ("ARM: shmobile: r8a7790: add EtherAVB clocks").

---
 arch/arm/boot/dts/r8a7791.dtsi            |   10 ++++++----
 include/dt-bindings/clock/r8a7791-clock.h |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +6 -4
Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
@@ -1329,16 +1329,18 @@
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
 			clocks = <&zx_clk>, <&hp_clk>, <&zg_clk>, <&zg_clk>,
-			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
+			         <&zg_clk>, <&hp_clk>, <&p_clk>, <&zs_clk>,
+				 <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <
 				R8A7791_CLK_IPMMU_SGX R8A7791_CLK_MLB
 				R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0
-				R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
+				R8A7791_CLK_ETHERAVB R8A7791_CLK_ETHER
+				R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
 			>;
 			clock-output-names =
-				"ipmmu_sgx", "mlb", "vin2", "vin1", "vin0", "ether",
-				"sata1", "sata0";
+				"ipmmu_sgx", "mlb", "vin2", "vin1", "vin0",
+				"etheravb", "ether", "sata1", "sata0";
 		};
 		mstp9_clks: mstp9_clks at e6150994 {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
include/dt-bindings/clock/r8a7791-clock.h +1 -0
Index: renesas/include/dt-bindings/clock/r8a7791-clock.h
===================================================================
@@ -102,6 +102,7 @@
 #define R8A7791_CLK_VIN2		9
 #define R8A7791_CLK_VIN1		10
 #define R8A7791_CLK_VIN0		11
+#define R8A7791_CLK_ETHERAVB		12
 #define R8A7791_CLK_ETHER		13
 #define R8A7791_CLK_SATA1		14
 #define R8A7791_CLK_SATA0		15
#2 lore raw

PATCH 2/2 ARM: shmobile: r8a7791: add EtherAVB DT support

In reply to Sergei Shtylyov

Define the generic R8A7791 part of the EtherAVB device node.

Based on the commit f25d6b977240 ("ARM: shmobile: r8a7790: add EtherAVB DT support").

---
 arch/arm/boot/dts/r8a7791.dtsi |   12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +12 -0
Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
@@ -785,6 +785,18 @@
 		status = "disabled";
 	};
 
+	avb: ethernet at e6800000 {
+		compatible = "renesas,etheravb-r8a7791",
+			     "renesas,etheravb-rcar-gen2";
+		reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+		interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp8_clks R8A7791_CLK_ETHERAVB>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	sata0: sata at ee300000 {
 		compatible = "renesas,sata-r8a7791";
 		reg = <0 0xee300000 0 0x2000>;
#3 lore raw

cover Add R8A7791 EtherAVB DT support

In reply to Sergei Shtylyov

Hello.

Quoted 4 lines · Sergei Shtylyov

Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20151201-v4.4-rc3' tag. Here we add the EtherAVB device tree support for the R8A7791 SoC. The 2nd patch depends on the Simon's recent EtherAVB driver patches in order to work...

Well, not exactly "work", as the node is disabled. Anyway, Simon's patches
got merged to net-next.git by Dave, so I think this series can be merged now as well...

Quoted 2 lines

[1/2] ARM: shmobile: r8a7791: add EtherAVB clock [2/2] ARM: shmobile: r8a7791: add EtherAVB DT support

MBR, Sergei

#4 lore raw

cover Add R8A7791 EtherAVB DT support

Quoted 4 lines · Sergei Shtylyov

Hello.

On 12/3/2015 1:19 AM, Sergei Shtylyov wrote:

Quoted 8 lines
Quoted 4 lines

Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20151201-v4.4-rc3' tag. Here we add the EtherAVB device tree support for the R8A7791 SoC. The 2nd patch depends on the Simon's recent EtherAVB driver patches in order to work...

Well, not exactly "work", as the node is disabled. Anyway, Simon's
patches got merged to net-next.git by Dave, so I think this series can be merged now as well...

Thanks, I have queued these up.