Skip to content

Commit b217785

Browse files
committed
Merge tag 'clk-meson-v6.16-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet: - Fix Amlogic G12 SPICC clock sources - Compile test Amlogic clocks only if ARCH_MESON is set * tag 'clk-meson-v6.16-1' of https://github.com/BayLibre/clk-meson: clk: meson: Do not enable by default during compile testing clk: meson-g12a: add missing fclk_div2 to spicc
2 parents 0af2f6b + 0afce85 commit b217785

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

drivers/clk/meson/Kconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ config COMMON_CLK_MESON_CPU_DYNDIV
5555
config COMMON_CLK_MESON8B
5656
bool "Meson8 SoC Clock controller support"
5757
depends on ARM
58-
default y
58+
default ARCH_MESON
5959
select COMMON_CLK_MESON_REGMAP
6060
select COMMON_CLK_MESON_CLKC_UTILS
6161
select COMMON_CLK_MESON_MPLL
@@ -70,7 +70,7 @@ config COMMON_CLK_MESON8B
7070
config COMMON_CLK_GXBB
7171
tristate "GXBB and GXL SoC clock controllers support"
7272
depends on ARM64
73-
default y
73+
default ARCH_MESON
7474
select COMMON_CLK_MESON_REGMAP
7575
select COMMON_CLK_MESON_DUALDIV
7676
select COMMON_CLK_MESON_VID_PLL_DIV
@@ -86,7 +86,7 @@ config COMMON_CLK_GXBB
8686
config COMMON_CLK_AXG
8787
tristate "AXG SoC clock controllers support"
8888
depends on ARM64
89-
default y
89+
default ARCH_MESON
9090
select COMMON_CLK_MESON_REGMAP
9191
select COMMON_CLK_MESON_DUALDIV
9292
select COMMON_CLK_MESON_MPLL
@@ -136,7 +136,7 @@ config COMMON_CLK_A1_PERIPHERALS
136136
config COMMON_CLK_C3_PLL
137137
tristate "Amlogic C3 PLL clock controller"
138138
depends on ARM64
139-
default y
139+
default ARCH_MESON
140140
select COMMON_CLK_MESON_REGMAP
141141
select COMMON_CLK_MESON_PLL
142142
select COMMON_CLK_MESON_CLKC_UTILS
@@ -149,7 +149,7 @@ config COMMON_CLK_C3_PLL
149149
config COMMON_CLK_C3_PERIPHERALS
150150
tristate "Amlogic C3 peripherals clock controller"
151151
depends on ARM64
152-
default y
152+
default ARCH_MESON
153153
select COMMON_CLK_MESON_REGMAP
154154
select COMMON_CLK_MESON_DUALDIV
155155
select COMMON_CLK_MESON_CLKC_UTILS
@@ -163,7 +163,7 @@ config COMMON_CLK_C3_PERIPHERALS
163163
config COMMON_CLK_G12A
164164
tristate "G12 and SM1 SoC clock controllers support"
165165
depends on ARM64
166-
default y
166+
default ARCH_MESON
167167
select COMMON_CLK_MESON_REGMAP
168168
select COMMON_CLK_MESON_DUALDIV
169169
select COMMON_CLK_MESON_MPLL
@@ -181,7 +181,7 @@ config COMMON_CLK_G12A
181181
config COMMON_CLK_S4_PLL
182182
tristate "S4 SoC PLL clock controllers support"
183183
depends on ARM64
184-
default y
184+
default ARCH_MESON
185185
select COMMON_CLK_MESON_CLKC_UTILS
186186
select COMMON_CLK_MESON_MPLL
187187
select COMMON_CLK_MESON_PLL
@@ -194,7 +194,7 @@ config COMMON_CLK_S4_PLL
194194
config COMMON_CLK_S4_PERIPHERALS
195195
tristate "S4 SoC peripherals clock controllers support"
196196
depends on ARM64
197-
default y
197+
default ARCH_MESON
198198
select COMMON_CLK_MESON_CLKC_UTILS
199199
select COMMON_CLK_MESON_REGMAP
200200
select COMMON_CLK_MESON_DUALDIV

drivers/clk/meson/g12a.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4093,6 +4093,7 @@ static const struct clk_parent_data spicc_sclk_parent_data[] = {
40934093
{ .hw = &g12a_clk81.hw },
40944094
{ .hw = &g12a_fclk_div4.hw },
40954095
{ .hw = &g12a_fclk_div3.hw },
4096+
{ .hw = &g12a_fclk_div2.hw },
40964097
{ .hw = &g12a_fclk_div5.hw },
40974098
{ .hw = &g12a_fclk_div7.hw },
40984099
};

0 commit comments

Comments
 (0)