tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'clk-renesas-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next
Pull renesas r8a7796 SDHI clock support from Geert Uytterhoeven:
Add all clocks needed to use the SDHI interfaces on the Renesas R-Car M3-W
(r8a7796) SoC.
* tag 'clk-renesas-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
clk: renesas: r8a7796: Add SDIF clocks
clk: renesas: r8a7796: Add GPIO clocks
+18
+18
drivers/clk/renesas/r8a7796-cpg-mssr.c
+18
drivers/clk/renesas/r8a7796-cpg-mssr.c
···
70
70
DEF_FIXED(".s1", CLK_S1, CLK_PLL1_DIV2, 3, 1),
71
71
DEF_FIXED(".s2", CLK_S2, CLK_PLL1_DIV2, 4, 1),
72
72
DEF_FIXED(".s3", CLK_S3, CLK_PLL1_DIV2, 6, 1),
73
+
DEF_FIXED(".sdsrc", CLK_SDSRC, CLK_PLL1_DIV2, 2, 1),
73
74
74
75
/* Core Clock Outputs */
75
76
DEF_FIXED("ztr", R8A7796_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
···
94
93
DEF_FIXED("s3d2", R8A7796_CLK_S3D2, CLK_S3, 2, 1),
95
94
DEF_FIXED("s3d4", R8A7796_CLK_S3D4, CLK_S3, 4, 1),
96
95
96
+
DEF_GEN3_SD("sd0", R8A7796_CLK_SD0, CLK_SDSRC, 0x0074),
97
+
DEF_GEN3_SD("sd1", R8A7796_CLK_SD1, CLK_SDSRC, 0x0078),
98
+
DEF_GEN3_SD("sd2", R8A7796_CLK_SD2, CLK_SDSRC, 0x0268),
99
+
DEF_GEN3_SD("sd3", R8A7796_CLK_SD3, CLK_SDSRC, 0x026c),
100
+
97
101
DEF_FIXED("cl", R8A7796_CLK_CL, CLK_PLL1_DIV2, 48, 1),
98
102
DEF_FIXED("cp", R8A7796_CLK_CP, CLK_EXTAL, 2, 1),
99
103
···
110
104
111
105
static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
112
106
DEF_MOD("scif2", 310, R8A7796_CLK_S3D4),
107
+
DEF_MOD("sdif3", 311, R8A7796_CLK_SD3),
108
+
DEF_MOD("sdif2", 312, R8A7796_CLK_SD2),
109
+
DEF_MOD("sdif1", 313, R8A7796_CLK_SD1),
110
+
DEF_MOD("sdif0", 314, R8A7796_CLK_SD0),
113
111
DEF_MOD("rwdt0", 402, R8A7796_CLK_R),
114
112
DEF_MOD("intc-ap", 408, R8A7796_CLK_S3D1),
113
+
DEF_MOD("gpio7", 905, R8A7796_CLK_S3D4),
114
+
DEF_MOD("gpio6", 906, R8A7796_CLK_S3D4),
115
+
DEF_MOD("gpio5", 907, R8A7796_CLK_S3D4),
116
+
DEF_MOD("gpio4", 908, R8A7796_CLK_S3D4),
117
+
DEF_MOD("gpio3", 909, R8A7796_CLK_S3D4),
118
+
DEF_MOD("gpio2", 910, R8A7796_CLK_S3D4),
119
+
DEF_MOD("gpio1", 911, R8A7796_CLK_S3D4),
120
+
DEF_MOD("gpio0", 912, R8A7796_CLK_S3D4),
115
121
};
116
122
117
123
static const unsigned int r8a7796_crit_mod_clks[] __initconst = {