SPEAr: Use CLKDEV_INIT for defining clk_lookups
Subsystems (2)
PATCH 1/1 SPEAr: Use CLKDEV_INIT for defining clk_lookups
---
Arnd,
I have applied this patch after applying Stefan's patch:
"ARM: SPEAr600: Change FSMC and SMI clock names"
I have applied both these patches in my following branch:
spear-dt
in following repogit://stlinux.com/spear/linux-2.6.git
You can pull them directly if they look fine to you.
arch/arm/mach-spear3xx/clock.c | 111 ++++++++++++++++++++-------------------- arch/arm/mach-spear6xx/clock.c | 80 ++++++++++++++-------------- 2 files changed, 96 insertions(+), 95 deletions(-)
arch/arm/mach-spear3xx/clock.c +56 -55
@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/clkdev.h> #include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h>
@@ -652,85 +653,85 @@ static struct clk pwm_clk = {/* array of all spear 3xx clock lookups */ static struct clk_lookup spear_clk_lookups[] = { - { .con_id ="apb_pclk" , .clk = &dummy_apb_pclk}, +CLKDEV_INIT (NULL ,"apb_pclk" , &dummy_apb_pclk),/* root clks */ - { .con_id ="osc_32k_clk" , .clk = &osc_32k_clk}, - { .con_id ="osc_24m_clk" , .clk = &osc_24m_clk}, +CLKDEV_INIT (NULL ,"osc_32k_clk" , &osc_32k_clk), +CLKDEV_INIT (NULL ,"osc_24m_clk" , &osc_24m_clk),/* clock derived from 32 KHz osc clk */ - { .dev_id ="rtc-spear" , .clk = &rtc_clk}, +CLKDEV_INIT ("rtc-spear" ,NULL , &rtc_clk),/* clock derived from 24 MHz osc clk */ - { .con_id ="pll1_clk" , .clk = &pll1_clk}, - { .con_id ="pll3_48m_clk" , .clk = &pll3_48m_clk}, - { .dev_id ="wdt" , .clk = &wdt_clk}, +CLKDEV_INIT (NULL ,"pll1_clk" , &pll1_clk), +CLKDEV_INIT (NULL ,"pll3_48m_clk" , &pll3_48m_clk), +CLKDEV_INIT ("wdt" ,NULL , &wdt_clk),/* clock derived from pll1 clk */ - { .con_id ="cpu_clk" , .clk = &cpu_clk}, - { .con_id ="ahb_clk" , .clk = &ahb_clk}, - { .con_id ="uart_synth_clk" , .clk = &uart_synth_clk}, - { .con_id ="firda_synth_clk" , .clk = &firda_synth_clk}, - { .con_id ="gpt0_synth_clk" , .clk = &gpt0_synth_clk}, - { .con_id ="gpt1_synth_clk" , .clk = &gpt1_synth_clk}, - { .con_id ="gpt2_synth_clk" , .clk = &gpt2_synth_clk}, - { .dev_id ="uart" , .clk = &uart_clk}, - { .dev_id ="firda" , .clk = &firda_clk}, - { .dev_id ="gpt0" , .clk = &gpt0_clk}, - { .dev_id ="gpt1" , .clk = &gpt1_clk}, - { .dev_id ="gpt2" , .clk = &gpt2_clk}, +CLKDEV_INIT (NULL ,"cpu_clk" , &cpu_clk), +CLKDEV_INIT (NULL ,"ahb_clk" , &ahb_clk), +CLKDEV_INIT (NULL ,"uart_synth_clk" , &uart_synth_clk), +CLKDEV_INIT (NULL ,"firda_synth_clk" , &firda_synth_clk), +CLKDEV_INIT (NULL ,"gpt0_synth_clk" , &gpt0_synth_clk), +CLKDEV_INIT (NULL ,"gpt1_synth_clk" , &gpt1_synth_clk), +CLKDEV_INIT (NULL ,"gpt2_synth_clk" , &gpt2_synth_clk), +CLKDEV_INIT ("uart" ,NULL , &uart_clk), +CLKDEV_INIT ("firda" ,NULL , &firda_clk), +CLKDEV_INIT ("gpt0" ,NULL , &gpt0_clk), +CLKDEV_INIT ("gpt1" ,NULL , &gpt1_clk), +CLKDEV_INIT ("gpt2" ,NULL , &gpt2_clk),/* clock derived from pll3 clk */ - { .dev_id ="designware_udc" , .clk = &usbd_clk}, - { .con_id ="usbh_clk" , .clk = &usbh_clk}, +CLKDEV_INIT ("designware_udc" ,NULL , &usbd_clk), +CLKDEV_INIT (NULL ,"usbh_clk" , &usbh_clk),/* clock derived from ahb clk */ - { .con_id ="apb_clk" , .clk = &apb_clk}, - { .dev_id ="i2c_designware.0" , .clk = &i2c_clk}, - { .dev_id ="dma" , .clk = &dma_clk}, - { .dev_id ="jpeg" , .clk = &jpeg_clk}, - { .dev_id ="gmac" , .clk = &gmac_clk}, - { .dev_id ="smi" , .clk = &smi_clk}, - { .dev_id ="c3" , .clk = &c3_clk}, +CLKDEV_INIT (NULL ,"apb_clk" , &apb_clk), +CLKDEV_INIT ("i2c_designware.0" ,NULL , &i2c_clk), +CLKDEV_INIT ("dma" ,NULL , &dma_clk), +CLKDEV_INIT ("jpeg" ,NULL , &jpeg_clk), +CLKDEV_INIT ("gmac" ,NULL , &gmac_clk), +CLKDEV_INIT ("smi" ,NULL , &smi_clk), +CLKDEV_INIT ("c3" ,NULL , &c3_clk),/* clock derived from apb clk */ - { .dev_id ="adc" , .clk = &adc_clk}, - { .dev_id ="ssp-pl022.0" , .clk = &ssp0_clk}, - { .dev_id ="gpio" , .clk = &gpio_clk}, +CLKDEV_INIT ("adc" ,NULL , &adc_clk), +CLKDEV_INIT ("ssp-pl022.0" ,NULL , &ssp0_clk), +CLKDEV_INIT ("gpio" ,NULL , &gpio_clk), };/* array of all spear 300 clock lookups */ #ifdef CONFIG_MACH_SPEAR300 static struct clk_lookup spear300_clk_lookups[] = { - { .dev_id ="clcd" , .clk = &clcd_clk}, - { .con_id ="fsmc" , .clk = &fsmc_clk}, - { .dev_id ="gpio1" , .clk = &gpio1_clk}, - { .dev_id ="keyboard" , .clk = &kbd_clk}, - { .dev_id ="sdhci" , .clk = &sdhci_clk}, +CLKDEV_INIT ("clcd" ,NULL , &clcd_clk), +CLKDEV_INIT ("fsmc" ,NULL , &fsmc_clk), +CLKDEV_INIT ("gpio1" ,NULL , &gpio1_clk), +CLKDEV_INIT ("keyboard" ,NULL , &kbd_clk), +CLKDEV_INIT ("sdhci" ,NULL , &sdhci_clk), };#endif /* array of all spear 310 clock lookups */ #ifdef CONFIG_MACH_SPEAR310 static struct clk_lookup spear310_clk_lookups[] = { - { .con_id ="fsmc" , .clk = &fsmc_clk}, - { .con_id ="emi" , .clk = &emi_clk}, - { .dev_id ="uart1" , .clk = &uart1_clk}, - { .dev_id ="uart2" , .clk = &uart2_clk}, - { .dev_id ="uart3" , .clk = &uart3_clk}, - { .dev_id ="uart4" , .clk = &uart4_clk}, - { .dev_id ="uart5" , .clk = &uart5_clk}, +CLKDEV_INIT ("fsmc" ,NULL , &fsmc_clk), +CLKDEV_INIT (NULL ,"emi" , &emi_clk), +CLKDEV_INIT ("uart1" ,NULL , &uart1_clk), +CLKDEV_INIT ("uart2" ,NULL , &uart2_clk), +CLKDEV_INIT ("uart3" ,NULL , &uart3_clk), +CLKDEV_INIT ("uart4" ,NULL , &uart4_clk), +CLKDEV_INIT ("uart5" ,NULL , &uart5_clk), };#endif /* array of all spear 320 clock lookups */ #ifdef CONFIG_MACH_SPEAR320 static struct clk_lookup spear320_clk_lookups[] = { - { .dev_id ="clcd" , .clk = &clcd_clk}, - { .con_id ="fsmc" , .clk = &fsmc_clk}, - { .dev_id ="i2c_designware.1" , .clk = &i2c1_clk}, - { .con_id ="emi" , .clk = &emi_clk}, - { .dev_id ="pwm" , .clk = &pwm_clk}, - { .dev_id ="sdhci" , .clk = &sdhci_clk}, - { .dev_id ="c_can_platform.0" , .clk = &can0_clk}, - { .dev_id ="c_can_platform.1" , .clk = &can1_clk}, - { .dev_id ="ssp-pl022.1" , .clk = &ssp1_clk}, - { .dev_id ="ssp-pl022.2" , .clk = &ssp2_clk}, - { .dev_id ="uart1" , .clk = &uart1_clk}, - { .dev_id ="uart2" , .clk = &uart2_clk}, +CLKDEV_INIT ("clcd" ,NULL , &clcd_clk), +CLKDEV_INIT ("fsmc" ,NULL , &fsmc_clk), +CLKDEV_INIT ("i2c_designware.1" ,NULL , &i2c1_clk), +CLKDEV_INIT (NULL ,"emi" , &emi_clk), +CLKDEV_INIT ("pwm" ,NULL , &pwm_clk), +CLKDEV_INIT ("sdhci" ,NULL , &sdhci_clk), +CLKDEV_INIT ("c_can_platform.0" ,NULL , &can0_clk), +CLKDEV_INIT ("c_can_platform.1" ,NULL , &can1_clk), +CLKDEV_INIT ("ssp-pl022.1" ,NULL , &ssp1_clk), +CLKDEV_INIT ("ssp-pl022.2" ,NULL , &ssp2_clk), +CLKDEV_INIT ("uart1" ,NULL , &uart1_clk), +CLKDEV_INIT ("uart2" ,NULL , &uart2_clk), };#endif
arch/arm/mach-spear6xx/clock.c +40 -40
93 lines not on this page · raw message
Signature · 1 line
1.7.8.110.g4cb5d
PATCH 1/1 SPEAr: Use CLKDEV_INIT for defining clk_lookups
Quoted 10 lines · Viresh Kumar
Signed-off-by Viresh Kumar <[email protected]>---
Arnd,I have applied this patch after applying Stefan's patch:
"ARM: SPEAr600: Change FSMC and SMI clock names"I have applied both these patches in my following branch:
spear-dt
Hi Viresh,
Since we're in the middle of the merge window now, I would prefer not to pull any cosmetic changes or new features but instead just take the bug fix. Once -rc1 is done, we will start taking patches for v3.5.
If the second patch is actually required and nit just cosmetic, please provide a description why that is so.
Finally, the branch you mentioned does not seem to be there on the server.
I recommend using 'git request-pull', which will actually check that the branch you refer to can be pulled and holds the right contents.
Arnd
PATCH 1/1 SPEAr: Use CLKDEV_INIT for defining clk_lookups
Quoted 5 lines · Arnd Bergmann
Since we're in the middle of the merge window now, I would prefer not to pull any cosmetic changes or new features but instead just take the bug fix. Once -rc1 is done, we will start taking patches for v3.5.
Ok.
Quoted 2 lines
If the second patch is actually required and nit just cosmetic, please provide a description why that is so.
It is just an cosmetic one. I posted it, so stefan can work over it and i don't have to rework on it again. What's the preferred way of handling such stuff during merge window?
Quoted 2 lines
Finally, the branch you mentioned does not seem to be there on the server.
I am so sorry. Actually we have two interfaces to stlinux, one is ST internal and other is external. I have pushed the branch at the time i posted it, but stlinux site takes a bit to get everything synched (i came to know this today only :( ).
Quoted 3 lines
I recommend using 'git request-pull', which will actually check that the branch you refer to can be pulled and holds the right contents.
Sure.
--
Viresh
PATCH 1/1 SPEAr: Use CLKDEV_INIT for defining clk_lookups
Quoted 6 lines · Viresh Kumar
Quoted 2 lines
If the second patch is actually required and nit just cosmetic, please provide a description why that is so.
It is just an cosmetic one. I posted it, so stefan can work over it and i don't have to rework on it again. What's the preferred way of handling such stuff during merge window?
Best just send bug fixes for inclusion, but no other patches. You can of course post any patches for review and discuss them on the list, but I won't apply stuff for v3.5 before Linus has taken the base v3.4 stuff.
Arnd