ARM: shmobile: r8a7791: add MLB+ clock
Subsystems (3)
PATCH 1/1 ARM: shmobile: r8a7791: add MLB+ clock
From: Andrey Gusakov <[email protected]>
Add MLB+ clock to R8A7791 device tree.
---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.
arch/arm/boot/dts/r8a7791.dtsi | 10 +++++----- include/dt-bindings/clock/r8a7791-clock.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +5 -5
@@ -1154,17 +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>, <&zg_clk>, <&p_clk>, - <&zs_clk>, <&zs_clk>; + clocks = <&hp_clk>, <&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_IPMMU_SGX R8A7791_CLK_MLB R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0 R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0 >; clock-output-names = - "ipmmu_sgx", "vin2", "vin1", "vin0", "ether", "sata1", - "sata0"; + "ipmmu_sgx", "mlb", "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
@@ -92,6 +92,7 @@/* MSTP8 */ #define R8A7791_CLK_IPMMU_SGX 0 +#define R8A7791_CLK_MLB 2#define R8A7791_CLK_VIN2 9#define R8A7791_CLK_VIN1 10#define R8A7791_CLK_VIN0 11
PATCH 1/1 ARM: shmobile: r8a7791: add MLB+ clock
Quoted 11 lines · Sergei Shtylyov
From: Andrey Gusakov <[email protected]>
Add MLB+ clock to R8A7791 device tree.
Signed-off-by Andrey Gusakov <[email protected]>[Sergei: rebased, renamed, added changelog]Signed-off-by Sergei Shtylyov <[email protected]>---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.
Thanks, I have queued this up.
Quoted 49 lines
arch/arm/boot/dts/r8a7791.dtsi | 10 +++++----- include/dt-bindings/clock/r8a7791-clock.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)Index:
renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================arch/arm/boot/dts/r8a7791.dtsi +5
-5@@ -1154,17 +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>, <&zg_clk>, <&p_clk>, - <&zs_clk>, <&zs_clk>; + clocks = <&hp_clk>, <&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_IPMMU_SGX R8A7791_CLK_MLB R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0 R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0 >; clock-output-names = - "ipmmu_sgx", "vin2", "vin1", "vin0", "ether", "sata1", - "sata0"; + "ipmmu_sgx", "mlb", "vin2", "vin1", "vin0", "ether", + "sata1", "sata0"; }; mstp9_clks: mstp9_clks at e6150994 { compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";Index:
renesas/include/dt-bindings/clock/r8a7791-clock.h
===================================================================include/dt-bindings/clock/r8a7791-clock.h +1
-1@@ -92,6 +92,7 @@/* MSTP8 */ #define R8A7791_CLK_IPMMU_SGX 0 +#define R8A7791_CLK_MLB 2#define R8A7791_CLK_VIN2 9#define R8A7791_CLK_VIN1 10#define R8A7791_CLK_VIN0 11 --To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 ARM: shmobile: r8a7791: add MLB+ clock
In reply to Sergei ShtylyovHello.
Quoted 21 lines · Sergei Shtylyov
From: Andrey Gusakov <[email protected]>
Add MLB+ clock to R8A7791 device tree.
Signed-off-by Andrey Gusakov <[email protected]>[Sergei: rebased, renamed, added changelog]Signed-off-by Sergei Shtylyov <[email protected]>---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.arch/arm/boot/dts/r8a7791.dtsi | 10 +++++----- include/dt-bindings/clock/r8a7791-clock.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)Index:
renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
arch/arm/boot/dts/r8a7791.dtsi line 1157
Quoted 6 lines
arch/arm/boot/dts/r8a7791.dtsi +1
-2@@ -1154,17 +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>, <&zg_clk>, <&p_clk>, - <&zs_clk>, <&zs_clk>; + clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
Oops, the first two clocks need to be swapped. I'll send a fix (since this
patch has been merged already).
arch/arm/boot/dts/r8a7791.dtsi line 1164
Quoted 8 lines
arch/arm/boot/dts/r8a7791.dtsi +2
-1+ <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>; #clock-cells = <1>; clock-indices = < - R8A7791_CLK_IPMMU_SGX + 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 >;
[...]
WBR, Sergei