| Message ID | 20190304105358.4987-1-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | dc6276f57617344c9e78332c682ea1e982527e09 |
| Headers | show |
| Series | clk: g12a-aoclk: re-export CLKID_AO_SAR_ADC_SEL clock id | expand |
On Mon, 2019-03-04 at 11:53 +0100, Neil Armstrong wrote: > When submitted v2 of the G12A AO-CLK IDs, the SAR_ADC_SEL ID was moved > to the internal non-exported bindings, but this clock is necessary and > mandatory for the SAR ADC bindings. > > Export it back to the public bindings. > > Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings") > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/clk/meson/g12a-aoclk.h | 1 - > include/dt-bindings/clock/g12a-aoclkc.h | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) Acked-by: Jerome Brunet <jbrunet@baylibre.com>
On 04/03/2019 11:53, Neil Armstrong wrote: > When submitted v2 of the G12A AO-CLK IDs, the SAR_ADC_SEL ID was moved > to the internal non-exported bindings, but this clock is necessary and > mandatory for the SAR ADC bindings. > > Export it back to the public bindings. > > Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings") > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/clk/meson/g12a-aoclk.h | 1 - > include/dt-bindings/clock/g12a-aoclkc.h | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h > index 04b0d5506641..666b4493822c 100644 > --- a/drivers/clk/meson/g12a-aoclk.h > +++ b/drivers/clk/meson/g12a-aoclk.h > @@ -16,7 +16,6 @@ > * to expose, such as the internal muxes and dividers of composite clocks, > * will remain defined here. > */ > -#define CLKID_AO_SAR_ADC_SEL 16 > #define CLKID_AO_SAR_ADC_DIV 17 > #define CLKID_AO_CTS_OSCIN 19 > #define CLKID_AO_32K_PRE 20 > diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h > index 8db01ffbeb06..5ac66a2eee0f 100644 > --- a/include/dt-bindings/clock/g12a-aoclkc.h > +++ b/include/dt-bindings/clock/g12a-aoclkc.h > @@ -26,6 +26,7 @@ > #define CLKID_AO_M4_FCLK 13 > #define CLKID_AO_M4_HCLK 14 > #define CLKID_AO_CLK81 15 > +#define CLKID_AO_SAR_ADC_SEL 16 > #define CLKID_AO_SAR_ADC_CLK 18 > #define CLKID_AO_32K 23 > #define CLKID_AO_CEC 27 > Applied to next/headers
diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h index 04b0d5506641..666b4493822c 100644 --- a/drivers/clk/meson/g12a-aoclk.h +++ b/drivers/clk/meson/g12a-aoclk.h @@ -16,7 +16,6 @@ * to expose, such as the internal muxes and dividers of composite clocks, * will remain defined here. */ -#define CLKID_AO_SAR_ADC_SEL 16 #define CLKID_AO_SAR_ADC_DIV 17 #define CLKID_AO_CTS_OSCIN 19 #define CLKID_AO_32K_PRE 20 diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h index 8db01ffbeb06..5ac66a2eee0f 100644 --- a/include/dt-bindings/clock/g12a-aoclkc.h +++ b/include/dt-bindings/clock/g12a-aoclkc.h @@ -26,6 +26,7 @@ #define CLKID_AO_M4_FCLK 13 #define CLKID_AO_M4_HCLK 14 #define CLKID_AO_CLK81 15 +#define CLKID_AO_SAR_ADC_SEL 16 #define CLKID_AO_SAR_ADC_CLK 18 #define CLKID_AO_32K 23 #define CLKID_AO_CEC 27
When submitted v2 of the G12A AO-CLK IDs, the SAR_ADC_SEL ID was moved to the internal non-exported bindings, but this clock is necessary and mandatory for the SAR ADC bindings. Export it back to the public bindings. Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings") Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/clk/meson/g12a-aoclk.h | 1 - include/dt-bindings/clock/g12a-aoclkc.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)