* [PATCH RESEND 0/2] Add dsi clock for stm32f469 board @ 2018-03-09 6:57 gabriel.fernandez at st.com 2018-03-09 6:57 ` [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK gabriel.fernandez at st.com 2018-03-09 6:57 ` [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board gabriel.fernandez at st.com 0 siblings, 2 replies; 7+ messages in thread From: gabriel.fernandez at st.com @ 2018-03-09 6:57 UTC (permalink / raw) To: linux-arm-kernel From: Gabriel Fernandez <gabriel.fernandez@st.com> This patch-set adds the dsi clock for stm32f469 board. Gabriel Fernandez (2): clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK clk: stm32: Add DSI clock for STM32F469 Board drivers/clk/clk-stm32f4.c | 11 ++++++++++- include/dt-bindings/clock/stm32fx-clock.h | 7 ++++--- 2 files changed, 14 insertions(+), 4 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK 2018-03-09 6:57 [PATCH RESEND 0/2] Add dsi clock for stm32f469 board gabriel.fernandez at st.com @ 2018-03-09 6:57 ` gabriel.fernandez at st.com 2018-03-19 20:45 ` Stephen Boyd 2018-03-09 6:57 ` [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board gabriel.fernandez at st.com 1 sibling, 1 reply; 7+ messages in thread From: gabriel.fernandez at st.com @ 2018-03-09 6:57 UTC (permalink / raw) To: linux-arm-kernel From: Gabriel Fernandez <gabriel.fernandez@st.com> Update of END_PRIMARY_CLK was missed, it should be after CLK_SYSCLK hsi and sysclk are overwritten by gpioa and gpiob. Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> Tested-by: Philippe Cornu <philippe.cornu@st.com> Reviewed-by: Rob Herring <robh@kernel.org> --- include/dt-bindings/clock/stm32fx-clock.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/clock/stm32fx-clock.h b/include/dt-bindings/clock/stm32fx-clock.h index 49bb3c2..4d523b0 100644 --- a/include/dt-bindings/clock/stm32fx-clock.h +++ b/include/dt-bindings/clock/stm32fx-clock.h @@ -33,11 +33,11 @@ #define CLK_SAI2 11 #define CLK_I2SQ_PDIV 12 #define CLK_SAIQ_PDIV 13 - -#define END_PRIMARY_CLK 14 - #define CLK_HSI 14 #define CLK_SYSCLK 15 + +#define END_PRIMARY_CLK 16 + #define CLK_HDMI_CEC 16 #define CLK_SPDIF 17 #define CLK_USART1 18 -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK 2018-03-09 6:57 ` [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK gabriel.fernandez at st.com @ 2018-03-19 20:45 ` Stephen Boyd 0 siblings, 0 replies; 7+ messages in thread From: Stephen Boyd @ 2018-03-19 20:45 UTC (permalink / raw) To: linux-arm-kernel Quoting gabriel.fernandez at st.com (2018-03-08 22:57:30) > From: Gabriel Fernandez <gabriel.fernandez@st.com> > > Update of END_PRIMARY_CLK was missed, it should be after CLK_SYSCLK > hsi and sysclk are overwritten by gpioa and gpiob. > > Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> > Tested-by: Philippe Cornu <philippe.cornu@st.com> > Reviewed-by: Rob Herring <robh@kernel.org> > --- Applied to clk-next ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board 2018-03-09 6:57 [PATCH RESEND 0/2] Add dsi clock for stm32f469 board gabriel.fernandez at st.com 2018-03-09 6:57 ` [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK gabriel.fernandez at st.com @ 2018-03-09 6:57 ` gabriel.fernandez at st.com 2018-03-18 12:47 ` Rob Herring 2018-03-19 20:45 ` Stephen Boyd 1 sibling, 2 replies; 7+ messages in thread From: gabriel.fernandez at st.com @ 2018-03-09 6:57 UTC (permalink / raw) To: linux-arm-kernel From: Gabriel Fernandez <gabriel.fernandez@st.com> This patch adds DSI clock for STM32F469 board Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> --- drivers/clk/clk-stm32f4.c | 11 ++++++++++- include/dt-bindings/clock/stm32fx-clock.h | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index 96c6b6b..d15bae6 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -521,7 +521,7 @@ struct stm32f4_pll_data { }; static const struct stm32f4_pll_data stm32f469_pll[MAX_PLL_DIV] = { - { PLL, 50, { "pll", "pll-q", NULL } }, + { PLL, 50, { "pll", "pll-q", "pll-r" } }, { PLL_I2S, 50, { "plli2s-p", "plli2s-q", "plli2s-r" } }, { PLL_SAI, 50, { "pllsai-p", "pllsai-q", "pllsai-r" } }, }; @@ -1047,6 +1047,8 @@ static struct clk_hw *stm32_register_cclk(struct device *dev, const char *name, "no-clock", "lse", "lsi", "hse-rtc" }; +static const char *dsi_parent[2] = { NULL, "pll-r" }; + static const char *lcd_parent[1] = { "pllsai-r-div" }; static const char *i2s_parents[2] = { "plli2s-r", NULL }; @@ -1156,6 +1158,12 @@ struct stm32f4_clk_data { NO_GATE, 0, 0 }, + { + CLK_F469_DSI, "dsi", dsi_parent, ARRAY_SIZE(dsi_parent), + STM32F4_RCC_DCKCFGR, 29, 1, + STM32F4_RCC_APB2ENR, 27, + CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT + }, }; static const struct stm32_aux_clk stm32f746_aux_clk[] = { @@ -1450,6 +1458,7 @@ static void __init stm32f4_rcc_init(struct device_node *np) stm32f4_gate_map = data->gates_map; hse_clk = of_clk_get_parent_name(np, 0); + dsi_parent[0] = hse_clk; i2s_in_clk = of_clk_get_parent_name(np, 1); diff --git a/include/dt-bindings/clock/stm32fx-clock.h b/include/dt-bindings/clock/stm32fx-clock.h index 4d523b0..58d8b51 100644 --- a/include/dt-bindings/clock/stm32fx-clock.h +++ b/include/dt-bindings/clock/stm32fx-clock.h @@ -35,8 +35,9 @@ #define CLK_SAIQ_PDIV 13 #define CLK_HSI 14 #define CLK_SYSCLK 15 +#define CLK_F469_DSI 16 -#define END_PRIMARY_CLK 16 +#define END_PRIMARY_CLK 17 #define CLK_HDMI_CEC 16 #define CLK_SPDIF 17 -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board 2018-03-09 6:57 ` [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board gabriel.fernandez at st.com @ 2018-03-18 12:47 ` Rob Herring 2018-03-19 20:45 ` Stephen Boyd 1 sibling, 0 replies; 7+ messages in thread From: Rob Herring @ 2018-03-18 12:47 UTC (permalink / raw) To: linux-arm-kernel On Fri, Mar 09, 2018 at 07:57:31AM +0100, gabriel.fernandez at st.com wrote: > From: Gabriel Fernandez <gabriel.fernandez@st.com> > > This patch adds DSI clock for STM32F469 board > > Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> > --- > drivers/clk/clk-stm32f4.c | 11 ++++++++++- > include/dt-bindings/clock/stm32fx-clock.h | 3 ++- > 2 files changed, 12 insertions(+), 2 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org> > > diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c > index 96c6b6b..d15bae6 100644 > --- a/drivers/clk/clk-stm32f4.c > +++ b/drivers/clk/clk-stm32f4.c > @@ -521,7 +521,7 @@ struct stm32f4_pll_data { > }; > > static const struct stm32f4_pll_data stm32f469_pll[MAX_PLL_DIV] = { > - { PLL, 50, { "pll", "pll-q", NULL } }, > + { PLL, 50, { "pll", "pll-q", "pll-r" } }, > { PLL_I2S, 50, { "plli2s-p", "plli2s-q", "plli2s-r" } }, > { PLL_SAI, 50, { "pllsai-p", "pllsai-q", "pllsai-r" } }, > }; > @@ -1047,6 +1047,8 @@ static struct clk_hw *stm32_register_cclk(struct device *dev, const char *name, > "no-clock", "lse", "lsi", "hse-rtc" > }; > > +static const char *dsi_parent[2] = { NULL, "pll-r" }; > + > static const char *lcd_parent[1] = { "pllsai-r-div" }; > > static const char *i2s_parents[2] = { "plli2s-r", NULL }; > @@ -1156,6 +1158,12 @@ struct stm32f4_clk_data { > NO_GATE, 0, > 0 > }, > + { > + CLK_F469_DSI, "dsi", dsi_parent, ARRAY_SIZE(dsi_parent), > + STM32F4_RCC_DCKCFGR, 29, 1, > + STM32F4_RCC_APB2ENR, 27, > + CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT > + }, > }; > > static const struct stm32_aux_clk stm32f746_aux_clk[] = { > @@ -1450,6 +1458,7 @@ static void __init stm32f4_rcc_init(struct device_node *np) > stm32f4_gate_map = data->gates_map; > > hse_clk = of_clk_get_parent_name(np, 0); > + dsi_parent[0] = hse_clk; > > i2s_in_clk = of_clk_get_parent_name(np, 1); > > diff --git a/include/dt-bindings/clock/stm32fx-clock.h b/include/dt-bindings/clock/stm32fx-clock.h > index 4d523b0..58d8b51 100644 > --- a/include/dt-bindings/clock/stm32fx-clock.h > +++ b/include/dt-bindings/clock/stm32fx-clock.h > @@ -35,8 +35,9 @@ > #define CLK_SAIQ_PDIV 13 > #define CLK_HSI 14 > #define CLK_SYSCLK 15 > +#define CLK_F469_DSI 16 > > -#define END_PRIMARY_CLK 16 > +#define END_PRIMARY_CLK 17 > > #define CLK_HDMI_CEC 16 > #define CLK_SPDIF 17 > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board 2018-03-09 6:57 ` [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board gabriel.fernandez at st.com 2018-03-18 12:47 ` Rob Herring @ 2018-03-19 20:45 ` Stephen Boyd 2018-03-20 8:20 ` Gabriel FERNANDEZ 1 sibling, 1 reply; 7+ messages in thread From: Stephen Boyd @ 2018-03-19 20:45 UTC (permalink / raw) To: linux-arm-kernel Quoting gabriel.fernandez at st.com (2018-03-08 22:57:31) > From: Gabriel Fernandez <gabriel.fernandez@st.com> > > This patch adds DSI clock for STM32F469 board > > Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> > --- Applied to clk-next ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board 2018-03-19 20:45 ` Stephen Boyd @ 2018-03-20 8:20 ` Gabriel FERNANDEZ 0 siblings, 0 replies; 7+ messages in thread From: Gabriel FERNANDEZ @ 2018-03-20 8:20 UTC (permalink / raw) To: linux-arm-kernel Thanks Stephen ! Best Regards Gabriel On 03/19/2018 09:45 PM, Stephen Boyd wrote: > Quoting gabriel.fernandez at st.com (2018-03-08 22:57:31) >> From: Gabriel Fernandez <gabriel.fernandez@st.com> >> >> This patch adds DSI clock for STM32F469 board >> >> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> >> --- > Applied to clk-next > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-20 8:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-03-09 6:57 [PATCH RESEND 0/2] Add dsi clock for stm32f469 board gabriel.fernandez at st.com 2018-03-09 6:57 ` [PATCH RESEND 1/2] clk: stm32: END_PRIMARY_CLK should be declare after CLK_SYSCLK gabriel.fernandez at st.com 2018-03-19 20:45 ` Stephen Boyd 2018-03-09 6:57 ` [PATCH RESEND 2/2] clk: stm32: Add DSI clock for STM32F469 Board gabriel.fernandez at st.com 2018-03-18 12:47 ` Rob Herring 2018-03-19 20:45 ` Stephen Boyd 2018-03-20 8:20 ` Gabriel FERNANDEZ
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).