| Message ID | 1471870177-10609-1-git-send-email-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Quoting Neil Armstrong (2016-08-22 05:49:37) > Add the PWM related clocks in order to be referenced as PWM source > clocks. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Applied. Regards, Mike > --- > drivers/clk/meson/gxbb.h | 6 +++--- > include/dt-bindings/clock/gxbb-clkc.h | 3 +++ > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h > index a2adf34..523b494 100644 > --- a/drivers/clk/meson/gxbb.h > +++ b/drivers/clk/meson/gxbb.h > @@ -170,11 +170,11 @@ > */ > #define CLKID_SYS_PLL 0 > /* CLKID_CPUCLK */ > -#define CLKID_HDMI_PLL 2 > +/* CLKID_HDMI_PLL */ > #define CLKID_FIXED_PLL 3 > #define CLKID_FCLK_DIV2 4 > -#define CLKID_FCLK_DIV3 5 > -#define CLKID_FCLK_DIV4 6 > +/* CLKID_FCLK_DIV3 */ > +/* CLKID_FCLK_DIV4 */ > #define CLKID_FCLK_DIV5 7 > #define CLKID_FCLK_DIV7 8 > #define CLKID_GP0_PLL 9 > diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h > index f889d80..a5897f3 100644 > --- a/include/dt-bindings/clock/gxbb-clkc.h > +++ b/include/dt-bindings/clock/gxbb-clkc.h > @@ -6,6 +6,9 @@ > #define __GXBB_CLKC_H > > #define CLKID_CPUCLK 1 > +#define CLKID_HDMI_PLL 2 > +#define CLKID_FCLK_DIV3 5 > +#define CLKID_FCLK_DIV4 6 > #define CLKID_CLK81 12 > #define CLKID_ETH 36 > > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-clk" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 22/08/2016 14:49, Neil Armstrong a écrit : > Add the PWM related clocks in order to be referenced as PWM source > clocks. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/clk/meson/gxbb.h | 6 +++--- > include/dt-bindings/clock/gxbb-clkc.h | 3 +++ > 2 files changed, 6 insertions(+), 3 deletions(-) Dear Clock Maintainers, Could you review this patch since it is a strong requirement to select the PWM clock parents over DT ? Thanks, Neil
On 09/03, Neil Armstrong wrote: > > > Le 22/08/2016 14:49, Neil Armstrong a écrit : > > Add the PWM related clocks in order to be referenced as PWM source > > clocks. > > > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > --- > > drivers/clk/meson/gxbb.h | 6 +++--- > > include/dt-bindings/clock/gxbb-clkc.h | 3 +++ > > 2 files changed, 6 insertions(+), 3 deletions(-) > > Dear Clock Maintainers, > > Could you review this patch since it is a strong requirement to select the PWM clock parents over DT ? > Looks fine to me. Did you want an ack or an immutable branch?
On 08/22, Neil Armstrong wrote: > Add the PWM related clocks in order to be referenced as PWM source > clocks. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- Acked-by: Stephen Boyd <sboyd@codeaurora.org> With some more thought, it should go through whatever tree takes the dts changes. Conflicts in these header files should be managed by the same person and that person is the platform maintainer.
Stephen Boyd <sboyd@codeaurora.org> writes: > On 08/22, Neil Armstrong wrote: >> Add the PWM related clocks in order to be referenced as PWM source >> clocks. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- > > Acked-by: Stephen Boyd <sboyd@codeaurora.org> > > With some more thought, it should go through whatever tree takes > the dts changes. Conflicts in these header files should be > managed by the same person and that person is the platform > maintainer. OK, I'll pick this up and take it through the amlogic -> arm-soc path. Thanks, Kevin
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index a2adf34..523b494 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -170,11 +170,11 @@ */ #define CLKID_SYS_PLL 0 /* CLKID_CPUCLK */ -#define CLKID_HDMI_PLL 2 +/* CLKID_HDMI_PLL */ #define CLKID_FIXED_PLL 3 #define CLKID_FCLK_DIV2 4 -#define CLKID_FCLK_DIV3 5 -#define CLKID_FCLK_DIV4 6 +/* CLKID_FCLK_DIV3 */ +/* CLKID_FCLK_DIV4 */ #define CLKID_FCLK_DIV5 7 #define CLKID_FCLK_DIV7 8 #define CLKID_GP0_PLL 9 diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index f889d80..a5897f3 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -6,6 +6,9 @@ #define __GXBB_CLKC_H #define CLKID_CPUCLK 1 +#define CLKID_HDMI_PLL 2 +#define CLKID_FCLK_DIV3 5 +#define CLKID_FCLK_DIV4 6 #define CLKID_CLK81 12 #define CLKID_ETH 36
Add the PWM related clocks in order to be referenced as PWM source clocks. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/clk/meson/gxbb.h | 6 +++--- include/dt-bindings/clock/gxbb-clkc.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)