diff options
-rw-r--r-- | arch/arm/boot/dts/r8a7791.dtsi | 11 | ||||
-rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index ff49b95df0ec..1e593a2b55fa 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi | |||
@@ -909,7 +909,7 @@ | |||
909 | #clock-cells = <1>; | 909 | #clock-cells = <1>; |
910 | clock-output-names = "main", "pll0", "pll1", "pll3", | 910 | clock-output-names = "main", "pll0", "pll1", "pll3", |
911 | "lb", "qspi", "sdh", "sd0", "z", | 911 | "lb", "qspi", "sdh", "sd0", "z", |
912 | "rcan"; | 912 | "rcan", "adsp"; |
913 | }; | 913 | }; |
914 | 914 | ||
915 | /* Variable factor clocks */ | 915 | /* Variable factor clocks */ |
@@ -1164,13 +1164,16 @@ | |||
1164 | mstp5_clks: mstp5_clks@e6150144 { | 1164 | mstp5_clks: mstp5_clks@e6150144 { |
1165 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | 1165 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; |
1166 | reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; | 1166 | reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; |
1167 | clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>; | 1167 | clocks = <&hp_clk>, <&hp_clk>, <&cpg_clocks R8A7791_CLK_ADSP>, |
1168 | <&extal_clk>, <&p_clk>; | ||
1168 | #clock-cells = <1>; | 1169 | #clock-cells = <1>; |
1169 | clock-indices = < | 1170 | clock-indices = < |
1170 | R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1 | 1171 | R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1 |
1171 | R8A7791_CLK_THERMAL R8A7791_CLK_PWM | 1172 | R8A7791_CLK_ADSP_MOD R8A7791_CLK_THERMAL |
1173 | R8A7791_CLK_PWM | ||
1172 | >; | 1174 | >; |
1173 | clock-output-names = "audmac0", "audmac1", "thermal", "pwm"; | 1175 | clock-output-names = "audmac0", "audmac1", "adsp_mod", |
1176 | "thermal", "pwm"; | ||
1174 | }; | 1177 | }; |
1175 | mstp7_clks: mstp7_clks@e615014c { | 1178 | mstp7_clks: mstp7_clks@e615014c { |
1176 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | 1179 | 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 a45a36307895..8fc5dc8faeea 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #define R8A7791_CLK_SD0 7 | 21 | #define R8A7791_CLK_SD0 7 |
22 | #define R8A7791_CLK_Z 8 | 22 | #define R8A7791_CLK_Z 8 |
23 | #define R8A7791_CLK_RCAN 9 | 23 | #define R8A7791_CLK_RCAN 9 |
24 | #define R8A7791_CLK_ADSP 10 | ||
24 | 25 | ||
25 | /* MSTP0 */ | 26 | /* MSTP0 */ |
26 | #define R8A7791_CLK_MSIOF0 0 | 27 | #define R8A7791_CLK_MSIOF0 0 |
@@ -72,6 +73,7 @@ | |||
72 | /* MSTP5 */ | 73 | /* MSTP5 */ |
73 | #define R8A7791_CLK_AUDIO_DMAC1 1 | 74 | #define R8A7791_CLK_AUDIO_DMAC1 1 |
74 | #define R8A7791_CLK_AUDIO_DMAC0 2 | 75 | #define R8A7791_CLK_AUDIO_DMAC0 2 |
76 | #define R8A7791_CLK_ADSP_MOD 6 | ||
75 | #define R8A7791_CLK_THERMAL 22 | 77 | #define R8A7791_CLK_THERMAL 22 |
76 | #define R8A7791_CLK_PWM 23 | 78 | #define R8A7791_CLK_PWM 23 |
77 | 79 | ||