ARM: NUC900: add and change some device clk definitions.
Subsystems (2)
PATCH 1/1 ARM: NUC900: add and change some device clk definitions.
This patch is to modify usb, audio and add i2c clk setting in cpu.c. Also, add DMA, FMI definition to nuc900_iodesc, since I will use them in the corresponding driver.
--- arch/arm/mach-w90x900/cpu.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
arch/arm/mach-w90x900/cpu.c +11 -3
@@ -46,6 +46,8 @@ static struct map_desc nuc900_iodesc[] __initdata = {IODESC_ENT (TIMER ),IODESC_ENT (EBI ),IODESC_ENT (GPIO ), +IODESC_ENT (DMA ), + IODESC_ENT(FMI), };/* Initial clock declarations. */
@@ -74,10 +76,13 @@ static DEFINE_CLK(timer1, 20); static DEFINE_CLK(timer2, 21); static DEFINE_CLK(timer3, 22); static DEFINE_CLK(timer4, 23); +static DEFINE_CLK(i2c0, 30); +static DEFINE_CLK(i2c1, 31);static struct clk_lookup nuc900_clkregs[] = {DEF_CLKLOOK (&clk_lcd,"nuc900-lcd" ,NULL ), -DEF_CLKLOOK (&clk_audio,"nuc900-audio" ,NULL ), +DEF_CLKLOOK (&clk_audio,"nuc900-audio-ac97" ,NULL ), +DEF_CLKLOOK (&clk_audio,"nuc900-audio-i2s" ,NULL ),DEF_CLKLOOK (&clk_fmi,"nuc900-fmi" ,NULL ),DEF_CLKLOOK (&clk_ms,"nuc900-fmi" ,"MS" ),DEF_CLKLOOK (&clk_sd,"nuc900-fmi" ,"SD" ),
@@ -85,8 +90,9 @@ static struct clk_lookup nuc900_clkregs[] = {DEF_CLKLOOK (&clk_atapi,"nuc900-atapi" ,NULL ),DEF_CLKLOOK (&clk_emc,"nuc900-emc" ,NULL ),DEF_CLKLOOK (&clk_rmii,"nuc900-emc" ,"RMII" ), -DEF_CLKLOOK (&clk_usbd,"nuc900-usbd" ,NULL ), -DEF_CLKLOOK (&clk_usbh,"nuc900-usbh" ,NULL ), +DEF_CLKLOOK (&clk_usbd,"nuc900-usbgadget" ,NULL ), +DEF_CLKLOOK (&clk_usbh,"nuc900-ehci" ,NULL ), +DEF_CLKLOOK (&clk_usbh,"nuc900-ohci" ,NULL ),DEF_CLKLOOK (&clk_g2d,"nuc900-g2d" ,NULL ),DEF_CLKLOOK (&clk_pwm,"nuc900-pwm" ,NULL ), DEF_CLKLOOK(&clk_ps2, "nuc900-ps2", NULL),
@@ -101,6 +107,8 @@ static struct clk_lookup nuc900_clkregs[] = {DEF_CLKLOOK (&clk_timer2,NULL ,"timer2" ),DEF_CLKLOOK (&clk_timer3,NULL ,"timer3" ),DEF_CLKLOOK (&clk_timer4,NULL ,"timer4" ), +DEF_CLKLOOK (&clk_i2c0,"nuc900-i2c-p0" ,NULL ), + DEF_CLKLOOK(&clk_i2c1, "nuc900-i2c-p1", NULL), };/* Initial serial platform data */
Signature · 1 line
1.7.0.4
Quoted 13 lines · Wan ZongShun
This patch is to modify usb, audio and add i2c clk setting in
cpu.c. Also, add DMA, FMI definition tonuc900_iodesc, since I will use them in the corresponding driver.--- arch/arm/mach-w90x900/cpu.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)arch/arm/mach-w90x900/cpu.c +0
-0
arch/arm/mach-w90x900/cpu.c static struct map_desc nuc900_iodesc[] __initdata = { · line 51
Quoted 6 lines
arch/arm/mach-w90x900/cpu.c +2
-0@@ -46,6 +46,8 @@ static struct map_desc nuc900_iodesc[] __initdata = {IODESC_ENT (TIMER ),IODESC_ENT (EBI ),IODESC_ENT (GPIO ), +IODESC_ENT (DMA ), + IODESC_ENT(FMI), };
Can you change the driver to instead use ioremap with the device resources? I think that would be much preferred. The two main uses of map_desc are for devices that you need very early and in order to get larger than 4k TLB entries. Neither of these seem to apply here.
Arnd