diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-16 15:01:46 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-16 15:01:46 -0700 |
| commit | 4dea04c1f113a848cec8722d2401127227623820 (patch) | |
| tree | 6339770db64cc56c1b6370f560fa03fe79749130 /drivers/clk/meson/Kconfig | |
| parent | ef748cb39d96e96094c09d15cc50e4d7c63a606f (diff) | |
| parent | 215c80a7d65312911ca7b08d42b05652e27eed5f (diff) | |
| download | linux-4dea04c1f113a848cec8722d2401127227623820.tar.bz2 | |
Merge tag 'meson-clk-for-4.13-2' of git://github.com/BayLibre/clk-meson into clk-next
Pull Amlogic clk driver updates from Jerome Brunet:
* Expose more clock gate on meson8 (SAR ADC, RNG, USB, SDIO, ETH)
* Add new compatible to the meson8 clock controller for meson8b
* Add missing parents to gxbb clk81
* tag 'meson-clk-for-4.13-2' of git://github.com/BayLibre/clk-meson:
clk: meson: gxbb: add all clk81 parents
clk: meson: meson8b: add compatibles for Meson8 and Meson8m2
clk: meson8b: export the ethernet gate clock
clk: meson8b: export the USB clocks
clk: meson8b: export the gate clock for the HW random number generator
clk: meson8b: export the SDIO clock
clk: meson8b: export the SAR ADC clocks
Diffstat (limited to 'drivers/clk/meson/Kconfig')
| -rw-r--r-- | drivers/clk/meson/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig index 2f29ee1a4d00..5588f75a8414 100644 --- a/drivers/clk/meson/Kconfig +++ b/drivers/clk/meson/Kconfig @@ -7,9 +7,9 @@ config COMMON_CLK_MESON8B bool depends on COMMON_CLK_AMLOGIC help - Support for the clock controller on AmLogic S805 devices, aka - meson8b. Say Y if you want peripherals and CPU frequency scaling to - work. + Support for the clock controller on AmLogic S802 (Meson8), + S805 (Meson8b) and S812 (Meson8m2) devices. Say Y if you + want peripherals and CPU frequency scaling to work. config COMMON_CLK_GXBB bool |