Skip to contentSkip to conversation

ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree

PATCH New Simon Horman 3 participants 4 messages Dec 9, 2014 – Dec 11, 2014

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

PATCH 1/1 ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree

From: Ryo Kataoka <[email protected]>

[horms: resolved conflicts]

---

Based on the renesas-devel-20141209-v3.18 tag of my renesas tree

* Update by Simon Horman
- Use SGX rather than GP in clock name to reflect datasheet

---
 arch/arm/boot/dts/r8a7791.dtsi            | 8 +++++---
 include/dt-bindings/clock/r8a7791-clock.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +5 -3
index 958a69b..78d6371 100644
@@ -1154,15 +1154,17 @@
 		mstp8_clks: mstp8_clks at e6150990 {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>, <&zs_clk>,
-				 <&zs_clk>;
+			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
+				 <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <
+				R8A7791_CLK_IPMMU_SGX
 				R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0
 				R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
 			>;
 			clock-output-names =
-				"vin2", "vin1", "vin0", "ether", "sata1", "sata0";
+				"ipmmu_sgx", "vin2", "vin1", "vin0", "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 3ea2bbc..ee9bb944 100644
@@ -91,6 +91,7 @@
 #define R8A7791_CLK_LVDS0		26
 
 /* MSTP8 */
+#define R8A7791_CLK_IPMMU_SGX		0
 #define R8A7791_CLK_VIN2		9
 #define R8A7791_CLK_VIN1		10
 #define R8A7791_CLK_VIN0		11
Signature · 1 line
2.1.3
#1 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree

Quoted 5 lines · Simon Horman

From: Ryo Kataoka <[email protected]>

[horms: resolved conflicts]

Looks OK to me...

Quoted 16 lines

---

Based on the renesas-devel-20141209-v3.18 tag of my renesas tree

* Update by Simon Horman
- Use SGX rather than GP in clock name to reflect datasheet

---
 arch/arm/boot/dts/r8a7791.dtsi            | 8 +++++---
 include/dt-bindings/clock/r8a7791-clock.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +0 -0
index 958a69b..78d6371 100644

arch/arm/boot/dts/r8a7791.dtsi line 1158

Quoted 7 lines
arch/arm/boot/dts/r8a7791.dtsi +2 -2
@@ -1154,15 +1154,17 @@
                mstp8_clks: mstp8_clks at e6150990 {
                        compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>, <&zs_clk>,
-                                <&zs_clk>;
+                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
+                                <&zs_clk>, <&zs_clk>;

... but I couldn't find the parent clock in the documentation.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree

Quoted 20 lines · Geert Uytterhoeven
Quoted 5 lines · Simon Horman

From: Ryo Kataoka <[email protected]>

[horms: resolved conflicts]

Looks OK to me...

Quoted 11 lines

---

Based on the renesas-devel-20141209-v3.18 tag of my renesas tree

* Update by Simon Horman
- Use SGX rather than GP in clock name to reflect datasheet

---
 arch/arm/boot/dts/r8a7791.dtsi            | 8 +++++---
 include/dt-bindings/clock/r8a7791-clock.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
Quoted 14 lines

arch/arm/boot/dts/r8a7791.dtsi line 1158

Quoted 12 lines
arch/arm/boot/dts/r8a7791.dtsi +2 -2
index 958a69b..78d6371 100644
@@ -1154,15 +1154,17 @@
                mstp8_clks: mstp8_clks at e6150990 {
                        compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>, <&zs_clk>,
-                                <&zs_clk>;
+                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
+                                <&zs_clk>, <&zs_clk>;

... but I couldn't find the parent clock in the documentation.

I believe we can trust Kataoka-san, but I can confirm the parent clock with hip if you like.

#3 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree

Quoted 36 lines · Simon Horman
Quoted 20 lines · Geert Uytterhoeven
Quoted 5 lines · Simon Horman

From: Ryo Kataoka <[email protected]>

[horms: resolved conflicts]

Looks OK to me...

Quoted 11 lines

---

Based on the renesas-devel-20141209-v3.18 tag of my renesas tree

* Update by Simon Horman
- Use SGX rather than GP in clock name to reflect datasheet

---
 arch/arm/boot/dts/r8a7791.dtsi            | 8 +++++---
 include/dt-bindings/clock/r8a7791-clock.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
Quoted 14 lines

arch/arm/boot/dts/r8a7791.dtsi line 1158

Quoted 12 lines
arch/arm/boot/dts/r8a7791.dtsi +2 -2
index 958a69b..78d6371 100644
@@ -1154,15 +1154,17 @@
                mstp8_clks: mstp8_clks at e6150990 {
                        compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>, <&zs_clk>,
-                                <&zs_clk>;
+                       clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
+                                <&zs_clk>, <&zs_clk>;

... but I couldn't find the parent clock in the documentation.

Quoted 2 lines

I believe we can trust Kataoka-san, but I can confirm the parent clock with hip if you like.

I have decided to queue up this patch for v3.20.