Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sunxi-clk-for-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clk driver updates from Chen-Yu Tsai:
Just one change for this cycle, implementing support for the r-spi
module clock in the A523 PRCM block, which was somehow missing during
the initial bring-up.
* tag 'sunxi-clk-for-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
clk: sunxi-ng: sun55i-a523-r: Add missing r-spi module clock
+16
-1
+16
-1
drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c
+16
-1
drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c
···
83
83
static SUNXI_CCU_GATE_HW(bus_r_pwmctrl_clk, "bus-r-pwmctrl",
84
84
&r_apb0_clk.common.hw, 0x13c, BIT(0), 0);
85
85
86
-
/* SPI clock is /M/N (same as new MMC?) */
86
+
static const struct clk_parent_data r_spi_parents[] = {
87
+
{ .fw_name = "hosc" },
88
+
{ .fw_name = "pll-periph" },
89
+
{ .name = "pll-periph0-300M" },
90
+
{ .name = "pll-periph1-300M" },
91
+
{ .name = "pll-audio" },
92
+
};
93
+
static SUNXI_CCU_DUALDIV_MUX_GATE(r_spi_clk, "r-spi", r_spi_parents, 0x150,
94
+
0, 5, /* M */
95
+
8, 5, /* P */
96
+
24, 3, /* mux */
97
+
BIT(31), /* gate */
98
+
0);
87
99
static SUNXI_CCU_GATE_HW(bus_r_spi_clk, "bus-r-spi",
88
100
&r_ahb_clk.common.hw, 0x15c, BIT(0), 0);
101
+
89
102
static SUNXI_CCU_GATE_HW(bus_r_spinlock_clk, "bus-r-spinlock",
90
103
&r_ahb_clk.common.hw, 0x16c, BIT(0), 0);
91
104
static SUNXI_CCU_GATE_HW(bus_r_msgbox_clk, "bus-r-msgbox",
···
151
138
&bus_r_twd_clk.common,
152
139
&r_pwmctrl_clk.common,
153
140
&bus_r_pwmctrl_clk.common,
141
+
&r_spi_clk.common,
154
142
&bus_r_spi_clk.common,
155
143
&bus_r_spinlock_clk.common,
156
144
&bus_r_msgbox_clk.common,
···
183
169
[CLK_BUS_R_TWD] = &bus_r_twd_clk.common.hw,
184
170
[CLK_R_PWMCTRL] = &r_pwmctrl_clk.common.hw,
185
171
[CLK_BUS_R_PWMCTRL] = &bus_r_pwmctrl_clk.common.hw,
172
+
[CLK_R_SPI] = &r_spi_clk.common.hw,
186
173
[CLK_BUS_R_SPI] = &bus_r_spi_clk.common.hw,
187
174
[CLK_BUS_R_SPINLOCK] = &bus_r_spinlock_clk.common.hw,
188
175
[CLK_BUS_R_MSGBOX] = &bus_r_msgbox_clk.common.hw,