diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2021-02-09 16:03:39 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2021-02-09 16:03:39 -0800 |
| commit | e3272b0bc9d6f4cb0032e422c5bd4f93f994a913 (patch) | |
| tree | de1c67050817de94ecabd93b954882423850aee5 /include | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| parent | 31035839540e3f1669f9e47222108e9278651943 (diff) | |
Merge tag 'clk-meson-v5.12-1-fixed' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet:
- pll driver fixup
- meson8b clock controller dt support clean up
- remove mipi clk from the axg clock controller
* tag 'clk-meson-v5.12-1-fixed' of https://github.com/BayLibre/clk-meson:
clk: meson: axg: Remove MIPI enable clock gate
clk: meson-axg: remove CLKID_MIPI_ENABLE
dt-bindings: clock: meson8b: remove non-existing clock macros
clk: meson: meson8b: remove compatibility code for old .dtbs
clk: meson: clk-pll: propagate the error from meson_clk_pll_set_rate()
clk: meson: clk-pll: make "ret" a signed integer
clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/axg-clkc.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/axg-clkc.h b/include/dt-bindings/clock/axg-clkc.h index e2749dbc74b8..93752ea107e3 100644 --- a/include/dt-bindings/clock/axg-clkc.h +++ b/include/dt-bindings/clock/axg-clkc.h @@ -70,7 +70,6 @@ #define CLKID_HIFI_PLL 69 #define CLKID_PCIE_CML_EN0 79 #define CLKID_PCIE_CML_EN1 80 -#define CLKID_MIPI_ENABLE 81 #define CLKID_GEN_CLK 84 #define CLKID_VPU_0_SEL 92 #define CLKID_VPU_0 93 diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index 4c5965ae1df4..f33781338eda 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -6,8 +6,6 @@ #ifndef __MESON8B_CLKC_H #define __MESON8B_CLKC_H -#define CLKID_UNUSED 0 -#define CLKID_XTAL 1 #define CLKID_PLL_FIXED 2 #define CLKID_PLL_VID 3 #define CLKID_PLL_SYS 4 |