Skip to content

Commit 772b455

Browse files
committed
Merge tag 'renesas-clk-for-v6.6-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas
Pull another Renesas clk driver update from Geert Uytterhoeven: - Add Audio Clock Generator (ADG) clocks on R-Car Gen3 and RZ/G2 SoCs * tag 'renesas-clk-for-v6.6-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: rcar-gen3: Add ADG clocks
2 parents 226ab01 + 708cb69 commit 772b455

9 files changed

+9
-1
lines changed

drivers/clk/renesas/r8a774a1-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = {
215215
DEF_MOD("rpc-if", 917, R8A774A1_CLK_RPCD2),
216216
DEF_MOD("i2c6", 918, R8A774A1_CLK_S0D6),
217217
DEF_MOD("i2c5", 919, R8A774A1_CLK_S0D6),
218+
DEF_MOD("adg", 922, R8A774A1_CLK_S0D4),
218219
DEF_MOD("iic-pmic", 926, R8A774A1_CLK_CP),
219220
DEF_MOD("i2c4", 927, R8A774A1_CLK_S0D6),
220221
DEF_MOD("i2c3", 928, R8A774A1_CLK_S0D6),

drivers/clk/renesas/r8a774b1-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ static const struct mssr_mod_clk r8a774b1_mod_clks[] __initconst = {
211211
DEF_MOD("rpc-if", 917, R8A774B1_CLK_RPCD2),
212212
DEF_MOD("i2c6", 918, R8A774B1_CLK_S0D6),
213213
DEF_MOD("i2c5", 919, R8A774B1_CLK_S0D6),
214+
DEF_MOD("adg", 922, R8A774B1_CLK_S0D4),
214215
DEF_MOD("iic-pmic", 926, R8A774B1_CLK_CP),
215216
DEF_MOD("i2c4", 927, R8A774B1_CLK_S0D6),
216217
DEF_MOD("i2c3", 928, R8A774B1_CLK_S0D6),

drivers/clk/renesas/r8a774c0-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = {
211211
DEF_MOD("rpc-if", 917, R8A774C0_CLK_RPCD2),
212212
DEF_MOD("i2c6", 918, R8A774C0_CLK_S3D2),
213213
DEF_MOD("i2c5", 919, R8A774C0_CLK_S3D2),
214+
DEF_MOD("adg", 922, R8A774C0_CLK_ZA2),
214215
DEF_MOD("iic-pmic", 926, R8A774C0_CLK_CP),
215216
DEF_MOD("i2c4", 927, R8A774C0_CLK_S3D2),
216217
DEF_MOD("i2c3", 928, R8A774C0_CLK_S3D2),

drivers/clk/renesas/r8a774e1-cpg-mssr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static const struct mssr_mod_clk r8a774e1_mod_clks[] __initconst = {
223223
DEF_MOD("rpc-if", 917, R8A774E1_CLK_RPCD2),
224224
DEF_MOD("i2c6", 918, R8A774E1_CLK_S0D6),
225225
DEF_MOD("i2c5", 919, R8A774E1_CLK_S0D6),
226-
DEF_MOD("adg", 922, R8A774E1_CLK_S0D1),
226+
DEF_MOD("adg", 922, R8A774E1_CLK_S0D4),
227227
DEF_MOD("iic-pmic", 926, R8A774E1_CLK_CP),
228228
DEF_MOD("i2c4", 927, R8A774E1_CLK_S0D6),
229229
DEF_MOD("i2c3", 928, R8A774E1_CLK_S0D6),

drivers/clk/renesas/r8a7795-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = {
253253
DEF_MOD("rpc-if", 917, R8A7795_CLK_RPCD2),
254254
DEF_MOD("i2c6", 918, R8A7795_CLK_S0D6),
255255
DEF_MOD("i2c5", 919, R8A7795_CLK_S0D6),
256+
DEF_MOD("adg", 922, R8A7795_CLK_S0D4),
256257
DEF_MOD("i2c-dvfs", 926, R8A7795_CLK_CP),
257258
DEF_MOD("i2c4", 927, R8A7795_CLK_S0D6),
258259
DEF_MOD("i2c3", 928, R8A7795_CLK_S0D6),

drivers/clk/renesas/r8a7796-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = {
238238
DEF_MOD("rpc-if", 917, R8A7796_CLK_RPCD2),
239239
DEF_MOD("i2c6", 918, R8A7796_CLK_S0D6),
240240
DEF_MOD("i2c5", 919, R8A7796_CLK_S0D6),
241+
DEF_MOD("adg", 922, R8A7796_CLK_S0D4),
241242
DEF_MOD("i2c-dvfs", 926, R8A7796_CLK_CP),
242243
DEF_MOD("i2c4", 927, R8A7796_CLK_S0D6),
243244
DEF_MOD("i2c3", 928, R8A7796_CLK_S0D6),

drivers/clk/renesas/r8a77965-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {
238238
DEF_MOD("rpc-if", 917, R8A77965_CLK_RPCD2),
239239
DEF_MOD("i2c6", 918, R8A77965_CLK_S0D6),
240240
DEF_MOD("i2c5", 919, R8A77965_CLK_S0D6),
241+
DEF_MOD("adg", 922, R8A77965_CLK_S0D4),
241242
DEF_MOD("i2c-dvfs", 926, R8A77965_CLK_CP),
242243
DEF_MOD("i2c4", 927, R8A77965_CLK_S0D6),
243244
DEF_MOD("i2c3", 928, R8A77965_CLK_S0D6),

drivers/clk/renesas/r8a77990-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = {
224224
DEF_MOD("rpc-if", 917, R8A77990_CLK_RPCD2),
225225
DEF_MOD("i2c6", 918, R8A77990_CLK_S3D2),
226226
DEF_MOD("i2c5", 919, R8A77990_CLK_S3D2),
227+
DEF_MOD("adg", 922, R8A77990_CLK_ZA2),
227228
DEF_MOD("i2c-dvfs", 926, R8A77990_CLK_CP),
228229
DEF_MOD("i2c4", 927, R8A77990_CLK_S3D2),
229230
DEF_MOD("i2c3", 928, R8A77990_CLK_S3D2),

drivers/clk/renesas/r8a77995-cpg-mssr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] __initconst = {
181181
DEF_MOD("can-if1", 915, R8A77995_CLK_S3D4),
182182
DEF_MOD("can-if0", 916, R8A77995_CLK_S3D4),
183183
DEF_MOD("rpc-if", 917, R8A77995_CLK_RPCD2),
184+
DEF_MOD("adg", 922, R8A77995_CLK_ZA2),
184185
DEF_MOD("i2c3", 928, R8A77995_CLK_S3D2),
185186
DEF_MOD("i2c2", 929, R8A77995_CLK_S3D2),
186187
DEF_MOD("i2c1", 930, R8A77995_CLK_S3D2),

0 commit comments

Comments
 (0)