ARM: shmobile: r8a7791: add MLB+ clock

Add MLB+ clock to R8A7791 device tree.

Signed-off-by: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
[Sergei: rebased, renamed, added changelog]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 78d637135e77f36529977c84e7f8d5d12110b0c9..28102265cc71f40c77c35d5335d84641fcf162c2 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1154,17 +1154,17 @@
                mstp8_clks: mstp8_clks@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@e6150994 {
                        compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";

diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index ee9bb94423f393abe57a0ff37cedf0c7b3ed3afa..f096f3f6c16a4c6a2470feeb2dd686796915a93b 100644 (file)
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -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