OMAP: GPIO: Implement GPIO as a platform device
Subsystems (6)
v7 cover OMAP: GPIO: Implement GPIO as a platform device
Implement OMAP GPIO module in platform device model. OMAP2+ specific GPIO module uses hwmod FW.
Tested on OMAP2430, OMAP44430, OMAP3430 SDP boards, OMAP4430 Blaze board and zoom3 board. Verified that this patch series does not break the OMAP1 build.
Version History:
---------------
v7 Series:
- Use gpio iclks as main_clk in OMAP3 & OMAP4
- Implement GPIO as a platform device (use hwmod FW for OMAP2+) and the implementation is similar to current GPIO code. Does not modify the gpio suspend/ resume/ prepare for odle and resume after idle code and these modifications would be done in a separate patch series. This was suggested by Kevin in another internal email thread.
v6 Series:
Some links for v6 series:
https://patchwork.kernel.org/patch/189742/
https://patchwork.kernel.org/patch/189822/
https://patchwork.kernel.org/patch/189832/
Comments Fixed in v6:
-use PM runtime APIs for gpio in cpu idle/resume after
idle path when interrupts are enabled.
-Do not use omap_device_* calls in the gpio driver -Use clock alias names for debounce clocks while using clock
framework APIs to do clk_get.
-do a kfree of pdata after doing omap_device_build() -use PM runtime APIs during probe before and after accessing
gpio registers
-Remove sysconfig register access from GPIO driver -Use ARRAY_SIZE instead on size_of in OMAP1 gpio_init
v5 Series:
Some links for v5 series:
https://patchwork.kernel.org/patch/117790/
https://patchwork.kernel.org/patch/117789/
https://patchwork.kernel.org/patch/117788/
https://patchwork.kernel.org/patch/117785/
https://patchwork.kernel.org/patch/117796/
Comments Fixed in v5:
- Use dev_pm_ops instead of sys_dev_class
- Use runtime suspend/resume hooks for GPIO device
- extend the usage of mod_usage flag to all cpu classes.(Earlier it was used only for OMAP2+)
- Make gpio_context as part of gpio_bank structure
v4 Series:
Some links for v4 series:
https://patchwork.kernel.org/patch/107411/
Comments Fixed in v4:
- Remove gpio_bank_count from dev_attr field and derive it from hwmod class iteration count
- Add TODOs for future omap gpio code cleanup related activity
- Rename gpio's platform_data 'method' to 'bank_type'
- Rename gpio's platform_data 'gpio_bank_bits' to 'gpio_bank_width'
- Add 'rev' field to gpio class in hwmod datbase and get 'bank_type' based on 'rev' field
- Filename removed from file description when a new file is created
v3 Series:
Some of the v3 links:
https://patchwork.kernel.org/patch/106224/
Comments Fixed in v3:
- .module_offs populated in hwmod structures
- If not defined CONFIG_PM_RUNTIME is not handled in GPIO driver
- No changes to mach-omap2/clockxxxx-data.c to handle clocks by dev ptr as it is taken care using clock get by name in hwmod & omap_device layer
- Using "ick" instead of "arm_gpio_ck" for OMAP15xx clock
- SoC base addresses moved to plat-omap/omapXXXX.h that should be used only by the omap_hwmod_xxxx_data.c file
- OMAP2/3 hwmod structures naming convention changed as it is followed in OMAP4
- omap24xx_gpio_init() uses cpu_is_omap24xx() instead of separate checks for 2420 & 2430 in OMAP2 specific init call (mach-omap layer)
- Reason for using postcore_initcall is added to patch description
- Comments added for usage of dbck_flag and other elements
in dev_attr structure
- Uses dev_dbg() and dev_err() instead of pr_dbg() and pr_err()
- Corrects the gpio clock details in OMAP4 hwmod database
v2 series:
Some important links to patch v2 series and comments:
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg30262.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg28787.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg30263.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg30295.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg30259.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg28933.html Comments Fixed in V2:
- GPIO dev attr was added for SoC specific chip info (eg., gpio bank count)
- Removed omap_gpio_init() usage from board files
- platform_get_resource() used instead of pdata->base for OMAP2+ base addresses
- postcore_initcall used for gpio init instead of making
GPIO as an early platform device. SoC specific gpio_init needs to be done before machine_init functions access gpio APIs. Hence making SoC specific gpio_init as postcore_initcall.
- getting gpio dbck is moved to omap_set_gpio_debounce() instead of doing it in probe
v1 series:
Some important links to patch v1 series and comments:
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg26934.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg27860.html
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg28183.html Highlights in v1:
- Introduces SoC specific functions at mach-omap layer
- Implements GPIO as a platform device
- Make gpio an early device and make it implemented in
Benoit Cousson (1):
OMAP4: hwmod data: Add GPIO
Varadarajan, Charulatha (10):
OMAP: GPIO: prepare for platform driver
OMAP15xx: GPIO: Introduce support for GPIO init
OMAP16xx: GPIO: Introduce support for GPIO init
OMAP7xx: GPIO: Introduce support for GPIO init
OMAP2420: hwmod data: Add GPIO
OMAP2430: hwmod data: Add GPIO
OMAP3: hwmod data: Add GPIO
OMAP2+: GPIO: device registration
OMAP: GPIO: Implement GPIO as a platform device
OMAP: GPIO: Remove omap_gpio_init()
arch/arm/mach-omap1/Makefile | 6 + arch/arm/mach-omap1/board-ams-delta.c | 1 - arch/arm/mach-omap1/board-fsample.c | 1 - arch/arm/mach-omap1/board-h2.c | 1 - arch/arm/mach-omap1/board-h3.c | 1 - arch/arm/mach-omap1/board-htcherald.c | 2 - arch/arm/mach-omap1/board-innovator.c | 1 - arch/arm/mach-omap1/board-nokia770.c | 1 - arch/arm/mach-omap1/board-osk.c | 1 - arch/arm/mach-omap1/board-palmte.c | 1 - arch/arm/mach-omap1/board-palmz71.c | 1 - arch/arm/mach-omap1/board-perseus2.c | 1 - arch/arm/mach-omap1/board-sx1.c | 1 - arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-omap1/clock_data.c | 4 +- arch/arm/mach-omap1/gpio15xx.c | 98 +++++ arch/arm/mach-omap1/gpio16xx.c | 199 +++++++++ arch/arm/mach-omap1/gpio7xx.c | 261 ++++++++++++ arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-3430sdp.c | 1 - arch/arm/mach-omap2/board-3630sdp.c | 1 - arch/arm/mach-omap2/board-4430sdp.c | 1 - arch/arm/mach-omap2/board-am3517crane.c | 2 - arch/arm/mach-omap2/board-am3517evm.c | 1 - arch/arm/mach-omap2/board-apollon.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 1 - arch/arm/mach-omap2/board-cm-t3517.c | 1 - arch/arm/mach-omap2/board-devkit8000.c | 1 - arch/arm/mach-omap2/board-h4.c | 1 - arch/arm/mach-omap2/board-igep0020.c | 1 - arch/arm/mach-omap2/board-igep0030.c | 1 - arch/arm/mach-omap2/board-ldp.c | 1 - arch/arm/mach-omap2/board-n8x0.c | 1 - arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/board-omap3evm.c | 1 - arch/arm/mach-omap2/board-omap3logic.c | 1 - arch/arm/mach-omap2/board-omap3pandora.c | 1 - arch/arm/mach-omap2/board-omap3stalker.c | 1 - arch/arm/mach-omap2/board-omap3touchbook.c | 1 - arch/arm/mach-omap2/board-omap4panda.c | 1 - arch/arm/mach-omap2/board-overo.c | 1 - arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom.c | 1 - arch/arm/mach-omap2/gpio.c | 103 +++++ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 229 ++++++++++ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 279 +++++++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 360 ++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 341 +++++++++++++++ arch/arm/plat-omap/gpio.c | 622 +++++++++------------------- arch/arm/plat-omap/include/plat/gpio.h | 24 +- 51 files changed, 2103 insertions(+), 465 deletions(-) create mode 100644 arch/arm/mach-omap1/gpio15xx.c create mode 100644 arch/arm/mach-omap1/gpio16xx.c create mode 100644 arch/arm/mach-omap1/gpio7xx.c create mode 100644 arch/arm/mach-omap2/gpio.c
PATCH v7 1/11 OMAP: GPIO: prepare for platform driver
Prepare for implementing GPIO as a platform driver.
Modifies omap_gpio_init() to make use of omap_gpio_chip_init() and omap_gpio_mod_init(). omap_gpio_mod_init() does the module init by clearing the status register and initializing the GPIO control register. omap_gpio_chip_init() initializes the chip request, free, get, set and other function pointers and sets the gpio irq handler.
This is only to reorganize the code so that the "omap gpio platform driver implementation patch" looks cleaner and better to review.
--- arch/arm/plat-omap/gpio.c | 234 +++++++++++++++++++++++---------------------- 1 files changed, 118 insertions(+), 116 deletions(-)
arch/arm/plat-omap/gpio.c +118 -116
@@ -190,14 +190,12 @@ struct gpio_bank {u32 suspend_wakeup;u32 saved_wakeup;#endif -#ifdef CONFIG_ARCH_OMAP2PLUS u32 non_wakeup_gpios;u32 enabled_non_wakeup_gpios;u32 saved_datain;u32 saved_fallingdetect;u32 saved_risingdetect; -#endif u32 level_mask;u32 toggle_mask;spinlock_t lock;
@@ -1718,10 +1716,125 @@ static void __init omap_gpio_show_rev(void)*/ static struct lock_class_key gpio_lock_class; +static void omap_gpio_mod_init (struct gpio_bank *bank,int id) +{ +if (cpu_class_is_omap2 ()) { +if (cpu_is_omap44xx ()) { +__raw_writel (0xffffffff , bank->base + +OMAP4_GPIO_IRQSTATUSCLR0 ); +__raw_writel (0x00000000 , bank->base + +OMAP4_GPIO_DEBOUNCENABLE ); +/* Initialize interface clk ungated, module enabled */ +__raw_writel (0 , bank->base +OMAP4_GPIO_CTRL ); + }else if (cpu_is_omap34xx ()) { +__raw_writel (0x00000000 , bank->base + +OMAP24XX_GPIO_IRQENABLE1 ); +__raw_writel (0xffffffff , bank->base + +OMAP24XX_GPIO_IRQSTATUS1 ); +__raw_writel (0x00000000 , bank->base + +OMAP24XX_GPIO_DEBOUNCE_EN ); + +/* Initialize interface clk ungated, module enabled */ +__raw_writel (0 , bank->base +OMAP24XX_GPIO_CTRL ); + }else if (cpu_is_omap24xx ()) { +static const u32 non_wakeup_gpios[] = { +0xe203ffc0 ,0x08700040 + }; +if (id <ARRAY_SIZE (non_wakeup_gpios)) + bank->non_wakeup_gpios = non_wakeup_gpios[id]; + } + }else if (cpu_class_is_omap1 ()) { +if (bank_is_mpuio (bank)) +__raw_writew (0xffff , bank->base + +OMAP_MPUIO_GPIO_MASKIT ); +if (cpu_is_omap15xx () && bank->method ==METHOD_GPIO_1510 ) { +__raw_writew (0xffff , bank->base + +OMAP1510_GPIO_INT_MASK ); +__raw_writew (0x0000 , bank->base + +OMAP1510_GPIO_INT_STATUS ); + } +if (cpu_is_omap16xx () && bank->method ==METHOD_GPIO_1610 ) { +__raw_writew (0x0000 , bank->base + +OMAP1610_GPIO_IRQENABLE1 ); +__raw_writew (0xffff , bank->base + +OMAP1610_GPIO_IRQSTATUS1 ); +__raw_writew (0x0014 , bank->base + +OMAP1610_GPIO_SYSCONFIG ); + +/* +* Enable system clock for GPIO module. +* The CAM_CLK_CTRL *is* really the right place. +*/ +omap_writel (omap_readl (ULPD_CAM_CLK_CTRL ) |0x04 , +ULPD_CAM_CLK_CTRL ); + } +if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) { +__raw_writel (0xffffffff , bank->base + +OMAP7XX_GPIO_INT_MASK ); +__raw_writel (0x00000000 , bank->base + +OMAP7XX_GPIO_INT_STATUS ); + } + } +} + +static void __init omap_gpio_chip_init (struct gpio_bank *bank) +{ +int j, bank_width =16 ; +static int gpio; + +if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) + bank_width =32 ;/* 7xx has 32-bit GPIOs */ + +if ((bank->method ==METHOD_GPIO_24XX ) || + (bank->method ==METHOD_GPIO_44XX )) + bank_width =32 ; + + bank->mod_usage =0 ; +/* +* REVISIT eventually switch from OMAP-specific gpio structs +* over to the generic ones +*/ + bank->chip.request = omap_gpio_request; + bank->chip.free = omap_gpio_free; + bank->chip.direction_input = gpio_input; + bank->chip.get = gpio_get; + bank->chip.direction_output = gpio_output; + bank->chip.set_debounce = gpio_debounce; + bank->chip.set = gpio_set; + bank->chip.to_irq = gpio_2irq; +if (bank_is_mpuio (bank)) { + bank->chip.label ="mpuio" ; +#ifdef CONFIG_ARCH_OMAP16XX + bank->chip.dev = &omap_mpuio_device.dev; +#endif + bank->chip.base =OMAP_MPUIO (0 ); + }else { + bank->chip.label ="gpio" ; + bank->chip.base = gpio; + gpio += bank_width; + } + bank->chip.ngpio = bank_width; + +gpiochip_add (&bank->chip); + +for (j = bank->virtual_irq_start; + j < bank->virtual_irq_start + bank_width; j++) { +lockdep_set_class (&irq_desc[j].lock, &gpio_lock_class); +set_irq_chip_data (j, bank); +if (bank_is_mpuio (bank)) +set_irq_chip (j, &mpuio_irq_chip); +else +set_irq_chip (j, &gpio_irq_chip); +set_irq_handler (j, handle_simple_irq); +set_irq_flags (j,IRQF_VALID ); + } +set_irq_chained_handler (bank->irq, gpio_irq_handler); +set_irq_data (bank->irq, bank); +} +static int __init _omap_gpio_init (void ) {int i; -int gpio =0 ;struct gpio_bank *bank;int bank_size =SZ_8K ;/* Module 4KB + L4 4KB except on omap1 */ char clk_name[11 ];
@@ -1828,7 +1941,6 @@ static int __init _omap_gpio_init(void) }#endif for (i =0 ; i < gpio_bank_count; i++) { -int j, gpio_count =16 ; bank = &gpio_bank[i];spin_lock_init (&bank->lock);
@@ -1840,107 +1952,8 @@ static int __init _omap_gpio_init(void)continue ; } -if (bank_is_mpuio (bank)) -__raw_writew (0xffff , bank->base +OMAP_MPUIO_GPIO_MASKIT ); -if (cpu_is_omap15xx () && bank->method ==METHOD_GPIO_1510 ) { -__raw_writew (0xffff , bank->base +OMAP1510_GPIO_INT_MASK ); -__raw_writew (0x0000 , bank->base +OMAP1510_GPIO_INT_STATUS ); - } -if (cpu_is_omap16xx () && bank->method ==METHOD_GPIO_1610 ) { -__raw_writew (0x0000 , bank->base +OMAP1610_GPIO_IRQENABLE1 ); -__raw_writew (0xffff , bank->base +OMAP1610_GPIO_IRQSTATUS1 ); -__raw_writew (0x0014 , bank->base +OMAP1610_GPIO_SYSCONFIG ); - } -if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) { -__raw_writel (0xffffffff , bank->base +OMAP7XX_GPIO_INT_MASK ); -__raw_writel (0x00000000 , bank->base +OMAP7XX_GPIO_INT_STATUS ); - - gpio_count =32 ;/* 7xx has 32-bit GPIOs */ - } - -#ifdef CONFIG_ARCH_OMAP2PLUS -if ((bank->method ==METHOD_GPIO_24XX ) || - (bank->method ==METHOD_GPIO_44XX )) { -static const u32 non_wakeup_gpios[] = { -0xe203ffc0 ,0x08700040 - }; - -if (cpu_is_omap44xx ()) { -__raw_writel (0xffffffff , bank->base + -OMAP4_GPIO_IRQSTATUSCLR0 ); -__raw_writew (0x0015 , bank->base + -OMAP4_GPIO_SYSCONFIG ); -__raw_writel (0x00000000 , bank->base + -OMAP4_GPIO_DEBOUNCENABLE ); -/* -* Initialize interface clock ungated, -* module enabled -*/ -__raw_writel (0 , bank->base +OMAP4_GPIO_CTRL ); - }else { -__raw_writel (0x00000000 , bank->base + -OMAP24XX_GPIO_IRQENABLE1 ); -__raw_writel (0xffffffff , bank->base + -OMAP24XX_GPIO_IRQSTATUS1 ); -__raw_writew (0x0015 , bank->base + -OMAP24XX_GPIO_SYSCONFIG ); -__raw_writel (0x00000000 , bank->base + -OMAP24XX_GPIO_DEBOUNCE_EN ); - -/* -* Initialize interface clock ungated, -* module enabled -*/ -__raw_writel (0 , bank->base + -OMAP24XX_GPIO_CTRL ); - } -if (cpu_is_omap24xx () && - i <ARRAY_SIZE (non_wakeup_gpios)) - bank->non_wakeup_gpios = non_wakeup_gpios[i]; - gpio_count =32 ; - } -#endif - - bank->mod_usage =0 ; -/* REVISIT eventually switch from OMAP-specific gpio structs -* over to the generic ones -*/ - bank->chip.request = omap_gpio_request; - bank->chip.free = omap_gpio_free; - bank->chip.direction_input = gpio_input; - bank->chip.get = gpio_get; - bank->chip.direction_output = gpio_output; - bank->chip.set_debounce = gpio_debounce; - bank->chip.set = gpio_set; - bank->chip.to_irq = gpio_2irq; -if (bank_is_mpuio (bank)) { - bank->chip.label ="mpuio" ; -#ifdef CONFIG_ARCH_OMAP16XX - bank->chip.dev = &omap_mpuio_device.dev; -#endif - bank->chip.base =OMAP_MPUIO (0 ); - }else { - bank->chip.label ="gpio" ; - bank->chip.base = gpio; - gpio += gpio_count; - } - bank->chip.ngpio = gpio_count; - -gpiochip_add (&bank->chip); - -for (j = bank->virtual_irq_start; - j < bank->virtual_irq_start + gpio_count; j++) { -lockdep_set_class (&irq_desc[j].lock, &gpio_lock_class); -set_irq_chip_data (j, bank); -if (bank_is_mpuio (bank)) -set_irq_chip (j, &mpuio_irq_chip); -else -set_irq_chip (j, &gpio_irq_chip); -set_irq_handler (j, handle_simple_irq); -set_irq_flags (j,IRQF_VALID ); - } -set_irq_chained_handler (bank->irq, gpio_irq_handler); -set_irq_data (bank->irq, bank); +omap_gpio_mod_init (bank, i); +omap_gpio_chip_init (bank);if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {sprintf (clk_name,"gpio%d_dbck" , i +1 );
@@ -1950,17 +1963,6 @@ static int __init _omap_gpio_init(void) } } -/* Enable system clock for GPIO module. -* The CAM_CLK_CTRL *is* really the right place. */ -if (cpu_is_omap16xx ()) -omap_writel (omap_readl (ULPD_CAM_CLK_CTRL ) |0x04 ,ULPD_CAM_CLK_CTRL ); - -/* Enable autoidle for the OCP interface */ -if (cpu_is_omap24xx ()) -omap_writel (1 <<0 ,0x48019010 ); -if (cpu_is_omap34xx ()) -omap_writel (1 <<0 ,0x48306814 ); -omap_gpio_show_rev ();return 0 ;
Signature · 1 line
1.7.0.4
PATCH v7 1/11 OMAP: GPIO: prepare for platform driver
Hi,
arch/arm/plat-omap/gpio.c static void __init omap_gpio_show_rev(void) · line 1721
Quoted 3 lines · Charulatha
arch/arm/plat-omap/gpio.c +3
-0+static void omap_gpio_mod_init (struct gpio_bank *bank,int id) +{ +if (cpu_class_is_omap2 ()) {
Why check class when you're checking for all possible variants anyway?
Quoted 18 lines
arch/arm/plat-omap/gpio.c +18
-0+if (cpu_is_omap44xx ()) { +__raw_writel (0xffffffff , bank->base + +OMAP4_GPIO_IRQSTATUSCLR0 ); +__raw_writel (0x00000000 , bank->base + +OMAP4_GPIO_DEBOUNCENABLE ); +/* Initialize interface clk ungated, module enabled */ +__raw_writel (0 , bank->base +OMAP4_GPIO_CTRL ); + }else if (cpu_is_omap34xx ()) { +__raw_writel (0x00000000 , bank->base + +OMAP24XX_GPIO_IRQENABLE1 ); +__raw_writel (0xffffffff , bank->base + +OMAP24XX_GPIO_IRQSTATUS1 ); +__raw_writel (0x00000000 , bank->base + +OMAP24XX_GPIO_DEBOUNCE_EN ); + +/* Initialize interface clk ungated, module enabled */ +__raw_writel (0 , bank->base +OMAP24XX_GPIO_CTRL ); + }else if (cpu_is_omap24xx ()) {
arch/arm/plat-omap/gpio.c static void __init omap_gpio_show_rev(void) · line 1749
Quoted 10 lines
arch/arm/plat-omap/gpio.c +10
-0+static const u32 non_wakeup_gpios[] = { +0xe203ffc0 ,0x08700040 + }; +if (id <ARRAY_SIZE (non_wakeup_gpios)) + bank->non_wakeup_gpios = non_wakeup_gpios[id]; + } + }else if (cpu_class_is_omap1 ()) { +if (bank_is_mpuio (bank)) +__raw_writew (0xffff , bank->base + +OMAP_MPUIO_GPIO_MASKIT );
Above is using else if, this is using if. I don't see how you can ever hit more than one of these anyway.
Besides, why check for both cpu and method? When do they ever diverge? (same goes for other places)
The plat-omap/gpio.c driver is pretty hard to read because of all the ifdeffing and tests for platforms. It would make sense to abstract out some of the operations into separate functions and use function pointers for them, IMHO. (Not an issue for this patch, just a reflection).
Quoted 236 lines
arch/arm/plat-omap/gpio.c +87
-114+if (cpu_is_omap15xx () && bank->method ==METHOD_GPIO_1510 ) { +__raw_writew (0xffff , bank->base + +OMAP1510_GPIO_INT_MASK ); +__raw_writew (0x0000 , bank->base + +OMAP1510_GPIO_INT_STATUS ); + } +if (cpu_is_omap16xx () && bank->method ==METHOD_GPIO_1610 ) { +__raw_writew (0x0000 , bank->base + +OMAP1610_GPIO_IRQENABLE1 ); +__raw_writew (0xffff , bank->base + +OMAP1610_GPIO_IRQSTATUS1 ); +__raw_writew (0x0014 , bank->base + +OMAP1610_GPIO_SYSCONFIG ); + +/* +* Enable system clock for GPIO module. +* The CAM_CLK_CTRL *is* really the right place. +*/ +omap_writel (omap_readl (ULPD_CAM_CLK_CTRL ) |0x04 , +ULPD_CAM_CLK_CTRL ); + } +if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) { +__raw_writel (0xffffffff , bank->base + +OMAP7XX_GPIO_INT_MASK ); +__raw_writel (0x00000000 , bank->base + +OMAP7XX_GPIO_INT_STATUS ); + } + } +} + +static void __init omap_gpio_chip_init (struct gpio_bank *bank) +{ +int j, bank_width =16 ; +static int gpio; + +if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) + bank_width =32 ;/* 7xx has 32-bit GPIOs */ + +if ((bank->method ==METHOD_GPIO_24XX ) || + (bank->method ==METHOD_GPIO_44XX )) + bank_width =32 ; + + bank->mod_usage =0 ; +/* +* REVISIT eventually switch from OMAP-specific gpio structs +* over to the generic ones +*/ + bank->chip.request = omap_gpio_request; + bank->chip.free = omap_gpio_free; + bank->chip.direction_input = gpio_input; + bank->chip.get = gpio_get; + bank->chip.direction_output = gpio_output; + bank->chip.set_debounce = gpio_debounce; + bank->chip.set = gpio_set; + bank->chip.to_irq = gpio_2irq; +if (bank_is_mpuio (bank)) { + bank->chip.label ="mpuio" ; +#ifdef CONFIG_ARCH_OMAP16XX + bank->chip.dev = &omap_mpuio_device.dev; +#endif + bank->chip.base =OMAP_MPUIO (0 ); + }else { + bank->chip.label ="gpio" ; + bank->chip.base = gpio; + gpio += bank_width; + } + bank->chip.ngpio = bank_width; + +gpiochip_add (&bank->chip); + +for (j = bank->virtual_irq_start; + j < bank->virtual_irq_start + bank_width; j++) { +lockdep_set_class (&irq_desc[j].lock, &gpio_lock_class); +set_irq_chip_data (j, bank); +if (bank_is_mpuio (bank)) +set_irq_chip (j, &mpuio_irq_chip); +else +set_irq_chip (j, &gpio_irq_chip); +set_irq_handler (j, handle_simple_irq); +set_irq_flags (j,IRQF_VALID ); + } +set_irq_chained_handler (bank->irq, gpio_irq_handler); +set_irq_data (bank->irq, bank); +} +static int __init _omap_gpio_init (void ) {int i; -int gpio =0 ;struct gpio_bank *bank;int bank_size =SZ_8K ;/* Module 4KB + L4 4KB except on omap1 */ char clk_name[11 ];@@ -1828,7 +1941,6 @@ static int __init _omap_gpio_init(void) }#endif for (i =0 ; i < gpio_bank_count; i++) { -int j, gpio_count =16 ; bank = &gpio_bank[i];spin_lock_init (&bank->lock);@@ -1840,107 +1952,8 @@ static int __init _omap_gpio_init(void)continue ; } -if (bank_is_mpuio (bank)) -__raw_writew (0xffff , bank->base +OMAP_MPUIO_GPIO_MASKIT ); -if (cpu_is_omap15xx () && bank->method ==METHOD_GPIO_1510 ) { -__raw_writew (0xffff , bank->base +OMAP1510_GPIO_INT_MASK ); -__raw_writew (0x0000 , bank->base +OMAP1510_GPIO_INT_STATUS ); - } -if (cpu_is_omap16xx () && bank->method ==METHOD_GPIO_1610 ) { -__raw_writew (0x0000 , bank->base +OMAP1610_GPIO_IRQENABLE1 ); -__raw_writew (0xffff , bank->base +OMAP1610_GPIO_IRQSTATUS1 ); -__raw_writew (0x0014 , bank->base +OMAP1610_GPIO_SYSCONFIG ); - } -if (cpu_is_omap7xx () && bank->method ==METHOD_GPIO_7XX ) { -__raw_writel (0xffffffff , bank->base +OMAP7XX_GPIO_INT_MASK ); -__raw_writel (0x00000000 , bank->base +OMAP7XX_GPIO_INT_STATUS ); - - gpio_count =32 ;/* 7xx has 32-bit GPIOs */ - } - -#ifdef CONFIG_ARCH_OMAP2PLUS -if ((bank->method ==METHOD_GPIO_24XX ) || - (bank->method ==METHOD_GPIO_44XX )) { -static const u32 non_wakeup_gpios[] = { -0xe203ffc0 ,0x08700040 - }; - -if (cpu_is_omap44xx ()) { -__raw_writel (0xffffffff , bank->base + -OMAP4_GPIO_IRQSTATUSCLR0 ); -__raw_writew (0x0015 , bank->base + -OMAP4_GPIO_SYSCONFIG ); -__raw_writel (0x00000000 , bank->base + -OMAP4_GPIO_DEBOUNCENABLE ); -/* -* Initialize interface clock ungated, -* module enabled -*/ -__raw_writel (0 , bank->base +OMAP4_GPIO_CTRL ); - }else { -__raw_writel (0x00000000 , bank->base + -OMAP24XX_GPIO_IRQENABLE1 ); -__raw_writel (0xffffffff , bank->base + -OMAP24XX_GPIO_IRQSTATUS1 ); -__raw_writew (0x0015 , bank->base + -OMAP24XX_GPIO_SYSCONFIG ); -__raw_writel (0x00000000 , bank->base + -OMAP24XX_GPIO_DEBOUNCE_EN ); - -/* -* Initialize interface clock ungated, -* module enabled -*/ -__raw_writel (0 , bank->base + -OMAP24XX_GPIO_CTRL ); - } -if (cpu_is_omap24xx () && - i <ARRAY_SIZE (non_wakeup_gpios)) - bank->non_wakeup_gpios = non_wakeup_gpios[i]; - gpio_count =32 ; - } -#endif - - bank->mod_usage =0 ; -/* REVISIT eventually switch from OMAP-specific gpio structs -* over to the generic ones -*/ - bank->chip.request = omap_gpio_request; - bank->chip.free = omap_gpio_free; - bank->chip.direction_input = gpio_input; - bank->chip.get = gpio_get; - bank->chip.direction_output = gpio_output; - bank->chip.set_debounce = gpio_debounce; - bank->chip.set = gpio_set; - bank->chip.to_irq = gpio_2irq; -if (bank_is_mpuio (bank)) { - bank->chip.label ="mpuio" ; -#ifdef CONFIG_ARCH_OMAP16XX - bank->chip.dev = &omap_mpuio_device.dev; -#endif - bank->chip.base =OMAP_MPUIO (0 ); - }else { - bank->chip.label ="gpio" ; - bank->chip.base = gpio; - gpio += gpio_count; - } - bank->chip.ngpio = gpio_count; - -gpiochip_add (&bank->chip); - -for (j = bank->virtual_irq_start; - j < bank->virtual_irq_start + gpio_count; j++) { -lockdep_set_class (&irq_desc[j].lock, &gpio_lock_class); -set_irq_chip_data (j, bank); -if (bank_is_mpuio (bank)) -set_irq_chip (j, &mpuio_irq_chip); -else -set_irq_chip (j, &gpio_irq_chip); -set_irq_handler (j, handle_simple_irq); -set_irq_flags (j,IRQF_VALID ); - } -set_irq_chained_handler (bank->irq, gpio_irq_handler); -set_irq_data (bank->irq, bank); +omap_gpio_mod_init (bank, i); +omap_gpio_chip_init (bank);if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {sprintf (clk_name,"gpio%d_dbck" , i +1 );@@ -1950,17 +1963,6 @@ static int __init _omap_gpio_init(void) } } -/* Enable system clock for GPIO module. -* The CAM_CLK_CTRL *is* really the right place. */ -if (cpu_is_omap16xx ()) -omap_writel (omap_readl (ULPD_CAM_CLK_CTRL ) |0x04 ,ULPD_CAM_CLK_CTRL ); - -/* Enable autoidle for the OCP interface */ -if (cpu_is_omap24xx ()) -omap_writel (1 <<0 ,0x48019010 ); -if (cpu_is_omap34xx ()) -omap_writel (1 <<0 ,0x48306814 ); -omap_gpio_show_rev ();return 0 ;Signature · 7 lines
1.7.0.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v7 1/11 OMAP: GPIO: prepare for platform driver
Olof Johansson,
Quoted 8 lines · Olof Johansson
Hi,
arch/arm/plat-omap/gpio.c static void __init omap_gpio_show_rev(void)
Quoted 3 lines · Charulatha
arch/arm/plat-omap/gpio.c +3
-0+static void omap_gpio_mod_init (struct gpio_bank *bank,int id) +{ + ? ? if (cpu_class_is_omap2()) {Why check class when you're checking for all possible variants anyway?
This is only a movement of code as I mentioned in the patch description and I am not trying to modify anything newly. All these would be removed while doing GPIO driver cleanup (please see below).
Quoted 33 lines
Quoted 21 lines
+ ? ? ? ? ? ? if (
cpu_is_omap44xx()) {
+ ? ? ? ? ? ? ? ? ? ? __raw_writel(0xffffffff,bank->base+
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP4_GPIO_IRQSTATUSCLR0);
+ ? ? ? ? ? ? ? ? ? ? __raw_writel(0x00000000,bank->base+
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP4_GPIO_DEBOUNCENABLE);
+ ? ? ? ? ? ? ? ? ? ? /* Initialize interface clk ungated, module enabled */
+ ? ? ? ? ? ? ? ? ? ?__raw_writel(0, bank->base + OMAP4_GPIO_CTRL);
+ ? ? ? ? ? ? } else if (cpu_is_omap34xx()) {
+ ? ? ? ? ? ? ? ? ? ? __raw_writel(0x00000000,bank->base+
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP24XX_GPIO_IRQENABLE1);
+ ? ? ? ? ? ? ? ? ? ? __raw_writel(0xffffffff,bank->base+
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP24XX_GPIO_IRQSTATUS1);
+ ? ? ? ? ? ? ? ? ? ? __raw_writel(0x00000000,bank->base+
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP24XX_GPIO_DEBOUNCE_EN); +
+ ? ? ? ? ? ? ? ? ? ? /* Initialize interface clk ungated, module enabled */
+ ? ? ? ? ? ? ? ? ? ?__raw_writel(0, bank->base + OMAP24XX_GPIO_CTRL);
+ ? ? ? ? ? ? } else if (cpu_is_omap24xx()) {
+ ? ? ? ? ? ? ? ? ? ? static const u32 non_wakeup_gpios[] = {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ?0xe203ffc0,0x08700040Quoted 8 lines
+ ? ? ? ? ? ? ? ? ? ? };
+ ? ? ? ? ? ? ? ? ? ? if (id <ARRAY_SIZE(non_wakeup_gpios))
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ?bank->non_wakeup_gpios= non_wakeup_gpios[id];
+ ? ? ? ? ? ? }
+ ? ? } else if (cpu_class_is_omap1()) {
+ ? ? ? ? ? ? if (bank_is_mpuio(bank))
+ ? ? ? ? ? ? ? ? ? ? __raw_writew(0xffff,bank->base
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? +OMAP_MPUIO_GPIO_MASKIT);Above is using else if, this is using if. I don't see how you can ever hit more than one of these anyway.
Quoted 7 lines
Besides, why check for both cpu and method? When do they ever diverge? (same goes for other places)
The
plat-omap/gpio.cdriver is pretty hard to read because of all the ifdeffing and tests for platforms. It would make sense to abstract out some of the operations into separate functions and use function pointers for them, IMHO. (Not an issue for this patch, just a reflection).
Yes. I also wondered why to have cpu_is checks, methods and #ifdefs and it is quite confusing too.
This patch series is intended only for platform driver implementation of hwmod and mainly using hwmod for OMAP2+. If I include cleaning up of GPIO driver also in this patch series, it would become too huge. This was discussed long ago and it was agreed to have GPIO driver cleanup as a separate series. Hence this is
mentioned in the TODOs (please see patch 10 description for the list of TODOs as that is main patch where the actual platform driver implementation is being done for
GPIO)
Thanks.
[Query]McSPI testing help on N800
Hello,
We were wondering how to test McSPI on N800.
Is there any peripheral connected to McSPI?
Any inputs are welcome.
Thanking you,
With Regards,
Shubhro
Paul Walmsley
maintainerRe: [Query]McSPI testing help on N800
Quoted 2 lines · Shubhrajyoti
We were wondering how to test McSPI on N800.
Is there any peripheral connected to McSPI?
These devices are configured in the board file for the device, which is arch/arm/mach-omap2/board-n8x0.c
- Paul
PATCH v7 2/11 OMAP15xx: GPIO: Introduce support for GPIO init
In reply to Varadarajan, CharulathaAdd support for handling OMAP15xx specific gpio_init by providing platform device data and doing device registration.
--- arch/arm/mach-omap1/gpio15xx.c | 98 ++++++++++++++++++++++++++++++++ arch/arm/plat-omap/gpio.c | 10 +--- arch/arm/plat-omap/include/plat/gpio.h | 18 ++++++ 3 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 arch/arm/mach-omap1/gpio15xx.c
arch/arm/mach-omap1/gpio15xx.c new file +98 -0
@@ -0,0 +1,98 @@ +/* +* OMAP15xx specific gpio init +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* +* Author: +* Charulatha V <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/gpio.h> + +#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE +#define OMAP1510_GPIO_BASE 0xFFFCE000 + +/* gpio1 */ +static struct __initdata resource omap15xx_mpu_gpio_resources[] = { + { + .start =OMAP1_MPUIO_VBASE , + .end =OMAP1_MPUIO_VBASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_MPUIO , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = { + .virtual_irq_start =IH_MPUIO_BASE , + .bank_type =METHOD_MPUIO , + .bank_width =16 , +}; + +static struct __initdata platform_device omap15xx_mpu_gpio = { + .name ="omap_gpio" , + .id =0 , + .dev = { + .platform_data = &omap15xx_mpu_gpio_config, + }, + .num_resources =ARRAY_SIZE (omap15xx_mpu_gpio_resources), + .resource = omap15xx_mpu_gpio_resources, +}; + +/* gpio2 */ +static struct __initdata resource omap15xx_gpio_resources[] = { + { + .start =OMAP1510_GPIO_BASE , + .end =OMAP1510_GPIO_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_GPIO_BANK1 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { + .virtual_irq_start =IH_GPIO_BASE , + .bank_type =METHOD_GPIO_1510 , + .bank_width =16 , +}; + +static struct __initdata platform_device omap15xx_gpio = { + .name ="omap_gpio" , + .id =1 , + .dev = { + .platform_data = &omap15xx_gpio_config, + }, + .num_resources =ARRAY_SIZE (omap15xx_gpio_resources), + .resource = omap15xx_gpio_resources, +}; + +/* +* omap15xx_gpio_init needs to be done before +* machine_init functions access gpio APIs. +* Hence omap15xx_gpio_init is a postcore_initcall. +*/ +static int __init omap15xx_gpio_init (void ) +{ +if (!cpu_is_omap15xx ()) +return -EINVAL ; + +platform_device_register (&omap15xx_mpu_gpio); +platform_device_register (&omap15xx_gpio); + + gpio_bank_count =2 ; +return 0 ; +} +postcore_initcall (omap15xx_gpio_init);
arch/arm/plat-omap/gpio.c +2 -8
@@ -205,13 +205,6 @@ struct gpio_bank {u32 dbck_enable_mask; }; -#define METHOD_MPUIO 0 -#define METHOD_GPIO_1510 1 -#define METHOD_GPIO_1610 2 -#define METHOD_GPIO_7XX 3 -#define METHOD_GPIO_24XX 5 -#define METHOD_GPIO_44XX 6 - #ifdef CONFIG_ARCH_OMAP16XX static struct gpio_bank gpio_bank_1610[5] = { { OMAP1_MPUIO_VBASE, NULL, INT_MPUIO, IH_MPUIO_BASE,
@@ -335,7 +328,8 @@ static struct gpio_bank gpio_bank_44xx[6] = {#endif static struct gpio_bank *gpio_bank; -static int gpio_bank_count; +/* TODO: Analyze removing gpio_bank_count usage from driver code */ +int gpio_bank_count;static inline struct gpio_bank *get_gpio_bank (int gpio) {
arch/arm/plat-omap/include/plat/gpio.h +18 -0
@@ -27,6 +27,7 @@#define __ASM_ARCH_OMAP_GPIO_H#include <linux/io.h> +#include <linux/platform_device.h> #include <mach/irqs.h> #define OMAP1_MPUIO_BASE 0xfffb5000
@@ -71,6 +72,23 @@ IH_MPUIO_BASE + ((nr) & 0x0f) : \ IH_GPIO_BASE + (nr)) +#define METHOD_MPUIO 0 +#define METHOD_GPIO_1510 1 +#define METHOD_GPIO_1610 2 +#define METHOD_GPIO_7XX 3 +#define METHOD_GPIO_24XX 5 +#define METHOD_GPIO_44XX 6 + +struct omap_gpio_platform_data { +u16 virtual_irq_start; +int bank_type; +int bank_width;/* GPIO bank width */ +bool dbck_flag;/* dbck required or not - True for OMAP3&4 */ +}; + +/* TODO: Analyze removing gpio_bank_count usage from driver code */ +extern int gpio_bank_count; +extern int omap_gpio_init (void );/* Call from board init only */ extern void omap2_gpio_prepare_for_idle (int power_state);extern void omap2_gpio_resume_after_idle (void );
Signature · 1 line
1.7.0.4
PATCH v7 3/11 OMAP16xx: GPIO: Introduce support for GPIO init
In reply to Varadarajan, CharulathaAdd support for handling OMAP16xx specific gpio_init by providing platform device data and doing device registration.
--- arch/arm/mach-omap1/gpio16xx.c | 199 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/gpio16xx.c
arch/arm/mach-omap1/gpio16xx.c new file +199 -0
@@ -0,0 +1,199 @@ +/* +* OMAP16xx specific gpio init +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* +* Author: +* Charulatha V <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/gpio.h> + +#define OMAP1610_GPIO1_BASE 0xfffbe400 +#define OMAP1610_GPIO2_BASE 0xfffbec00 +#define OMAP1610_GPIO3_BASE 0xfffbb400 +#define OMAP1610_GPIO4_BASE 0xfffbbc00 +#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE + +/* mpu gpio */ +static struct __initdata resource omap16xx_mpu_gpio_resources[] = { + { + .start =OMAP1_MPUIO_VBASE , + .end =OMAP1_MPUIO_VBASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_MPUIO , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = { + .virtual_irq_start =IH_MPUIO_BASE , + .bank_type =METHOD_MPUIO , + .bank_width =16 , +}; + +static struct __initdata platform_device omap16xx_mpu_gpio = { + .name ="omap_gpio" , + .id =0 , + .dev = { + .platform_data = &omap16xx_mpu_gpio_config, + }, + .num_resources =ARRAY_SIZE (omap16xx_mpu_gpio_resources), + .resource = omap16xx_mpu_gpio_resources, +}; + +/* gpio1 */ +static struct __initdata resource omap16xx_gpio1_resources[] = { + { + .start =OMAP1610_GPIO1_BASE , + .end =OMAP1610_GPIO1_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_GPIO_BANK1 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = { + .virtual_irq_start =IH_GPIO_BASE , + .bank_type =METHOD_GPIO_1610 , + .bank_width =16 , +}; + +static struct __initdata platform_device omap16xx_gpio1 = { + .name ="omap_gpio" , + .id =1 , + .dev = { + .platform_data = &omap16xx_gpio1_config, + }, + .num_resources =ARRAY_SIZE (omap16xx_gpio1_resources), + .resource = omap16xx_gpio1_resources, +}; + +/* gpio2 */ +static struct __initdata resource omap16xx_gpio2_resources[] = { + { + .start =OMAP1610_GPIO2_BASE , + .end =OMAP1610_GPIO2_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_1610_GPIO_BANK2 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { + .virtual_irq_start =IH_GPIO_BASE +16 , + .bank_type =METHOD_GPIO_1610 , + .bank_width =16 , +}; + +static struct __initdata platform_device omap16xx_gpio2 = { + .name ="omap_gpio" , + .id =2 , + .dev = { + .platform_data = &omap16xx_gpio2_config, + }, + .num_resources =ARRAY_SIZE (omap16xx_gpio2_resources), + .resource = omap16xx_gpio2_resources, +}; + +/* gpio3 */ +static struct __initdata resource omap16xx_gpio3_resources[] = { + { + .start =OMAP1610_GPIO3_BASE , + .end =OMAP1610_GPIO3_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_1610_GPIO_BANK3 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { + .virtual_irq_start =IH_GPIO_BASE +32 , + .bank_type =METHOD_GPIO_1610 , + .bank_width =16 , +}; + +static struct __initdata platform_device omap16xx_gpio3 = { + .name ="omap_gpio" , + .id =3 , + .dev = { + .platform_data = &omap16xx_gpio3_config, + }, + .num_resources =ARRAY_SIZE (omap16xx_gpio3_resources), + .resource = omap16xx_gpio3_resources, +}; + +/* gpio4 */ +static struct __initdata resource omap16xx_gpio4_resources[] = { + { + .start =OMAP1610_GPIO4_BASE , + .end =OMAP1610_GPIO4_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_1610_GPIO_BANK4 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { + .virtual_irq_start =IH_GPIO_BASE +48 , + .bank_type =METHOD_GPIO_1610 , + .bank_width =16 , +}; + +static struct __initdata platform_device omap16xx_gpio4 = { + .name ="omap_gpio" , + .id =4 , + .dev = { + .platform_data = &omap16xx_gpio4_config, + }, + .num_resources =ARRAY_SIZE (omap16xx_gpio4_resources), + .resource = omap16xx_gpio4_resources, +}; + +static struct __initdata platform_device * omap16xx_gpio_dev[] = { + &omap16xx_mpu_gpio, + &omap16xx_gpio1, + &omap16xx_gpio2, + &omap16xx_gpio3, + &omap16xx_gpio4, +}; + +/* +* omap16xx_gpio_init needs to be done before +* machine_init functions access gpio APIs. +* Hence omap16xx_gpio_init is a postcore_initcall. +*/ +static int __init omap16xx_gpio_init (void ) +{ +int i; + +if (!cpu_is_omap16xx ()) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (omap16xx_gpio_dev); i++) +platform_device_register (omap16xx_gpio_dev[i]); + + gpio_bank_count =ARRAY_SIZE (omap16xx_gpio_dev); + +return 0 ; +} +postcore_initcall (omap16xx_gpio_init);
Signature · 1 line
1.7.0.4
PATCH v7 4/11 OMAP7xx: GPIO: Introduce support for GPIO init
In reply to Varadarajan, CharulathaAdd support for handling OMAP7xx specific gpio_init by providing platform device data and doing device registration.
--- arch/arm/mach-omap1/gpio7xx.c | 261 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 261 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/gpio7xx.c
arch/arm/mach-omap1/gpio7xx.c new file +261 -0
@@ -0,0 +1,261 @@ +/* +* OMAP7xx specific gpio init +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* +* Author: +* Charulatha V <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/gpio.h> + +#define OMAP7XX_GPIO1_BASE 0xfffbc000 +#define OMAP7XX_GPIO2_BASE 0xfffbc800 +#define OMAP7XX_GPIO3_BASE 0xfffbd000 +#define OMAP7XX_GPIO4_BASE 0xfffbd800 +#define OMAP7XX_GPIO5_BASE 0xfffbe000 +#define OMAP7XX_GPIO6_BASE 0xfffbe800 +#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE + +/* mpu gpio */ +static struct __initdata resource omap7xx_mpu_gpio_resources[] = { + { + .start =OMAP1_MPUIO_VBASE , + .end =OMAP1_MPUIO_VBASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_MPUIO , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = { + .virtual_irq_start =IH_MPUIO_BASE , + .bank_type =METHOD_MPUIO , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_mpu_gpio = { + .name ="omap_gpio" , + .id =0 , + .dev = { + .platform_data = &omap7xx_mpu_gpio_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_mpu_gpio_resources), + .resource = omap7xx_mpu_gpio_resources, +}; + +/* gpio1 */ +static struct __initdata resource omap7xx_gpio1_resources[] = { + { + .start =OMAP7XX_GPIO1_BASE , + .end =OMAP7XX_GPIO1_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK1 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = { + .virtual_irq_start =IH_GPIO_BASE , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio1 = { + .name ="omap_gpio" , + .id =1 , + .dev = { + .platform_data = &omap7xx_gpio1_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio1_resources), + .resource = omap7xx_gpio1_resources, +}; + +/* gpio2 */ +static struct __initdata resource omap7xx_gpio2_resources[] = { + { + .start =OMAP7XX_GPIO2_BASE , + .end =OMAP7XX_GPIO2_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK2 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { + .virtual_irq_start =IH_GPIO_BASE +32 , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio2 = { + .name ="omap_gpio" , + .id =2 , + .dev = { + .platform_data = &omap7xx_gpio2_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio2_resources), + .resource = omap7xx_gpio2_resources, +}; + +/* gpio3 */ +static struct __initdata resource omap7xx_gpio3_resources[] = { + { + .start =OMAP7XX_GPIO3_BASE , + .end =OMAP7XX_GPIO3_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK3 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { + .virtual_irq_start =IH_GPIO_BASE +64 , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio3 = { + .name ="omap_gpio" , + .id =3 , + .dev = { + .platform_data = &omap7xx_gpio3_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio3_resources), + .resource = omap7xx_gpio3_resources, +}; + +/* gpio4 */ +static struct __initdata resource omap7xx_gpio4_resources[] = { + { + .start =OMAP7XX_GPIO4_BASE , + .end =OMAP7XX_GPIO4_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK4 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { + .virtual_irq_start =IH_GPIO_BASE +96 , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio4 = { + .name ="omap_gpio" , + .id =4 , + .dev = { + .platform_data = &omap7xx_gpio4_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio4_resources), + .resource = omap7xx_gpio4_resources, +}; + +/* gpio5 */ +static struct __initdata resource omap7xx_gpio5_resources[] = { + { + .start =OMAP7XX_GPIO5_BASE , + .end =OMAP7XX_GPIO5_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK5 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { + .virtual_irq_start =IH_GPIO_BASE +128 , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio5 = { + .name ="omap_gpio" , + .id =5 , + .dev = { + .platform_data = &omap7xx_gpio5_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio5_resources), + .resource = omap7xx_gpio5_resources, +}; + +/* gpio6 */ +static struct __initdata resource omap7xx_gpio6_resources[] = { + { + .start =OMAP7XX_GPIO6_BASE , + .end =OMAP7XX_GPIO6_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_7XX_GPIO_BANK6 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { + .virtual_irq_start =IH_GPIO_BASE +160 , + .bank_type =METHOD_GPIO_7XX , + .bank_width =32 , +}; + +static struct __initdata platform_device omap7xx_gpio6 = { + .name ="omap_gpio" , + .id =6 , + .dev = { + .platform_data = &omap7xx_gpio6_config, + }, + .num_resources =ARRAY_SIZE (omap7xx_gpio6_resources), + .resource = omap7xx_gpio6_resources, +}; + +static struct __initdata platform_device * omap7xx_gpio_dev[] = { + &omap7xx_mpu_gpio, + &omap7xx_gpio1, + &omap7xx_gpio2, + &omap7xx_gpio3, + &omap7xx_gpio4, + &omap7xx_gpio5, + &omap7xx_gpio6, +}; + +/* +* omap7xx_gpio_init needs to be done before +* machine_init functions access gpio APIs. +* Hence omap7xx_gpio_init is a postcore_initcall. +*/ +static int __init omap7xx_gpio_init (void ) +{ +int i; + +if (!cpu_is_omap7xx ()) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (omap7xx_gpio_dev); i++) +platform_device_register (omap7xx_gpio_dev[i]); + + gpio_bank_count =ARRAY_SIZE (omap7xx_gpio_dev); + +return 0 ; +} +postcore_initcall (omap7xx_gpio_init);
Signature · 1 line
1.7.0.4
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
In reply to Varadarajan, CharulathaAdd GPIO hwmod data for OMAP2420
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 229 ++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/gpio.h | 5 + 2 files changed, 234 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +229 -0
@@ -17,6 +17,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap24xx.h> #include "omap_hwmod_common_data.h"
@@ -38,6 +39,10 @@ static struct omap_hwmod omap2420_iva_hwmod;static struct omap_hwmod omap2420_l3_main_hwmod;static struct omap_hwmod omap2420_l4_core_hwmod;static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_gpio1_hwmod; +static struct omap_hwmod omap2420_gpio2_hwmod; +static struct omap_hwmod omap2420_gpio3_hwmod; +static struct omap_hwmod omap2420_gpio4_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
@@ -557,6 +562,224 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .flags = HWMOD_16BIT_REG, }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { + { + .pa_start =0x48018000 , + .pa_end =0x480181ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { + .master = &omap2420_l4_wkup_hwmod, + .slave = &omap2420_gpio1_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio1_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio1_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio2 */ +static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { + { + .pa_start =0x4801a000 , + .pa_end =0x4801a1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { + .master = &omap2420_l4_wkup_hwmod, + .slave = &omap2420_gpio2_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio2_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio2_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio3 */ +static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { + { + .pa_start =0x4801c000 , + .pa_end =0x4801c1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { + .master = &omap2420_l4_wkup_hwmod, + .slave = &omap2420_gpio3_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio3_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio3_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio4 */ +static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { + { + .pa_start =0x4801e000 , + .pa_end =0x4801e1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { + .master = &omap2420_l4_wkup_hwmod, + .slave = &omap2420_gpio4_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio4_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio4_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = false, +}; + +static struct omap_hwmod_class_sysconfig omap242x_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +/* +* 'gpio' class +* general purpose io module +*/ +static struct omap_hwmod_class omap242x_gpio_hwmod_class = { + .name ="gpio" , + .sysc = &omap242x_gpio_sysc, + .rev =0 , +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap242x_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_24XX_GPIO_BANK1 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = { + &omap2420_l4_wkup__gpio1, +}; + +static struct omap_hwmod omap2420_gpio1_hwmod = { + .name ="gpio1" , + .mpu_irqs = omap242x_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio1_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio1_slaves), + .class = &omap242x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio2 */ +static struct omap_hwmod_irq_info omap242x_gpio2_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =30 },/* INT_24XX_GPIO_BANK2 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = { + &omap2420_l4_wkup__gpio2, +}; + +static struct omap_hwmod omap2420_gpio2_hwmod = { + .name ="gpio2" , + .mpu_irqs = omap242x_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio2_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio2_slaves), + .class = &omap242x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio3 */ +static struct omap_hwmod_irq_info omap242x_gpio3_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =31 },/* INT_24XX_GPIO_BANK3 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = { + &omap2420_l4_wkup__gpio3, +}; + +static struct omap_hwmod omap2420_gpio3_hwmod = { + .name ="gpio3" , + .mpu_irqs = omap242x_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio3_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio3_slaves), + .class = &omap242x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio4 */ +static struct omap_hwmod_irq_info omap242x_gpio4_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =32 },/* INT_24XX_GPIO_BANK4 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = { + &omap2420_l4_wkup__gpio4, +}; + +static struct omap_hwmod omap2420_gpio4_hwmod = { + .name ="gpio4" , + .mpu_irqs = omap242x_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio4_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio4_slaves), + .class = &omap242x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; +static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_l3_main_hwmod, &omap2420_l4_core_hwmod,
@@ -569,6 +792,12 @@ static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_uart3_hwmod, &omap2420_i2c1_hwmod, &omap2420_i2c2_hwmod, + +/* gpio class */ + &omap2420_gpio1_hwmod, + &omap2420_gpio2_hwmod, + &omap2420_gpio3_hwmod, + &omap2420_gpio4_hwmod, NULL, };
arch/arm/plat-omap/include/plat/gpio.h +5 -0
@@ -79,6 +79,11 @@#define METHOD_GPIO_24XX 5#define METHOD_GPIO_44XX 6 +struct omap_gpio_dev_attr { +int bank_width;/* GPIO bank width */ +bool dbck_flag;/* dbck required or not - True for OMAP3&4 */ +}; +struct omap_gpio_platform_data {u16 virtual_irq_start;int bank_type;
Signature · 1 line
1.7.0.4
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
Quoted 13 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 229 ++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/gpio.h | 5 + 2 files changed, 234 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0
arch/arm/mach-omap2/omap_hwmod_2420_data.c line 21
Quoted 5 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1
-0@@ -17,6 +17,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap24xx.h>
Do you still need that header file?
arch/arm/plat-omap/include/plat/gpio.h
Quoted 252 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +228
-0#include "omap_hwmod_common_data.h" @@ -38,6 +39,10 @@ static struct omap_hwmod omap2420_iva_hwmod;static struct omap_hwmod omap2420_l3_main_hwmod;static struct omap_hwmod omap2420_l4_core_hwmod;static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_gpio1_hwmod; +static struct omap_hwmod omap2420_gpio2_hwmod; +static struct omap_hwmod omap2420_gpio3_hwmod; +static struct omap_hwmod omap2420_gpio4_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {@@ -557,6 +562,224 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .flags = HWMOD_16BIT_REG, }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { + { + .pa_start =0x48018000 , + .pa_end =0x480181ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio1_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio1_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio1_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio2 */ +static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { + { + .pa_start =0x4801a000 , + .pa_end =0x4801a1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio2_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio2_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio2_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio3 */ +static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { + { + .pa_start =0x4801c000 , + .pa_end =0x4801c1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio3_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio3_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio3_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio4 */ +static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { + { + .pa_start =0x4801e000 , + .pa_end =0x4801e1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio4_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio4_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio4_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = false, +}; + +static struct omap_hwmod_class_sysconfig omap242x_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields =&omap_hwmod_sysc_type1, +}; + +/* +* 'gpio' class +* general purpose io module +*/ +static struct omap_hwmod_class omap242x_gpio_hwmod_class = { + .name ="gpio" , + .sysc =&omap242x_gpio_sysc, + .rev =0 , +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap242x_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_24XX_GPIO_BANK1 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = { + &omap2420_l4_wkup__gpio1, +}; + +static struct omap_hwmod omap2420_gpio1_hwmod = { + .name ="gpio1" , + .mpu_irqs = omap242x_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio1_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio1_slaves), + .class =&omap242x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio2 */ +static struct omap_hwmod_irq_info omap242x_gpio2_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =30 },/* INT_24XX_GPIO_BANK2 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = { + &omap2420_l4_wkup__gpio2, +}; + +static struct omap_hwmod omap2420_gpio2_hwmod = { + .name ="gpio2" , + .mpu_irqs = omap242x_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio2_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio2_slaves), + .class =&omap242x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio3 */ +static struct omap_hwmod_irq_info omap242x_gpio3_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =31 },/* INT_24XX_GPIO_BANK3 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = { + &omap2420_l4_wkup__gpio3, +}; + +static struct omap_hwmod omap2420_gpio3_hwmod = { + .name ="gpio3" , + .mpu_irqs = omap242x_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio3_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio3_slaves), + .class =&omap242x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; + +/* gpio4 */ +static struct omap_hwmod_irq_info omap242x_gpio4_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =32 },/* INT_24XX_GPIO_BANK4 */ +}; + +static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = { + &omap2420_l4_wkup__gpio4, +}; + +static struct omap_hwmod omap2420_gpio4_hwmod = { + .name ="gpio4" , + .mpu_irqs = omap242x_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap242x_gpio4_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2420_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_gpio4_slaves), + .class =&omap242x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; +static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_l3_main_hwmod, &omap2420_l4_core_hwmod,@@ -569,6 +792,12 @@ static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_uart3_hwmod, &omap2420_i2c1_hwmod, &omap2420_i2c2_hwmod, + +/* gpio class */ + &omap2420_gpio1_hwmod, + &omap2420_gpio2_hwmod, + &omap2420_gpio3_hwmod, + &omap2420_gpio4_hwmod, NULL, };arch/arm/plat-omap/include/plat/gpio.h +0
-0
That change should not necessarily be there, it is not directly related to the subject.
Maybe that should be in an extra patch just before that one.
Beside these 2 minor comments, that patch seems good to me.
Regards,
Benoit
Quoted 15 lines
index 5bef86d..24892a6 100644
arch/arm/plat-omap/include/plat/gpio.h +5
-0@@ -79,6 +79,11 @@#define METHOD_GPIO_24XX 5#define METHOD_GPIO_44XX 6 +struct omap_gpio_dev_attr { +int bank_width;/* GPIO bank width */ +bool dbck_flag;/* dbck required or not - True for OMAP3&4 */ +}; +struct omap_gpio_platform_data {u16 virtual_irq_start;int bank_type;
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
Benoit,
Quoted 11 lines · Benoit
Quoted 10 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>---
?arch/arm/mach-omap2/omap_hwmod_2420_data.c | ?229
++++++++++++++++++++++++++++
?arch/arm/plat-omap/include/plat/gpio.h ? ? | ? ?5 + ?2 files changed, 234 insertions(+), 0 deletions(-)
Quoted 13 lines
Quoted 11 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0@@ -17,6 +17,7 @@?#include<plat/dma.h>
?#include<plat/serial.h>
?#include<plat/i2c.h>
+#include<plat/gpio.h>
?#include<plat/omap24xx.h>Do you still need that header file?
Yes, for the gpio_dev_attr
Quoted 88 lines
Quoted 88 lines
?#include "
omap_hwmod_common_data.h"arch/arm/mach-omap2/omap_hwmod_2420_data.c +4
-0@@ -38,6 +39,10 @@ static struct omap_hwmod omap2420_iva_hwmod; ?static struct omap_hwmod omap2420_l3_main_hwmod; ?static struct omap_hwmod omap2420_l4_core_hwmod; ?static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_gpio1_hwmod; +static struct omap_hwmod omap2420_gpio2_hwmod; +static struct omap_hwmod omap2420_gpio3_hwmod; +static struct omap_hwmod omap2420_gpio4_hwmod;?/* L3 -> ?L4_CORE interface */
?static structomap_hwmod_ocp_ifomap2420_l3_main__l4_core= {arch/arm/mach-omap2/omap_hwmod_2420_data.c +70
-0@@ -557,6 +562,224 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { ? ? ? ?.flags ? ? ? ? ?= HWMOD_16BIT_REG, ?}; +/* l4_wkup -> ?gpio1 */ +static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x48018000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x480181ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio1_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio1_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio1_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ?gpio2 */ +static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801a000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801a1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio2_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio2_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio2_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ?gpio3 */ +static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801c000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801c1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio3_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio3_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio3_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ?gpio4 */ +static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801e000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801e1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio4_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio4_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio4_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA,
Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c static struct omap_hwmod omap2420_i2c2_hwmod = { · line 642
Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +8
-0+}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + ? ? ? .bank_width = 32, + ? ? ? .dbck_flag = false, +}; +
<<snip>>
Quoted 9 lines
arch/arm/plat-omap/include/plat/gpio.h
Quoted 4 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0?};arch/arm/plat-omap/include/plat/gpio.h +0
-0That change should not necessarily be there, it is not directly related to the subject.
Maybe that should be in an extra patch just before that one.
I merged these two patches because of a comment to introduce new variables/structures only in the patch where they are used. Since "omap_gpio_dev_attr" is being used by hwmod DB I merged these two patches. Do you think that hwmod DB patches should not be merged with other patches?
Quoted 4 lines
Beside these 2 minor comments, that patch seems good to me.
Almost-acked-by Benoit Cousson <[email protected]>
Thanks.
Quoted 22 lines
Regards,
BenoitQuoted 16 lines
index 5bef86d..24892a6 100644
arch/arm/plat-omap/include/plat/gpio.h +0
-0@@ -79,6 +79,11 @@?#define
METHOD_GPIO_24XX? ? ?5
?#defineMETHOD_GPIO_44XX? ? ?6+struct
omap_gpio_dev_attr{
+ ? ? ? intbank_width; ? ? ? ? /* GPIO bank width */
+ ? ? ? booldbck_flag; ? ? ? ? /* dbck required or not - True for OMAP3&4 */arch/arm/plat-omap/include/plat/gpio.h +2
-0+}; +?struct
omap_gpio_platform_data{
? ? ? ?u16virtual_irq_start;
? ? ? ?intbank_type;
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
Quoted 8 lines · Charulatha
Benoit,
Quoted 5 lines · Benoit
Quoted 4 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>
[...]
Quoted 6 lines
Quoted 6 lines
arch/arm/plat-omap/include/plat/gpio.h
Quoted 2 lines
arch/arm/plat-omap/include/plat/gpio.h +0
-0That change should not necessarily be there, it is not directly related to the subject.
Quoted 7 lines
Quoted 1 line
Maybe that should be in an extra patch just before that one.
I merged these two patches because of a comment to introduce new variables/structures only in the patch where they are used. Since "
omap_gpio_dev_attr" is being used by hwmod DB I merged these two patches. Do you think that hwmod DB patches should not be merged with other patches?
Not necessarily, maybe you can just update the changelog and the subject to indicate that you add a new structure as well in this patch.
Benoit
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
In reply to Varadarajan, CharulathaQuoted 28 lines · Charulatha
Benoit,
Quoted 11 lines · Benoit
Quoted 10 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 229 ++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/gpio.h | 5 + 2 files changed, 234 insertions(+), 0 deletions(-)Quoted 13 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c line 21
Quoted 11 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1
-0@@ -17,6 +17,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap24xx.h> Do you still need that header file?
Quoted 1 line
Yes, for the
gpio_dev_attr
I'm still confused, gpio_dev_attr just contains an int and a bool:
+static struct omap_gpio_dev_attr gpio_dev_attr = {
+ .bank_width = 32,
+ .dbck_flag = false,
+};
Benoit
Quoted 145 lines
Quoted 89 lines
Quoted 89 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +74
-0#include "omap_hwmod_common_data.h" @@ -38,6 +39,10 @@ static struct omap_hwmod omap2420_iva_hwmod;static struct omap_hwmod omap2420_l3_main_hwmod;static struct omap_hwmod omap2420_l4_core_hwmod;static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_gpio1_hwmod; +static struct omap_hwmod omap2420_gpio2_hwmod; +static struct omap_hwmod omap2420_gpio3_hwmod; +static struct omap_hwmod omap2420_gpio4_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {@@ -557,6 +562,224 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .flags = HWMOD_16BIT_REG, }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { + { + .pa_start =0x48018000 , + .pa_end =0x480181ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio1_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio1_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio1_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio2 */ +static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { + { + .pa_start =0x4801a000 , + .pa_end =0x4801a1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio2_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio2_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio2_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio3 */ +static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { + { + .pa_start =0x4801c000 , + .pa_end =0x4801c1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio3_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio3_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio3_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio4 */ +static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { + { + .pa_start =0x4801e000 , + .pa_end =0x4801e1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { + .master =&omap2420_l4_wkup_hwmod, + .slave =&omap2420_gpio4_hwmod, + .clk ="gpios_ick" , + .addr = omap2420_gpio4_addr_space, + .addr_cnt =ARRAY_SIZE (omap2420_gpio4_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA ,Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c static struct omap_hwmod omap2420_i2c2_hwmod = { · line 642
Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +8
-0+}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = false, +}; +<<snip>>
Quoted 9 lines
arch/arm/plat-omap/include/plat/gpio.h
Quoted 4 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0};arch/arm/plat-omap/include/plat/gpio.h +0
-0That change should not necessarily be there, it is not directly related to the subject.
Maybe that should be in an extra patch just before that one.
I merged these two patches because of a comment to introduce new variables/structures only in the patch where they are used. Since "
omap_gpio_dev_attr" is being used by hwmod DB I merged these two patches. Do you think that hwmod DB patches should not be merged with other patches?Quoted 4 lines
Beside these 2 minor comments, that patch seems good to me.
Almost-acked-by Benoit Cousson<[email protected]>Thanks.
Quoted 22 lines
Regards,
BenoitQuoted 16 lines
index 5bef86d..24892a6 100644
arch/arm/plat-omap/include/plat/gpio.h +5
-0@@ -79,6 +79,11 @@#define METHOD_GPIO_24XX 5#define METHOD_GPIO_44XX 6 +struct omap_gpio_dev_attr { +int bank_width;/* GPIO bank width */ +bool dbck_flag;/* dbck required or not - True for OMAP3&4 */ +}; +struct omap_gpio_platform_data {u16 virtual_irq_start;int bank_type;
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
Quoted 31 lines · Benoit
Quoted 30 lines · Charulatha
Benoit,
Quoted 25 lines · On Thu, Nov 25, 2010 at 03:43, Cousson, Benoit<[email protected]> ?wrote:
Quoted 16 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>---
?arch/arm/mach-omap2/omap_hwmod_2420_data.c | ?229
++++++++++++++++++++++++++++
?arch/arm/plat-omap/include/plat/gpio.h ? ? | ? ?5 + ?2 files changed, 234 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0@@ -17,6 +17,7 @@Quoted 5 lines
?#include<plat/dma.h>
?#include<plat/serial.h>
?#include<plat/i2c.h>
+#include<plat/gpio.h>
?#include<plat/omap24xx.h>Do you still need that header file?
Quoted 3 lines
Quoted 1 line
Yes, for the
gpio_dev_attrI'm still confused,
gpio_dev_attrjust contains an int and a bool:
I am talking about gpio.h file which is required for using omap_gpio_dev_attr. If you are pointing out omap24xx.h file, I am not sure. It was in the original code.
Quoted 117 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +4
-0+static struct omap_gpio_dev_attr gpio_dev_attr = { + ? ? ? .bank_width = 32, + ? ? ? .dbck_flag = false, +};Quoted 112 lines
Quoted 90 lines
Quoted 90 lines
?#include "
omap_hwmod_common_data.h"arch/arm/mach-omap2/omap_hwmod_2420_data.c +4
-0@@ -38,6 +39,10 @@ static struct omap_hwmod omap2420_iva_hwmod; ?static struct omap_hwmod omap2420_l3_main_hwmod; ?static struct omap_hwmod omap2420_l4_core_hwmod; ?static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_gpio1_hwmod; +static struct omap_hwmod omap2420_gpio2_hwmod; +static struct omap_hwmod omap2420_gpio3_hwmod; +static struct omap_hwmod omap2420_gpio4_hwmod;?/* L3 -> ? ?L4_CORE interface */
?static structomap_hwmod_ocp_ifomap2420_l3_main__l4_core= {arch/arm/mach-omap2/omap_hwmod_2420_data.c +70
-0@@ -557,6 +562,224 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { ? ? ? ?.flags ? ? ? ? ?= HWMOD_16BIT_REG, ?}; +/* l4_wkup -> ? ?gpio1 */ +static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x48018000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x480181ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio1_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio1_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio1_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ? ?gpio2 */ +static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801a000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801a1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio2_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio2_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio2_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ? ?gpio3 */ +static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801c000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801c1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio3_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio3_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio3_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* l4_wkup -> ? ?gpio4 */ +static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { + ? ? ? { + ? ? ? ? ? ? ? .pa_start ? ? ? = 0x4801e000, + ? ? ? ? ? ? ? .pa_end ? ? ? ? = 0x4801e1ff, + ? ? ? ? ? ? ? .flags ? ? ? ? ?= ADDR_TYPE_RT + ? ? ? }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { + ? ? ? .master ? ? ? ? =&omap2420_l4_wkup_hwmod, + ? ? ? .slave ? ? ? ? ?=&omap2420_gpio4_hwmod, + ? ? ? .clk ? ? ? ? ? ?= "gpios_ick", + ? ? ? .addr ? ? ? ? ? = omap2420_gpio4_addr_space, + ? ? ? .addr_cnt ? ? ? = ARRAY_SIZE(omap2420_gpio4_addr_space), + ? ? ? .user ? ? ? ? ? = OCP_USER_MPU | OCP_USER_SDMA,Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c static struct omap_hwmod omap2420_i2c2_hwmod = { · line 642
Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +8
-0+}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + ? ? ? .bank_width = 32, + ? ? ? .dbck_flag = false, +}; +<<snip>>
Quoted 10 lines
arch/arm/plat-omap/include/plat/gpio.h
Quoted 4 lines
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0?};arch/arm/plat-omap/include/plat/gpio.h +0
-0That change should not necessarily be there, it is not directly related to
the subject.Maybe that should be in an extra patch just before that one.
Quoted 8 lines
Quoted 6 lines
I merged these two patches because of a comment to introduce new variables/structures only in the patch where they are used. Since "
omap_gpio_dev_attr" is being used by hwmod DB I merged these two patches. Do you think that hwmod DB patches should not be merged with other patches?Not necessarily, maybe you can just update the changelog and the subject to indicate that you add a new structure as well in this patch.
Okay. I will do that.
Quoted 32 lines
Quoted 30 lines
Quoted 4 lines
Beside these 2 minor comments, that patch seems good to me.
Almost-acked-by Benoit Cousson<[email protected]>Thanks.
Quoted 23 lines
Regards,
BenoitQuoted 17 lines
index 5bef86d..24892a6 100644
arch/arm/plat-omap/include/plat/gpio.h +0
-0@@ -79,6 +79,11 @@?#define
METHOD_GPIO_24XX? ? ?5
?#defineMETHOD_GPIO_44XX? ? ?6+struct
omap_gpio_dev_attr{
+ ? ? ? intbank_width; ? ? ? ? /* GPIO bank width */
+ ? ? ? booldbck_flag; ? ? ? ? /* dbck required or not - True for OMAP3&4
*/arch/arm/plat-omap/include/plat/gpio.h +2
-0+}; +?struct
omap_gpio_platform_data{
? ? ? ?u16virtual_irq_start;
? ? ? ?intbank_type;
PATCH v7 5/11 OMAP2420: hwmod data: Add GPIO
Quoted 32 lines · Charulatha
Quoted 31 lines · Benoit
Quoted 30 lines · Charulatha
Benoit,
Quoted 25 lines · On Thu, Nov 25, 2010 at 03:43, Cousson, Benoit<[email protected]> ?wrote:
Quoted 16 lines · Charulatha
Add GPIO hwmod data for OMAP2420
Signed-off-by Charulatha V<[email protected]>---
?arch/arm/mach-omap2/omap_hwmod_2420_data.c | ?229
++++++++++++++++++++++++++++
?arch/arm/plat-omap/include/plat/gpio.h ? ? | ? ?5 + ?2 files changed, 234 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_2420_data.c +0
-0@@ -17,6 +17,7 @@Quoted 5 lines
?#include<plat/dma.h>
?#include<plat/serial.h>
?#include<plat/i2c.h>
+#include<plat/gpio.h>
?#include<plat/omap24xx.h>Do you still need that header file?
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Yes, for the
gpio_dev_attrI'm still confused,
gpio_dev_attrjust contains an int and a bool:I am talking about
gpio.hfile which is required for usingomap_gpio_dev_attr. If you are pointing outomap24xx.hfile, I am not sure. It was in the original code.
Okay. I checked. omap24xx.h file is no more required here and I am deleting this header include from this file. Same for OMAP2430 and OMAP3xxx hwmod database files too.
-V Charulatha
PATCH v7 6/11 OMAP2430: hwmod data: Add GPIO
In reply to Varadarajan, CharulathaAdd GPIO hwmod data for OMAP2430
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 279 ++++++++++++++++++++++++++++ 1 files changed, 279 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2430_data.c +279 -0
@@ -17,6 +17,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap24xx.h> #include "omap_hwmod_common_data.h"
@@ -38,6 +39,11 @@ static struct omap_hwmod omap2430_iva_hwmod;static struct omap_hwmod omap2430_l3_main_hwmod;static struct omap_hwmod omap2430_l4_core_hwmod;static struct omap_hwmod omap2430_wd_timer2_hwmod; +static struct omap_hwmod omap2430_gpio1_hwmod; +static struct omap_hwmod omap2430_gpio2_hwmod; +static struct omap_hwmod omap2430_gpio3_hwmod; +static struct omap_hwmod omap2430_gpio4_hwmod; +static struct omap_hwmod omap2430_gpio5_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
@@ -569,6 +575,272 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = { + { + .pa_start =0x4900C000 , + .pa_end =0x4900C1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = { + .master = &omap2430_l4_wkup_hwmod, + .slave = &omap2430_gpio1_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio1_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio1_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio2 */ +static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = { + { + .pa_start =0x4900E000 , + .pa_end =0x4900E1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = { + .master = &omap2430_l4_wkup_hwmod, + .slave = &omap2430_gpio2_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio2_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio2_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio3 */ +static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = { + { + .pa_start =0x49010000 , + .pa_end =0x490101ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = { + .master = &omap2430_l4_wkup_hwmod, + .slave = &omap2430_gpio3_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio3_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio3_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio4 */ +static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = { + { + .pa_start =0x49012000 , + .pa_end =0x490121ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = { + .master = &omap2430_l4_wkup_hwmod, + .slave = &omap2430_gpio4_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio4_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio4_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_core -> gpio5 */ +static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = { + { + .pa_start =0x480B6000 , + .pa_end =0x480B61ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = { + .master = &omap2430_l4_core_hwmod, + .slave = &omap2430_gpio5_hwmod, + .clk ="gpio5_ick" , + .addr = omap2430_gpio5_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio5_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = false, +}; + +static struct omap_hwmod_class_sysconfig omap243x_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +/* +* 'gpio' class +* general purpose io module +*/ +static struct omap_hwmod_class omap243x_gpio_hwmod_class = { + .name ="gpio" , + .sysc = &omap243x_gpio_sysc, + .rev =0 , +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap243x_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_24XX_GPIO_BANK1 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = { + &omap2430_l4_wkup__gpio1, +}; + +static struct omap_hwmod omap2430_gpio1_hwmod = { + .name ="gpio1" , + .mpu_irqs = omap243x_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio1_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_EN_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio1_slaves), + .class = &omap243x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio2 */ +static struct omap_hwmod_irq_info omap243x_gpio2_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =30 },/* INT_24XX_GPIO_BANK2 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = { + &omap2430_l4_wkup__gpio2, +}; + +static struct omap_hwmod omap2430_gpio2_hwmod = { + .name ="gpio2" , + .mpu_irqs = omap243x_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio2_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio2_slaves), + .class = &omap243x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio3 */ +static struct omap_hwmod_irq_info omap243x_gpio3_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =31 },/* INT_24XX_GPIO_BANK3 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = { + &omap2430_l4_wkup__gpio3, +}; + +static struct omap_hwmod omap2430_gpio3_hwmod = { + .name ="gpio3" , + .mpu_irqs = omap243x_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio3_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio3_slaves), + .class = &omap243x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio4 */ +static struct omap_hwmod_irq_info omap243x_gpio4_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =32 },/* INT_24XX_GPIO_BANK4 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = { + &omap2430_l4_wkup__gpio4, +}; + +static struct omap_hwmod omap2430_gpio4_hwmod = { + .name ="gpio4" , + .mpu_irqs = omap243x_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio4_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio4_slaves), + .class = &omap243x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio5 */ +static struct omap_hwmod_irq_info omap243x_gpio5_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =33 },/* INT_24XX_GPIO_BANK5 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio5_slaves[] = { + &omap2430_l4_core__gpio5, +}; + +static struct omap_hwmod omap2430_gpio5_hwmod = { + .name ="gpio5" , + .mpu_irqs = omap243x_gpio5_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio5_irqs), + .main_clk ="gpio5_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =2 , + .module_bit =OMAP2430_EN_GPIO5_SHIFT , + .module_offs =CORE_MOD , + .idlest_reg_id =2 , + .idlest_idle_bit =OMAP2430_ST_GPIO5_SHIFT , + }, + }, + .slaves = omap2430_gpio5_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio5_slaves), + .class = &omap243x_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; +static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_l3_main_hwmod, &omap2430_l4_core_hwmod,
@@ -581,6 +853,13 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_uart3_hwmod, &omap2430_i2c1_hwmod, &omap2430_i2c2_hwmod, + +/* gpio class */ + &omap2430_gpio1_hwmod, + &omap2430_gpio2_hwmod, + &omap2430_gpio3_hwmod, + &omap2430_gpio4_hwmod, + &omap2430_gpio5_hwmod, NULL, };
Signature · 1 line
1.7.0.4
PATCH v7 6/11 OMAP2430: hwmod data: Add GPIO
Quoted 3 lines · Charulatha
Add GPIO hwmod data for OMAP2430
Signed-off-by Charulatha V<[email protected]>
Quoted 9 lines
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 279 ++++++++++++++++++++++++++++ 1 files changed, 279 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_2430_data.c +0
-0
arch/arm/mach-omap2/omap_hwmod_2430_data.c line 21
Quoted 5 lines
arch/arm/mach-omap2/omap_hwmod_2430_data.c +1
-0@@ -17,6 +17,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap24xx.h>
Just check if that include is still needed.
Benoit
Quoted 301 lines
arch/arm/mach-omap2/omap_hwmod_2430_data.c +278
-0#include "omap_hwmod_common_data.h" @@ -38,6 +39,11 @@ static struct omap_hwmod omap2430_iva_hwmod;static struct omap_hwmod omap2430_l3_main_hwmod;static struct omap_hwmod omap2430_l4_core_hwmod;static struct omap_hwmod omap2430_wd_timer2_hwmod; +static struct omap_hwmod omap2430_gpio1_hwmod; +static struct omap_hwmod omap2430_gpio2_hwmod; +static struct omap_hwmod omap2430_gpio3_hwmod; +static struct omap_hwmod omap2430_gpio4_hwmod; +static struct omap_hwmod omap2430_gpio5_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {@@ -569,6 +575,272 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = { + { + .pa_start =0x4900C000 , + .pa_end =0x4900C1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = { + .master =&omap2430_l4_wkup_hwmod, + .slave =&omap2430_gpio1_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio1_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio1_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio2 */ +static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = { + { + .pa_start =0x4900E000 , + .pa_end =0x4900E1ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = { + .master =&omap2430_l4_wkup_hwmod, + .slave =&omap2430_gpio2_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio2_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio2_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio3 */ +static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = { + { + .pa_start =0x49010000 , + .pa_end =0x490101ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = { + .master =&omap2430_l4_wkup_hwmod, + .slave =&omap2430_gpio3_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio3_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio3_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_wkup -> gpio4 */ +static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = { + { + .pa_start =0x49012000 , + .pa_end =0x490121ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = { + .master =&omap2430_l4_wkup_hwmod, + .slave =&omap2430_gpio4_hwmod, + .clk ="gpios_ick" , + .addr = omap2430_gpio4_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio4_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_core -> gpio5 */ +static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = { + { + .pa_start =0x480B6000 , + .pa_end =0x480B61ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = { + .master =&omap2430_l4_core_hwmod, + .slave =&omap2430_gpio5_hwmod, + .clk ="gpio5_ick" , + .addr = omap2430_gpio5_addr_space, + .addr_cnt =ARRAY_SIZE (omap2430_gpio5_addr_space), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = false, +}; + +static struct omap_hwmod_class_sysconfig omap243x_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields =&omap_hwmod_sysc_type1, +}; + +/* +* 'gpio' class +* general purpose io module +*/ +static struct omap_hwmod_class omap243x_gpio_hwmod_class = { + .name ="gpio" , + .sysc =&omap243x_gpio_sysc, + .rev =0 , +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap243x_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_24XX_GPIO_BANK1 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = { + &omap2430_l4_wkup__gpio1, +}; + +static struct omap_hwmod omap2430_gpio1_hwmod = { + .name ="gpio1" , + .mpu_irqs = omap243x_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio1_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_EN_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio1_slaves), + .class =&omap243x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio2 */ +static struct omap_hwmod_irq_info omap243x_gpio2_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =30 },/* INT_24XX_GPIO_BANK2 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = { + &omap2430_l4_wkup__gpio2, +}; + +static struct omap_hwmod omap2430_gpio2_hwmod = { + .name ="gpio2" , + .mpu_irqs = omap243x_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio2_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio2_slaves), + .class =&omap243x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio3 */ +static struct omap_hwmod_irq_info omap243x_gpio3_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =31 },/* INT_24XX_GPIO_BANK3 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = { + &omap2430_l4_wkup__gpio3, +}; + +static struct omap_hwmod omap2430_gpio3_hwmod = { + .name ="gpio3" , + .mpu_irqs = omap243x_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio3_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio3_slaves), + .class =&omap243x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio4 */ +static struct omap_hwmod_irq_info omap243x_gpio4_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =32 },/* INT_24XX_GPIO_BANK4 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = { + &omap2430_l4_wkup__gpio4, +}; + +static struct omap_hwmod omap2430_gpio4_hwmod = { + .name ="gpio4" , + .mpu_irqs = omap243x_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio4_irqs), + .main_clk ="gpios_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_GPIOS_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_ST_GPIOS_SHIFT , + }, + }, + .slaves = omap2430_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio4_slaves), + .class =&omap243x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; + +/* gpio5 */ +static struct omap_hwmod_irq_info omap243x_gpio5_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =33 },/* INT_24XX_GPIO_BANK5 */ +}; + +static struct omap_hwmod_ocp_if *omap2430_gpio5_slaves[] = { + &omap2430_l4_core__gpio5, +}; + +static struct omap_hwmod omap2430_gpio5_hwmod = { + .name ="gpio5" , + .mpu_irqs = omap243x_gpio5_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap243x_gpio5_irqs), + .main_clk ="gpio5_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =2 , + .module_bit =OMAP2430_EN_GPIO5_SHIFT , + .module_offs =CORE_MOD , + .idlest_reg_id =2 , + .idlest_idle_bit =OMAP2430_ST_GPIO5_SHIFT , + }, + }, + .slaves = omap2430_gpio5_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_gpio5_slaves), + .class =&omap243x_gpio_hwmod_class, + .dev_attr =&gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; +static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_l3_main_hwmod, &omap2430_l4_core_hwmod,@@ -581,6 +853,13 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_uart3_hwmod, &omap2430_i2c1_hwmod, &omap2430_i2c2_hwmod, + +/* gpio class */ + &omap2430_gpio1_hwmod, + &omap2430_gpio2_hwmod, + &omap2430_gpio3_hwmod, + &omap2430_gpio4_hwmod, + &omap2430_gpio5_hwmod, NULL, };
PATCH v7 7/11 OMAP3: hwmod data: Add GPIO
In reply to Varadarajan, CharulathaAdd GPIO hwmod data for OMAP3
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 360 ++++++++++++++++++++++++++++ 1 files changed, 360 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +360 -0
@@ -20,6 +20,7 @@#include <plat/serial.h> #include <plat/l4_3xxx.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap34xx.h> #include "omap_hwmod_common_data.h"
@@ -45,6 +46,12 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod;static struct omap_hwmod omap3xxx_i2c1_hwmod;static struct omap_hwmod omap3xxx_i2c2_hwmod;static struct omap_hwmod omap3xxx_i2c3_hwmod; +static struct omap_hwmod omap3xxx_gpio1_hwmod; +static struct omap_hwmod omap3xxx_gpio2_hwmod; +static struct omap_hwmod omap3xxx_gpio3_hwmod; +static struct omap_hwmod omap3xxx_gpio4_hwmod; +static struct omap_hwmod omap3xxx_gpio5_hwmod; +static struct omap_hwmod omap3xxx_gpio6_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
@@ -739,6 +746,351 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap3xxx_gpio1_addrs[] = { + { + .pa_start =0x48310000 , + .pa_end =0x483101ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = { + .master = &omap3xxx_l4_wkup_hwmod, + .slave = &omap3xxx_gpio1_hwmod, + .addr = omap3xxx_gpio1_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio1_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio2 */ +static struct omap_hwmod_addr_space omap3xxx_gpio2_addrs[] = { + { + .pa_start =0x49050000 , + .pa_end =0x490501ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = { + .master = &omap3xxx_l4_per_hwmod, + .slave = &omap3xxx_gpio2_hwmod, + .addr = omap3xxx_gpio2_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio3 */ +static struct omap_hwmod_addr_space omap3xxx_gpio3_addrs[] = { + { + .pa_start =0x49052000 , + .pa_end =0x490521ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = { + .master = &omap3xxx_l4_per_hwmod, + .slave = &omap3xxx_gpio3_hwmod, + .addr = omap3xxx_gpio3_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio3_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio4 */ +static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = { + { + .pa_start =0x49054000 , + .pa_end =0x490541ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = { + .master = &omap3xxx_l4_per_hwmod, + .slave = &omap3xxx_gpio4_hwmod, + .addr = omap3xxx_gpio4_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio4_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio5 */ +static struct omap_hwmod_addr_space omap3xxx_gpio5_addrs[] = { + { + .pa_start =0x49056000 , + .pa_end =0x490561ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = { + .master = &omap3xxx_l4_per_hwmod, + .slave = &omap3xxx_gpio5_hwmod, + .addr = omap3xxx_gpio5_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio5_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio6 */ +static struct omap_hwmod_addr_space omap3xxx_gpio6_addrs[] = { + { + .pa_start =0x49058000 , + .pa_end =0x490581ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = { + .master = &omap3xxx_l4_per_hwmod, + .slave = &omap3xxx_gpio6_hwmod, + .addr = omap3xxx_gpio6_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio6_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* +* 'gpio' class +* general purpose io module +*/ + +static struct omap_hwmod_class_sysconfig omap3xxx_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap3xxx_gpio_hwmod_class = { + .name ="gpio" , + .sysc = &omap3xxx_gpio_sysc, + .rev =1 , +}; + +/* gpio_dev_attr*/ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = true, +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap3xxx_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_34XX_GPIO_BANK1 */ +}; + +static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio1_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio1_slaves[] = { + &omap3xxx_l4_wkup__gpio1, +}; + +static struct omap_hwmod omap3xxx_gpio1_hwmod = { + .name ="gpio1" , + .mpu_irqs = omap3xxx_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio1_irqs), + .main_clk ="gpio1_ick" , + .opt_clks = gpio1_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio1_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO1_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO1_SHIFT , + }, + }, + .slaves = omap3xxx_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio1_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; + +/* gpio2 */ +static struct omap_hwmod_irq_info omap3xxx_gpio2_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =30 },/* INT_34XX_GPIO_BANK2 */ +}; + +static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio2_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio2_slaves[] = { + &omap3xxx_l4_per__gpio2, +}; + +static struct omap_hwmod omap3xxx_gpio2_hwmod = { + .name ="gpio2" , + .mpu_irqs = omap3xxx_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio2_irqs), + .main_clk ="gpio2_ick" , + .opt_clks = gpio2_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio2_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO2_SHIFT , + .module_offs =OMAP3430_PER_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO2_SHIFT , + }, + }, + .slaves = omap3xxx_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio2_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; + +/* gpio3 */ +static struct omap_hwmod_irq_info omap3xxx_gpio3_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =31 },/* INT_34XX_GPIO_BANK3 */ +}; + +static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio3_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio3_slaves[] = { + &omap3xxx_l4_per__gpio3, +}; + +static struct omap_hwmod omap3xxx_gpio3_hwmod = { + .name ="gpio3" , + .mpu_irqs = omap3xxx_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio3_irqs), + .main_clk ="gpio3_ick" , + .opt_clks = gpio3_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio3_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO3_SHIFT , + .module_offs =OMAP3430_PER_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO3_SHIFT , + }, + }, + .slaves = omap3xxx_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio3_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; + +/* gpio4 */ +static struct omap_hwmod_irq_info omap3xxx_gpio4_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =32 },/* INT_34XX_GPIO_BANK4 */ +}; + +static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio4_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio4_slaves[] = { + &omap3xxx_l4_per__gpio4, +}; + +static struct omap_hwmod omap3xxx_gpio4_hwmod = { + .name ="gpio4" , + .mpu_irqs = omap3xxx_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio4_irqs), + .main_clk ="gpio4_ick" , + .opt_clks = gpio4_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio4_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO4_SHIFT , + .module_offs =OMAP3430_PER_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO4_SHIFT , + }, + }, + .slaves = omap3xxx_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio4_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; + +/* gpio5 */ +static struct omap_hwmod_irq_info omap3xxx_gpio5_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =33 },/* INT_34XX_GPIO_BANK5 */ +}; + +static struct omap_hwmod_opt_clk gpio5_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio5_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio5_slaves[] = { + &omap3xxx_l4_per__gpio5, +}; + +static struct omap_hwmod omap3xxx_gpio5_hwmod = { + .name ="gpio5" , + .mpu_irqs = omap3xxx_gpio5_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio5_irqs), + .main_clk ="gpio5_ick" , + .opt_clks = gpio5_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio5_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO5_SHIFT , + .module_offs =OMAP3430_PER_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO5_SHIFT , + }, + }, + .slaves = omap3xxx_gpio5_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio5_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; + +/* gpio6 */ +static struct omap_hwmod_irq_info omap3xxx_gpio6_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =34 },/* INT_34XX_GPIO_BANK6 */ +}; + +static struct omap_hwmod_opt_clk gpio6_opt_clks[] = { + { .role ="dbclk" , .clk ="gpio6_dbck" , }, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_gpio6_slaves[] = { + &omap3xxx_l4_per__gpio6, +}; + +static struct omap_hwmod omap3xxx_gpio6_hwmod = { + .name ="gpio6" , + .mpu_irqs = omap3xxx_gpio6_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_gpio6_irqs), + .main_clk ="gpio6_ick" , + .opt_clks = gpio6_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio6_opt_clks), + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_GPIO6_SHIFT , + .module_offs =OMAP3430_PER_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_GPIO6_SHIFT , + }, + }, + .slaves = omap3xxx_gpio6_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_gpio6_slaves), + .class = &omap3xxx_gpio_hwmod_class, + .dev_attr = &gpio_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; +static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l3_main_hwmod, &omap3xxx_l4_core_hwmod,
@@ -754,6 +1106,14 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_i2c1_hwmod, &omap3xxx_i2c2_hwmod, &omap3xxx_i2c3_hwmod, + +/* gpio class */ + &omap3xxx_gpio1_hwmod, + &omap3xxx_gpio2_hwmod, + &omap3xxx_gpio3_hwmod, + &omap3xxx_gpio4_hwmod, + &omap3xxx_gpio5_hwmod, + &omap3xxx_gpio6_hwmod, NULL, };
Signature · 1 line
1.7.0.4
PATCH v7 7/11 OMAP3: hwmod data: Add GPIO
Quoted 4 lines · Charulatha
Add GPIO hwmod data for OMAP3
Signed-off-by Charulatha V<[email protected]>Signed-off-by Rajendra Nayak<[email protected]>
Quoted 155 lines
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 360 ++++++++++++++++++++++++++++ 1 files changed, 360 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +129
-0@@ -20,6 +20,7 @@#include <plat/serial.h> #include <plat/l4_3xxx.h> #include <plat/i2c.h> +#include <plat/gpio.h> #include <plat/omap34xx.h> #include "omap_hwmod_common_data.h" @@ -45,6 +46,12 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod;static struct omap_hwmod omap3xxx_i2c1_hwmod;static struct omap_hwmod omap3xxx_i2c2_hwmod;static struct omap_hwmod omap3xxx_i2c3_hwmod; +static struct omap_hwmod omap3xxx_gpio1_hwmod; +static struct omap_hwmod omap3xxx_gpio2_hwmod; +static struct omap_hwmod omap3xxx_gpio3_hwmod; +static struct omap_hwmod omap3xxx_gpio4_hwmod; +static struct omap_hwmod omap3xxx_gpio5_hwmod; +static struct omap_hwmod omap3xxx_gpio6_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {@@ -739,6 +746,351 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), }; +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_addr_space omap3xxx_gpio1_addrs[] = { + { + .pa_start =0x48310000 , + .pa_end =0x483101ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = { + .master =&omap3xxx_l4_wkup_hwmod, + .slave =&omap3xxx_gpio1_hwmod, + .addr = omap3xxx_gpio1_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio1_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio2 */ +static struct omap_hwmod_addr_space omap3xxx_gpio2_addrs[] = { + { + .pa_start =0x49050000 , + .pa_end =0x490501ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = { + .master =&omap3xxx_l4_per_hwmod, + .slave =&omap3xxx_gpio2_hwmod, + .addr = omap3xxx_gpio2_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio3 */ +static struct omap_hwmod_addr_space omap3xxx_gpio3_addrs[] = { + { + .pa_start =0x49052000 , + .pa_end =0x490521ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = { + .master =&omap3xxx_l4_per_hwmod, + .slave =&omap3xxx_gpio3_hwmod, + .addr = omap3xxx_gpio3_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio3_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio4 */ +static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = { + { + .pa_start =0x49054000 , + .pa_end =0x490541ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = { + .master =&omap3xxx_l4_per_hwmod, + .slave =&omap3xxx_gpio4_hwmod, + .addr = omap3xxx_gpio4_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio4_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio5 */ +static struct omap_hwmod_addr_space omap3xxx_gpio5_addrs[] = { + { + .pa_start =0x49056000 , + .pa_end =0x490561ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = { + .master =&omap3xxx_l4_per_hwmod, + .slave =&omap3xxx_gpio5_hwmod, + .addr = omap3xxx_gpio5_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio5_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* l4_per -> gpio6 */ +static struct omap_hwmod_addr_space omap3xxx_gpio6_addrs[] = { + { + .pa_start =0x49058000 , + .pa_end =0x490581ff , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = { + .master =&omap3xxx_l4_per_hwmod, + .slave =&omap3xxx_gpio6_hwmod, + .addr = omap3xxx_gpio6_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_gpio6_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* +* 'gpio' class +* general purpose io module +*/ + +static struct omap_hwmod_class_sysconfig omap3xxx_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields =&omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap3xxx_gpio_hwmod_class = { + .name ="gpio" , + .sysc =&omap3xxx_gpio_sysc, + .rev =1 , +};
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c static struct omap_hwmod omap3xxx_i2c3_hwmod = { · line 880
Quoted 10 lines
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +10
-0+ +/* gpio_dev_attr*/ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = true, +}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap3xxx_gpio1_irqs[] = { + { .name ="gpio_mpu_irq" , .irq =29 },/* INT_34XX_GPIO_BANK1 */
In this case the name is not necessarily needed since there is only one irq line. You can save some memory by just adding the .irq field.
Benoit
PATCH v7 7/11 OMAP3: hwmod data: Add GPIO
Benoit,
Quoted 8 lines · Benoit
Quoted 5 lines · Charulatha
Add GPIO hwmod data for OMAP3
Signed-off-by Charulatha V<[email protected]>Signed-off-by Rajendra Nayak<[email protected]>Acked-by Benoit Cousson <[email protected]>
Thanks.
Quoted 18 lines
Quoted 18 lines
---
?arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | ?360
++++++++++++++++++++++++++++
?1 files changed, 360 insertions(+), 0 deletions(-)arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0
-0@@ -20,6 +20,7 @@?#include<plat/serial.h>
?#include<plat/l4_3xxx.h>
?#include<plat/i2c.h>
+#include<plat/gpio.h>
?#include<plat/omap34xx.h>
Quoted 4 lines
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c static struct omap_hwmod omap3xxx_wd_timer2_hwmod; · line 47
Quoted 4 lines
?#include "
omap_hwmod_common_data.h"arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0
-0@@ -45,6 +46,12 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod; ?static struct omap_hwmod omap3xxx_i2c1_hwmod; ?static struct omap_hwmod omap3xxx_i2c2_hwmod;
<<snip>>
Quoted 9 lines
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c static struct omap_hwmod omap3xxx_i2c3_hwmod = {
Quoted 5 lines
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +5
-0+}; + +/* gpio1 */ +static struct omap_hwmod_irq_info omap3xxx_gpio1_irqs[] = { + ? ? ? { .name = "gpio_mpu_irq", .irq = 29 }, /* INT_34XX_GPIO_BANK1 */In this case the name is not necessarily needed since there is only one irq line.
You can save some memory by just adding the .irq field.
Yes, I too thought about it. But to be consistent with other devices, I included it here
as I did not receive any comments before on this. Anyways, will remove them while
re-sending patches as per Kevin's suggestions to rebase them on pm-core branch.
Quoted 3 lines
Benoit
PATCH v7 8/11 OMAP4: hwmod data: Add GPIO
In reply to Varadarajan, CharulathaFrom: Benoit Cousson <[email protected]>
Add GPIO hwmod data for OMAP4
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 341 ++++++++++++++++++++++++++++ 1 files changed, 341 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +341 -0
@@ -22,6 +22,7 @@#include <plat/omap_hwmod.h> #include <plat/cpu.h> +#include <plat/gpio.h> #include "omap_hwmod_common_data.h"
@@ -1043,6 +1044,338 @@ static struct omap_hwmod omap44xx_uart4_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), }; +/* +* 'gpio' class +* general purpose io module +*/ + +static struct omap_hwmod_class_sysconfig omap44xx_gpio_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0114 , + .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap44xx_gpio_hwmod_class = { + .name ="gpio" , + .sysc = &omap44xx_gpio_sysc, + .rev =2 , +}; + +/* gpio dev_attr */ +static struct omap_gpio_dev_attr gpio_dev_attr = { + .bank_width =32 , + .dbck_flag = true, +}; + +/* gpio1 */ +static struct omap_hwmod omap44xx_gpio1_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio1_irqs[] = { + { .irq =29 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio1_addrs[] = { + { + .pa_start =0x4a310000 , + .pa_end =0x4a3101ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_wkup -> gpio1 */ +static struct omap_hwmod_ocp_if omap44xx_l4_wkup__gpio1 = { + .master = &omap44xx_l4_wkup_hwmod, + .slave = &omap44xx_gpio1_hwmod, + .addr = omap44xx_gpio1_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio1_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio1 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio1_slaves[] = { + &omap44xx_l4_wkup__gpio1, +}; + +static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio1_hwmod = { + .name ="gpio1" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio1_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio1_irqs), + .main_clk ="gpio1_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_WKUP_GPIO1_CLKCTRL , + }, + }, + .opt_clks = gpio1_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio1_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio1_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio1_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +}; + +/* gpio2 */ +static struct omap_hwmod omap44xx_gpio2_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio2_irqs[] = { + { .irq =30 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio2_addrs[] = { + { + .pa_start =0x48055000 , + .pa_end =0x480551ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_per -> gpio2 */ +static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio2 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_gpio2_hwmod, + .addr = omap44xx_gpio2_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio2 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio2_slaves[] = { + &omap44xx_l4_per__gpio2, +}; + +static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio2_hwmod = { + .name ="gpio2" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio2_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio2_irqs), + .main_clk ="gpio2_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_L4PER_GPIO2_CLKCTRL , + }, + }, + .opt_clks = gpio2_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio2_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio2_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio2_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +}; + +/* gpio3 */ +static struct omap_hwmod omap44xx_gpio3_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio3_irqs[] = { + { .irq =31 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio3_addrs[] = { + { + .pa_start =0x48057000 , + .pa_end =0x480571ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_per -> gpio3 */ +static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio3 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_gpio3_hwmod, + .addr = omap44xx_gpio3_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio3_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio3 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio3_slaves[] = { + &omap44xx_l4_per__gpio3, +}; + +static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio3_hwmod = { + .name ="gpio3" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio3_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio3_irqs), + .main_clk ="gpio3_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_L4PER_GPIO3_CLKCTRL , + }, + }, + .opt_clks = gpio3_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio3_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio3_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio3_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +}; + +/* gpio4 */ +static struct omap_hwmod omap44xx_gpio4_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio4_irqs[] = { + { .irq =32 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio4_addrs[] = { + { + .pa_start =0x48059000 , + .pa_end =0x480591ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_per -> gpio4 */ +static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio4 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_gpio4_hwmod, + .addr = omap44xx_gpio4_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio4_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio4 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio4_slaves[] = { + &omap44xx_l4_per__gpio4, +}; + +static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio4_hwmod = { + .name ="gpio4" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio4_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio4_irqs), + .main_clk ="gpio4_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_L4PER_GPIO4_CLKCTRL , + }, + }, + .opt_clks = gpio4_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio4_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio4_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio4_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +}; + +/* gpio5 */ +static struct omap_hwmod omap44xx_gpio5_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio5_irqs[] = { + { .irq =33 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio5_addrs[] = { + { + .pa_start =0x4805b000 , + .pa_end =0x4805b1ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_per -> gpio5 */ +static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio5 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_gpio5_hwmod, + .addr = omap44xx_gpio5_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio5_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio5 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio5_slaves[] = { + &omap44xx_l4_per__gpio5, +}; + +static struct omap_hwmod_opt_clk gpio5_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio5_hwmod = { + .name ="gpio5" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio5_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio5_irqs), + .main_clk ="gpio5_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_L4PER_GPIO5_CLKCTRL , + }, + }, + .opt_clks = gpio5_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio5_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio5_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio5_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +}; + +/* gpio6 */ +static struct omap_hwmod omap44xx_gpio6_hwmod; +static struct omap_hwmod_irq_info omap44xx_gpio6_irqs[] = { + { .irq =34 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_gpio6_addrs[] = { + { + .pa_start =0x4805d000 , + .pa_end =0x4805d1ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* l4_per -> gpio6 */ +static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio6 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_gpio6_hwmod, + .addr = omap44xx_gpio6_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_gpio6_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* gpio6 slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_gpio6_slaves[] = { + &omap44xx_l4_per__gpio6, +}; + +static struct omap_hwmod_opt_clk gpio6_opt_clks[] = { + { .role ="dbclk" , .clk ="sys_32k_ck" }, +}; + +static struct omap_hwmod omap44xx_gpio6_hwmod = { + .name ="gpio6" , + .class = &omap44xx_gpio_hwmod_class, + .mpu_irqs = omap44xx_gpio6_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_gpio6_irqs), + .main_clk ="gpio6_ick" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_L4PER_GPIO6_CLKCTRL , + }, + }, + .opt_clks = gpio6_opt_clks, + .opt_clks_cnt =ARRAY_SIZE (gpio6_opt_clks), + .dev_attr = &gpio_dev_attr, + .slaves = omap44xx_gpio6_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_gpio6_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), +};static __initdata struct omap_hwmod *omap44xx_hwmods[] = {/* dmm class */ &omap44xx_dmm_hwmod,
@@ -1066,6 +1399,14 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {/* mpu_bus class */ &omap44xx_mpu_private_hwmod, +/* gpio class */ + &omap44xx_gpio1_hwmod, + &omap44xx_gpio2_hwmod, + &omap44xx_gpio3_hwmod, + &omap44xx_gpio4_hwmod, + &omap44xx_gpio5_hwmod, + &omap44xx_gpio6_hwmod, +/* mpu class */ &omap44xx_mpu_hwmod,/* wd_timer class */
Signature · 1 line
1.7.0.4
PATCH v7 9/11 OMAP2+: GPIO: device registration
In reply to Varadarajan, CharulathaUse omap_device_build() API to do platform_device_register of GPIO devices. For OMAP2+ chips, the device specific data defined in the centralized hwmod database will be used.
gpio_init needs to be done before machine_init functions access gpio APIs. Hence gpio_init is made as a postcore_initcall.
--- arch/arm/mach-omap2/gpio.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/gpio.c
arch/arm/mach-omap2/gpio.c new file +104 -0
@@ -0,0 +1,104 @@ +/* +* OMAP2+ specific gpio initialization +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* +* Author: +* Charulatha V <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/gpio.h> +#include <linux/err.h> +#include <linux/slab.h> +#include <linux/interrupt.h> + +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> + +static struct omap_device_pm_latency omap_gpio_latency[] = { + [0 ] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +static int omap2_gpio_dev_init (struct omap_hwmod *oh,void *unused) +{ +struct omap_device *od; +struct omap_gpio_platform_data *pdata; +struct omap_gpio_dev_attr *dev_attr; +char *name ="omap_gpio" ; +int id; + +/* +* extract the device id from name field available in the +* hwmod database and use the same for constructing ids for +* gpio devices. +* CAUTION: Make sure the name in the hwmod database does +* not change. If changed, make corresponding change here +* or make use of static variable mechanism to handle this. +*/ +sscanf (oh->name,"gpio%d" , &id); + + pdata =kzalloc (sizeof (struct omap_gpio_platform_data ),GFP_KERNEL ); +if (!pdata) { +pr_err ("gpio%d: Memory allocation failed\n" , id); +return -ENOMEM ; + } + + dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr; + pdata->bank_width = dev_attr->bank_width; + pdata->dbck_flag = dev_attr->dbck_flag; + pdata->virtual_irq_start =IH_GPIO_BASE +32 * (id -1 ); + +switch (oh->class->rev) { +case 0 : +case 1 : + pdata->bank_type =METHOD_GPIO_24XX ; +break ; +case 2 : + pdata->bank_type =METHOD_GPIO_44XX ; +break ; +default : +WARN (1 ,"Invalid gpio bank_type\n" ); +kfree (pdata); +return -EINVAL ; + } + + od =omap_device_build (name, id -1 , oh, pdata, +sizeof (*pdata), omap_gpio_latency, +ARRAY_SIZE (omap_gpio_latency), + false); +kfree (pdata); + +if (IS_ERR (od)) { +WARN (1 ,"Cant build omap_device for %s:%s.\n" , + name, oh->name); +return PTR_ERR (od); + } + + gpio_bank_count++; +return 0 ; +} + +/* +* gpio_init needs to be done before +* machine_init functions access gpio APIs. +* Hence gpio_init is a postcore_initcall. +*/ +static int __init omap2_gpio_init (void ) +{ +return omap_hwmod_for_each_by_class ("gpio" , omap2_gpio_dev_init, +NULL ); +} +postcore_initcall (omap2_gpio_init);
Signature · 1 line
1.7.0.4
PATCH v7 9/11 OMAP2+: GPIO: device registration
Quoted 9 lines · Charulatha
Use
omap_device_build()API to doplatform_device_registerof GPIO devices. For OMAP2+ chips, the device specific data defined in the centralized hwmod database will be used.
gpio_initneeds to be done beforemachine_initfunctions access gpio APIs. Hencegpio_initis made as apostcore_initcall.Signed-off-by Charulatha V<[email protected]>Reviewed-by Basak, Partha<[email protected]>
Quoted 115 lines
--- arch/arm/mach-omap2/gpio.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-)create mode 100644
arch/arm/mach-omap2/gpio.carch/arm/mach-omap2/gpio.c new file +104
-0@@ -0,0 +1,104 @@ +/* +* OMAP2+ specific gpio initialization +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* +* Author: +* Charulatha V<[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/gpio.h> +#include <linux/err.h> +#include <linux/slab.h> +#include <linux/interrupt.h> + +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> + +static struct omap_device_pm_latency omap_gpio_latency[] = { + [0 ] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +static int omap2_gpio_dev_init (struct omap_hwmod *oh,void *unused) +{ +struct omap_device *od; +struct omap_gpio_platform_data *pdata; +struct omap_gpio_dev_attr *dev_attr; +char *name ="omap_gpio" ; +int id; + +/* +* extract the device id from name field available in the +* hwmod database and use the same for constructing ids for +* gpio devices. +* CAUTION: Make sure the name in the hwmod database does +* not change. If changed, make corresponding change here +* or make use of static variable mechanism to handle this. +*/ +sscanf (oh->name,"gpio%d" ,&id); + + pdata =kzalloc (sizeof (struct omap_gpio_platform_data ),GFP_KERNEL ); +if (!pdata) { +pr_err ("gpio%d: Memory allocation failed\n" , id); +return -ENOMEM ; + } + + dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr; + pdata->bank_width = dev_attr->bank_width; + pdata->dbck_flag = dev_attr->dbck_flag; + pdata->virtual_irq_start =IH_GPIO_BASE +32 * (id -1 ); + +switch (oh->class->rev) { +case 0 : +case 1 : + pdata->bank_type =METHOD_GPIO_24XX ; +break ; +case 2 : + pdata->bank_type =METHOD_GPIO_44XX ; +break ; +default : +WARN (1 ,"Invalid gpio bank_type\n" ); +kfree (pdata); +return -EINVAL ; + } + + od =omap_device_build (name, id -1 , oh, pdata, +sizeof (*pdata), omap_gpio_latency, +ARRAY_SIZE (omap_gpio_latency), + false); +kfree (pdata); + +if (IS_ERR (od)) { +WARN (1 ,"Cant build omap_device for %s:%s.\n" , + name, oh->name); +return PTR_ERR (od); + } + + gpio_bank_count++; +return 0 ; +} + +/* +* gpio_init needs to be done before +* machine_init functions access gpio APIs. +* Hence gpio_init is a postcore_initcall. +*/ +static int __init omap2_gpio_init (void ) +{ +return omap_hwmod_for_each_by_class ("gpio" , omap2_gpio_dev_init, +NULL ); +} +postcore_initcall (omap2_gpio_init);
PATCH v7 10/11 OMAP: GPIO: Implement GPIO as a platform device
In reply to Varadarajan, CharulathaImplement GPIO as a platform device.
GPIO APIs are used in machine_init functions. Hence it is required to complete GPIO probe before board_init. Therefore GPIO device register and driver register are implemented as postcore_initcalls.
omap_gpio_init() does nothing now and this function would be removed in the next patch as it's usage is spread across most of the board files.
Inorder to convert GPIO as platform device, modifications are required in clockxxxx_data.c file for OMAP1 so that device names can be used to obtain clock instead of getting clocks by name/NULL ptr.
Use runtime pm APIs (pm_runtime_put*/pm_runtime_get*) for enabling or disabling the clocks, modify sysconfig settings and remove usage of clock FW APIs.
Note 1: Converting GPIO driver to use runtime PM APIs is not done as a separate patch because GPIO clock names are different for various OMAPs and are different for some of the banks in the same CPU. This would need usage of cpu_is checks and bank id checks while using clock FW APIs in the gpio driver. Hence while making GPIO a platform driver framework, PM runtime APIs are used directly.
Note 2: While implementing GPIO as a platform device, pm runtime APIs are used as mentioned above and modification is not done in gpio's prepare for idle/ resume after idle functions. This would be done in the next patch series and GPIO driver would be made to use dev_pm_ops instead of sysdev_class in that series only.
Due to the above, the GPIO driver implicitly relies on CM_AUTOIDLE = 1 on its iclk for power management to work, since the driver never disables its iclk.
This would be taken care in the next patch series (see Note 3 below).
Refer to
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg39112.html for more details.
Note 3: only pm_runtime_get_sync is called in gpio's probe() and pm_runtime_put* is never called. This is to make the implementation similar to the existing GPIO code. Another patch series would be sent to correct this.
In OMAP3 and OMAP4 gpio's debounce clocks are optional clocks. They are enabled/ disabled whenever required using clock framework APIs
TODO:
1. Cleanup the GPIO driver. Use function pointers and register offest pointers instead of using hardcoded values
2. Remove all cpu_is_ checks and OMAP specific macros
3. Remove usage of gpio_bank array so that only instance specific information is used in driver code
4. Rename 'method'/ avoid it's usage
5. Fix the non-wakeup gpios handling for OMAP2430, OMAP3 & OMAP4
6. Modify gpio's prepare for idle/ resume after idle functions to use runtime pm implentation.
--- arch/arm/mach-omap1/Makefile | 6 + arch/arm/mach-omap1/clock_data.c | 4 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/plat-omap/gpio.c | 420 ++++++++++---------------------------- 4 files changed, 114 insertions(+), 318 deletions(-)
arch/arm/mach-omap1/Makefile +6 -0
@@ -49,6 +49,12 @@ ifeq ($(CONFIG_ARCH_OMAP15XX),y) obj-$(CONFIG_MACH_OMAP_INNOVATOR) += fpga.o endif +# GPIO +obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o +obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o +obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o +obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o + # LEDs support led-$(CONFIG_MACH_OMAP_H2) += leds-h2p2-debug.o led-$(CONFIG_MACH_OMAP_H3) += leds-h2p2-debug.o
arch/arm/mach-omap1/clock_data.c +2 -2
@@ -143,7 +143,7 @@ static struct arm_idlect1_clk armper_ck = {* activation. [ GPIO code for 1510 ] */ static struct clk arm_gpio_ck = { - .name ="arm_gpio_ck" , + .name ="ick" , .ops = &clkops_generic, .parent = &ck_dpll1, .flags =ENABLE_ON_INIT ,
@@ -684,7 +684,7 @@ static struct omap_clk omap_clks[] = {CLK (NULL ,"ck_sossi" , &sossi_ck,CK_16XX ),CLK (NULL ,"arm_ck" , &arm_ck,CK_16XX |CK_1510 |CK_310 ),CLK (NULL ,"armper_ck" , &armper_ck.clk,CK_16XX |CK_1510 |CK_310 ), -CLK (NULL ,"arm_gpio_ck" , &arm_gpio_ck,CK_1510 |CK_310 ), +CLK ("omap_gpio.0" ,"ick" , &arm_gpio_ck,CK_1510 |CK_310 ),CLK (NULL ,"armxor_ck" , &armxor_ck.clk,CK_16XX |CK_1510 |CK_310 |CK_7XX ),CLK (NULL ,"armtim_ck" , &armtim_ck.clk,CK_16XX |CK_1510 |CK_310 ), CLK("omap_wdt", "fck", &armwdt_ck.clk, CK_16XX | CK_1510 | CK_310),
arch/arm/mach-omap2/Makefile +1 -1
@@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ - common.o + common.o gpio.o omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \
arch/arm/plat-omap/gpio.c +105 -315
597 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH v7 11/11 OMAP: GPIO: Remove omap_gpio_init()
In reply to Varadarajan, CharulathaRemove the usage of omap_gpio_init() from all omap board files since omap_gpio_init() does nothing, after gpio is implemented as a platform device.
--- arch/arm/mach-omap1/board-ams-delta.c | 1 - arch/arm/mach-omap1/board-fsample.c | 1 - arch/arm/mach-omap1/board-h2.c | 1 - arch/arm/mach-omap1/board-h3.c | 1 - arch/arm/mach-omap1/board-htcherald.c | 2 -- arch/arm/mach-omap1/board-innovator.c | 1 - arch/arm/mach-omap1/board-nokia770.c | 1 - arch/arm/mach-omap1/board-osk.c | 1 - arch/arm/mach-omap1/board-palmte.c | 1 - arch/arm/mach-omap1/board-palmz71.c | 1 - arch/arm/mach-omap1/board-perseus2.c | 1 - arch/arm/mach-omap1/board-sx1.c | 1 - arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-3430sdp.c | 1 - arch/arm/mach-omap2/board-3630sdp.c | 1 - arch/arm/mach-omap2/board-4430sdp.c | 1 - arch/arm/mach-omap2/board-am3517crane.c | 2 -- arch/arm/mach-omap2/board-am3517evm.c | 1 - arch/arm/mach-omap2/board-apollon.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 1 - arch/arm/mach-omap2/board-cm-t3517.c | 1 - arch/arm/mach-omap2/board-devkit8000.c | 1 - arch/arm/mach-omap2/board-h4.c | 1 - arch/arm/mach-omap2/board-igep0020.c | 1 - arch/arm/mach-omap2/board-igep0030.c | 1 - arch/arm/mach-omap2/board-ldp.c | 1 - arch/arm/mach-omap2/board-n8x0.c | 1 - arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/board-omap3evm.c | 1 - arch/arm/mach-omap2/board-omap3logic.c | 1 - arch/arm/mach-omap2/board-omap3pandora.c | 1 - arch/arm/mach-omap2/board-omap3stalker.c | 1 - arch/arm/mach-omap2/board-omap3touchbook.c | 1 - arch/arm/mach-omap2/board-omap4panda.c | 1 - arch/arm/mach-omap2/board-overo.c | 1 - arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom.c | 1 - arch/arm/plat-omap/gpio.c | 6 ------ arch/arm/plat-omap/include/plat/gpio.h | 1 - 40 files changed, 0 insertions(+), 47 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +0 -1
@@ -140,7 +140,6 @@ static void __init ams_delta_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init (); }static struct map_desc ams_delta_io_desc[]__initdata = {
arch/arm/mach-omap1/board-fsample.c +0 -1
@@ -325,7 +325,6 @@ static void __init omap_fsample_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();fsample_init_smc91x (); }
arch/arm/mach-omap1/board-h2.c +0 -1
@@ -374,7 +374,6 @@ static void __init h2_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();h2_init_smc91x (); }
arch/arm/mach-omap1/board-h3.c +0 -1
@@ -435,7 +435,6 @@ static void __init h3_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();h3_init_smc91x (); }
arch/arm/mach-omap1/board-htcherald.c +0 -2
@@ -577,8 +577,6 @@ static void __init htcherald_init(void)printk (KERN_INFO "HTC Herald init.\n" );/* Do board initialization before we register all the devices */ -omap_gpio_init (); - omap_board_config = htcherald_config; omap_board_config_size =ARRAY_SIZE (htcherald_config);platform_add_devices (devices,ARRAY_SIZE (devices));
arch/arm/mach-omap1/board-innovator.c +0 -1
@@ -290,7 +290,6 @@ static void __init innovator_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();#ifdef CONFIG_ARCH_OMAP15XX if (cpu_is_omap1510 ()) {omap1510_fpga_init_irq ();
arch/arm/mach-omap1/board-nokia770.c +0 -1
@@ -347,7 +347,6 @@ static void __init omap_nokia770_init(void)platform_add_devices (nokia770_devices,ARRAY_SIZE (nokia770_devices));spi_register_board_info (nokia770_spi_board_info,ARRAY_SIZE (nokia770_spi_board_info)); -omap_gpio_init ();omap_serial_init ();omap_register_i2c_bus (1 ,100 ,NULL ,0 );hwa742_dev_init ();
arch/arm/mach-omap1/board-osk.c +0 -1
@@ -283,7 +283,6 @@ static void __init osk_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();osk_init_smc91x ();osk_init_cf (); }
arch/arm/mach-omap1/board-palmte.c +0 -1
@@ -63,7 +63,6 @@ static void __init omap_palmte_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init (); }static const int palmte_keymap[] = {
arch/arm/mach-omap1/board-palmz71.c +0 -1
@@ -62,7 +62,6 @@ omap_palmz71_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init (); }static int palmz71_keymap[] = {
arch/arm/mach-omap1/board-perseus2.c +0 -1
@@ -293,7 +293,6 @@ static void __init omap_perseus2_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init ();perseus2_init_smc91x (); }/* Only FPGA needs to be mapped here. All others are done with ioremap */
arch/arm/mach-omap1/board-sx1.c +0 -1
@@ -409,7 +409,6 @@ static void __init omap_sx1_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init (); }/*----------------------------------------*/
arch/arm/mach-omap1/board-voiceblue.c +0 -1
@@ -158,7 +158,6 @@ static void __init voiceblue_init_irq(void) {omap1_init_common_hw ();omap_init_irq (); -omap_gpio_init (); }static void __init voiceblue_init (void )
arch/arm/mach-omap2/board-2430sdp.c +0 -1
@@ -145,7 +145,6 @@ static void __init omap_2430sdp_init_irq(void) omap_board_config_size =ARRAY_SIZE (sdp2430_config);omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
arch/arm/mach-omap2/board-3430sdp.c +0 -1
@@ -328,7 +328,6 @@ static void __init omap_3430sdp_init_irq(void)omap3_pm_init_cpuidle (omap3_cpuidle_params_table);omap2_init_common_hw (hyb18m512160af6_sdrc_params,NULL );omap_init_irq (); -omap_gpio_init (); }static int sdp3430_batt_table[] = {
arch/arm/mach-omap2/board-3630sdp.c +0 -1
@@ -76,7 +76,6 @@ static void __init omap_sdp_init_irq(void)omap2_init_common_hw (h8mbx00u0mer0em_sdrc_params, h8mbx00u0mer0em_sdrc_params);omap_init_irq (); -omap_gpio_init (); }#ifdef CONFIG_OMAP_MUX
arch/arm/mach-omap2/board-4430sdp.c +0 -1
@@ -223,7 +223,6 @@ static void __init omap_4430sdp_init_irq(void)omap2_gp_clockevent_set_gptimer (1 );#endif gic_init_irq (); -omap_gpio_init (); }static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-am3517crane.c +0 -2
@@ -19,7 +19,6 @@#include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -50,7 +49,6 @@ static void __init am3517_crane_init_irq(void)omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }static void __init am3517_crane_init (void )
arch/arm/mach-omap2/board-am3517evm.c +0 -1
@@ -392,7 +392,6 @@ static void __init am3517_evm_init_irq(void)omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-apollon.c +0 -1
@@ -280,7 +280,6 @@ static void __init omap_apollon_init_irq(void) omap_board_config_size =ARRAY_SIZE (apollon_config);omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init ();apollon_init_smc91x (); }
arch/arm/mach-omap2/board-cm-t35.c +0 -1
@@ -686,7 +686,6 @@ static void __init cm_t35_init_irq(void)omap2_init_common_hw (mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params);omap_init_irq (); -omap_gpio_init (); }static struct omap_board_mux board_mux[]__initdata = {
arch/arm/mach-omap2/board-cm-t3517.c +0 -1
@@ -250,7 +250,6 @@ static void __init cm_t3517_init_irq(void)omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }static struct omap_board_mux board_mux[]__initdata = {
arch/arm/mach-omap2/board-devkit8000.c +0 -1
@@ -450,7 +450,6 @@ static void __init devkit8000_init_irq(void)#ifdef CONFIG_OMAP_32K_TIMER omap2_gp_clockevent_set_gptimer (12 );#endif -omap_gpio_init (); }static void __init devkit8000_ads7846_init (void )
arch/arm/mach-omap2/board-h4.c +0 -1
@@ -293,7 +293,6 @@ static void __init omap_h4_init_irq(void) omap_board_config_size =ARRAY_SIZE (h4_config);omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init ();h4_init_flash (); }
arch/arm/mach-omap2/board-igep0020.c +0 -1
@@ -497,7 +497,6 @@ static void __init igep2_init_irq(void) omap_board_config_size =ARRAY_SIZE (igep2_config);omap2_init_common_hw (m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);omap_init_irq (); -omap_gpio_init (); }static struct twl4030_codec_audio_data igep2_audio_data = {
arch/arm/mach-omap2/board-igep0030.c +0 -1
@@ -291,7 +291,6 @@ static void __init igep3_init_irq(void) {omap2_init_common_hw (m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);omap_init_irq (); -omap_gpio_init (); }static struct twl4030_platform_data igep3_twl4030_pdata = {
arch/arm/mach-omap2/board-ldp.c +0 -1
@@ -294,7 +294,6 @@ static void __init omap_ldp_init_irq(void) omap_board_config_size =ARRAY_SIZE (ldp_config);omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init ();ldp_init_smsc911x (); }
arch/arm/mach-omap2/board-n8x0.c +0 -1
@@ -743,7 +743,6 @@ static void __init n8x0_init_irq(void) {omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }#ifdef CONFIG_OMAP_MUX
arch/arm/mach-omap2/board-omap3beagle.c +0 -1
@@ -490,7 +490,6 @@ static void __init omap3_beagle_init_irq(void)#ifdef CONFIG_OMAP_32K_TIMER omap2_gp_clockevent_set_gptimer (12 );#endif -omap_gpio_init (); }static struct platform_device *omap3_beagle_devices[]__initdata = {
arch/arm/mach-omap2/board-omap3evm.c +0 -1
@@ -625,7 +625,6 @@ static void __init omap3_evm_init_irq(void) omap_board_config_size =ARRAY_SIZE (omap3_evm_config);omap2_init_common_hw (mt46h32m32lf6_sdrc_params,NULL );omap_init_irq (); -omap_gpio_init (); }static struct platform_device *omap3_evm_devices[]__initdata = {
arch/arm/mach-omap2/board-omap3logic.c +0 -1
@@ -199,7 +199,6 @@ static void __init omap3logic_init_irq(void) {omap2_init_common_hw (NULL ,NULL );omap_init_irq (); -omap_gpio_init (); }#ifdef CONFIG_OMAP_MUX
arch/arm/mach-omap2/board-omap3pandora.c +0 -1
@@ -639,7 +639,6 @@ static void __init omap3pandora_init_irq(void)omap2_init_common_hw (mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params);omap_init_irq (); -omap_gpio_init (); }static void pandora_wl1251_set_power (bool enable)
arch/arm/mach-omap2/board-omap3stalker.c +0 -1
@@ -589,7 +589,6 @@ static void __init omap3_stalker_init_irq(void)#ifdef CONFIG_OMAP_32K_TIMER omap2_gp_clockevent_set_gptimer (12 );#endif -omap_gpio_init (); }static struct platform_device *omap3_stalker_devices[]__initdata = {
arch/arm/mach-omap2/board-omap3touchbook.c +0 -1
@@ -428,7 +428,6 @@ static void __init omap3_touchbook_init_irq(void)#ifdef CONFIG_OMAP_32K_TIMER omap2_gp_clockevent_set_gptimer (12 );#endif -omap_gpio_init (); }static struct platform_device *omap3_touchbook_devices[]__initdata = {
arch/arm/mach-omap2/board-omap4panda.c +0 -1
@@ -79,7 +79,6 @@ static void __init omap4_panda_init_irq(void) {omap2_init_common_hw (NULL ,NULL );gic_init_irq (); -omap_gpio_init (); }static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = {
arch/arm/mach-omap2/board-overo.c +0 -1
@@ -416,7 +416,6 @@ static void __init overo_init_irq(void)omap2_init_common_hw (mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params);omap_init_irq (); -omap_gpio_init (); }static struct platform_device *overo_devices[]__initdata = {
arch/arm/mach-omap2/board-rx51.c +0 -1
@@ -108,7 +108,6 @@ static void __init rx51_init_irq(void) sdrc_params =rx51_get_sdram_timings ();omap2_init_common_hw (sdrc_params, sdrc_params);omap_init_irq (); -omap_gpio_init (); }extern void __init rx51_peripherals_init (void );
arch/arm/mach-omap2/board-zoom.c +0 -1
@@ -43,7 +43,6 @@ static void __init omap_zoom_init_irq(void) h8mbx00u0mer0em_sdrc_params);omap_init_irq (); -omap_gpio_init (); }#ifdef CONFIG_OMAP_MUX
arch/arm/plat-omap/gpio.c +0 -6
@@ -2109,12 +2109,6 @@ static int __init omap_gpio_drv_reg(void) }postcore_initcall (omap_gpio_drv_reg); -/* TODO: Remove omap_gpio_init() and its usage from board files */ -int __init omap_gpio_init (void ) -{ -return 0 ; -} -static int __init omap_gpio_sysinit (void ) {int ret =0 ;
arch/arm/plat-omap/include/plat/gpio.h +0 -1
@@ -94,7 +94,6 @@ struct omap_gpio_platform_data {/* TODO: Analyze removing gpio_bank_count usage from driver code */ extern int gpio_bank_count; -extern int omap_gpio_init (void );/* Call from board init only */ extern void omap2_gpio_prepare_for_idle (int power_state);extern void omap2_gpio_resume_after_idle (void );extern void omap_set_gpio_debounce (int gpio,int enable);
Signature · 1 line
1.7.0.4
Tony Lindgren
maintainerPATCH v7 11/11 OMAP: GPIO: Remove omap_gpio_init()
Quoted 3 lines · Varadarajan, Charulatha
Remove the usage of
omap_gpio_init()from all omap board files sinceomap_gpio_init()does nothing, after gpio is implemented as a platform device.
Great, glad to see these go!
Tony
Hi Charu,
Quoted 4 lines · Charulatha
Implement OMAP GPIO module in platform device model. OMAP2+ specific GPIO module uses hwmod FW.
Tested on OMAP2430, OMAP44430, OMAP3430 SDP boards, OMAP4430 Blaze board
How did you get some top secret samples of the ultra new *44430* device running at 16.5 GHz? That device should not be released publicly before 10 years ;-)
Benoit
Quoted 180 lines
and zoom3 board. Verified that this patch series does not break the OMAP1 build.
Version History:
---------------
v7 Series:
- Use gpio iclks asmain_clkin OMAP3& OMAP4
- Implement GPIO as a platform device (use hwmod FW for OMAP2+) and the implementation is similar to current GPIO code. Does not modify the gpio suspend/ resume/ prepare for odle and resume after idle code and these modifications would be done in a separate patch series. This was suggested by Kevin in another internal email thread.v6 Series:
Some links for v6 series:
https://patchwork.kernel.org/patch/189742/
https://patchwork.kernel.org/patch/189822/
https://patchwork.kernel.org/patch/189832/
Comments Fixed in v6:(quoted diff) +0
-7-use PM runtime APIs for gpio in cpu idle/resume after idle path when interrupts are enabled. -Do not use omap_device_* calls in the gpio driver -Use clock alias names for debounce clocks while using clock framework APIs to do clk_get. -do a kfree of pdata after doing omap_device_build() -use PM runtime APIs during probe before and after accessing gpio registers -Remove sysconfig register access from GPIO driver -Use ARRAY_SIZE instead on size_of in OMAP1 gpio_initv5 Series:
Some links for v5 series:
https://patchwork.kernel.org/patch/117790/
https://patchwork.kernel.org/patch/117789/
https://patchwork.kernel.org/patch/117788/
https://patchwork.kernel.org/patch/117785/
https://patchwork.kernel.org/patch/117796/
Comments Fixed in v5:
- Usedev_pm_opsinstead ofsys_dev_class
- Use runtime suspend/resume hooks for GPIO device
- extend the usage ofmod_usageflag to all cpu classes.(Earlier it was used only for OMAP2+)
- Makegpio_contextas part ofgpio_bankstructurev4 Series:
Some links for v4 series:
https://patchwork.kernel.org/patch/107411/
Comments Fixed in v4:
- Removegpio_bank_countfromdev_attrfield and derive it from hwmod class iteration count
- Add TODOs for future omap gpio code cleanup related activity
- Rename gpio'splatform_data'method' to 'bank_type'
- Rename gpio'splatform_data'gpio_bank_bits' to 'gpio_bank_width'
- Add 'rev' field to gpio class in hwmod datbase and get 'bank_type' based on 'rev' field
- Filename removed from file description when a new file is createdv3 Series:
Some of the v3 links:
https://patchwork.kernel.org/patch/106224/
Comments Fixed in v3:
- .module_offs populated in hwmod structures
- If not definedCONFIG_PM_RUNTIMEis not handled in GPIO driver
- No changes tomach-omap2/clockxxxx-data.cto handle clocks by dev ptr as it is taken care using clock get by name in hwmod&omap_devicelayer
- Using "ick" instead of "arm_gpio_ck" for OMAP15xx clock
- SoC base addresses moved toplat-omap/omapXXXX.hthat should be used only by theomap_hwmod_xxxx_data.cfile
- OMAP2/3 hwmod structures naming convention changed as it is followed in OMAP4
-omap24xx_gpio_init()usescpu_is_omap24xx()instead of separate checks for 2420& 2430 in OMAP2 specific init call (mach-omap layer)
- Reason for usingpostcore_initcallis added to patch description
- Comments added for usage ofdbck_flagand other elements
indev_attrstructure
- Usesdev_dbg()anddev_err()instead ofpr_dbg()andpr_err()
- Corrects the gpio clock details in OMAP4 hwmod databasev2 series:
Some important links to patch v2 series and comments:
http://www.mail-archive.com/[email protected]/msg30262.html
http://www.mail-archive.com/[email protected]/msg28787.html
http://www.mail-archive.com/[email protected]/msg30263.html
http://www.mail-archive.com/[email protected]/msg30295.html
http://www.mail-archive.com/[email protected]/msg30259.html
http://www.mail-archive.com/[email protected]/msg28933.html
Comments Fixed in V2:
- GPIO dev attr was added for SoC specific chip info (eg., gpio bank count)
- Removedomap_gpio_init()usage from board files
-platform_get_resource()used instead ofpdata->basefor OMAP2+ base addresses
-postcore_initcallused for gpio init instead of making
GPIO as an early platform device. SoC specificgpio_initneeds to be done beforemachine_initfunctions access gpio APIs. Hence making SoC specificgpio_initaspostcore_initcall.
- getting gpio dbck is moved toomap_set_gpio_debounce()instead of doing it in probev1 series:
Some important links to patch v1 series and comments:
http://www.mail-archive.com/[email protected]/msg26934.html
http://www.mail-archive.com/[email protected]/msg27860.html
http://www.mail-archive.com/[email protected]/msg28183.html
Highlights in v1:
- Introduces SoC specific functions at mach-omap layer
- Implements GPIO as a platform device
- Make gpio an early device and make it implemented inBenoit Cousson (1):
OMAP4: hwmod data: Add GPIOVaradarajan, Charulatha (10):
OMAP: GPIO: prepare for platform driver
OMAP15xx: GPIO: Introduce support for GPIO init
OMAP16xx: GPIO: Introduce support for GPIO init
OMAP7xx: GPIO: Introduce support for GPIO init
OMAP2420: hwmod data: Add GPIO
OMAP2430: hwmod data: Add GPIO
OMAP3: hwmod data: Add GPIO
OMAP2+: GPIO: device registration
OMAP: GPIO: Implement GPIO as a platform device
OMAP: GPIO: Removeomap_gpio_init()arch/arm/mach-omap1/Makefile | 6 + arch/arm/mach-omap1/board-ams-delta.c | 1 - arch/arm/mach-omap1/board-fsample.c | 1 - arch/arm/mach-omap1/board-h2.c | 1 - arch/arm/mach-omap1/board-h3.c | 1 - arch/arm/mach-omap1/board-htcherald.c | 2 - arch/arm/mach-omap1/board-innovator.c | 1 - arch/arm/mach-omap1/board-nokia770.c | 1 - arch/arm/mach-omap1/board-osk.c | 1 - arch/arm/mach-omap1/board-palmte.c | 1 - arch/arm/mach-omap1/board-palmz71.c | 1 - arch/arm/mach-omap1/board-perseus2.c | 1 - arch/arm/mach-omap1/board-sx1.c | 1 - arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-omap1/clock_data.c | 4 +- arch/arm/mach-omap1/gpio15xx.c | 98 +++++ arch/arm/mach-omap1/gpio16xx.c | 199 +++++++++ arch/arm/mach-omap1/gpio7xx.c | 261 ++++++++++++ arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-3430sdp.c | 1 - arch/arm/mach-omap2/board-3630sdp.c | 1 - arch/arm/mach-omap2/board-4430sdp.c | 1 - arch/arm/mach-omap2/board-am3517crane.c | 2 - arch/arm/mach-omap2/board-am3517evm.c | 1 - arch/arm/mach-omap2/board-apollon.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 1 - arch/arm/mach-omap2/board-cm-t3517.c | 1 - arch/arm/mach-omap2/board-devkit8000.c | 1 - arch/arm/mach-omap2/board-h4.c | 1 - arch/arm/mach-omap2/board-igep0020.c | 1 - arch/arm/mach-omap2/board-igep0030.c | 1 - arch/arm/mach-omap2/board-ldp.c | 1 - arch/arm/mach-omap2/board-n8x0.c | 1 - arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/board-omap3evm.c | 1 - arch/arm/mach-omap2/board-omap3logic.c | 1 - arch/arm/mach-omap2/board-omap3pandora.c | 1 - arch/arm/mach-omap2/board-omap3stalker.c | 1 - arch/arm/mach-omap2/board-omap3touchbook.c | 1 - arch/arm/mach-omap2/board-omap4panda.c | 1 - arch/arm/mach-omap2/board-overo.c | 1 - arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom.c | 1 - arch/arm/mach-omap2/gpio.c | 103 +++++ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 229 ++++++++++ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 279 +++++++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 360 ++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 341 +++++++++++++++ arch/arm/plat-omap/gpio.c | 622 +++++++++------------------- arch/arm/plat-omap/include/plat/gpio.h | 24 +- 51 files changed, 2103 insertions(+), 465 deletions(-)create mode 100644
arch/arm/mach-omap1/gpio15xx.ccreate mode 100644arch/arm/mach-omap1/gpio16xx.ccreate mode 100644arch/arm/mach-omap1/gpio7xx.ccreate mode 100644arch/arm/mach-omap2/gpio.c
Quoted 4 lines · Benoit
Hi Charu,
Quoted 1 line · Charulatha
Quoted 8 lines
Quoted 4 lines
Implement OMAP GPIO module in platform device model. OMAP2+ specific GPIO module uses hwmod FW.
Tested on OMAP2430, OMAP44430, OMAP3430 SDP boards, OMAP4430 Blaze board
How did you get some top secret samples of the ultra new *44430* device running at 16.5 GHz?
That device should not be released publicly before 10 years ;-)
Typo!! My bad :-( !!!
Thanks for finding it. But nice to know that *44430* device would be running at 16.5 GHz ;-)
Quoted 2 lines
Benoit
<<snip>>
v7 cover OMAP: GPIO: Implement GPIO as a platform device
In reply to Varadarajan, CharulathaQuoted 7 lines · Charulatha
Implement OMAP GPIO module in platform device model. OMAP2+ specific GPIO module uses hwmod FW.
Tested on OMAP2430, OMAP44430, OMAP3430 SDP boards, OMAP4430 Blaze board and zoom3 board. Verified that this patch series does not break the OMAP1 build.
Quoted 9 lines
Version History:
---------------
v7 Series:
- Use gpio iclks asmain_clkin OMAP3 & OMAP4
- Implement GPIO as a platform device (use hwmod FW for OMAP2+) and the implementation is similar to current GPIO code. Does not modify the gpio suspend/ resume/ prepare for odle and resume after idle code and these modifications would be done in a separate patch series. This was suggested by Kevin in another internal email thread.
OK, I'm ready to merge this series, and we can deal with the runtime PM conversion in another series as that's where the tricky part lies.
However, I'd like one more rebase/retest due to some other dependencies.
Can you rebase/retest using my current pm-core branch? That includes
several dependencies that are also targetted for 2.6.38:
- misc. PM fixes
- i2c hwmod + runtime PM conversion (my pm-hwmod-i2c branch)
- several board file changes/updates (Tony's devel-board branch)
- hwmod core fixes (Paul's hwmod_a_2.6.38 branch)
- wdt hwmod cleanups (Paul's wdt_2.6.38 branch)
Also, can you collect the acks from Beno?t and update your changelogs to include them. Thanks.
Please be sure your board file changes are updated for the board file changes in the devel-board branch.
Thanks,
Kevin
v7 cover OMAP: GPIO: Implement GPIO as a platform device
Kevin,
Quoted 19 lines · Kevin Hilman
Quoted 7 lines · Charulatha
Implement OMAP GPIO module in platform device model. OMAP2+ specific GPIO module uses hwmod FW.
Tested on OMAP2430, OMAP44430, OMAP3430 SDP boards, OMAP4430 Blaze board and zoom3 board. Verified that this patch series does not break the OMAP1 build.
Quoted 9 lines
Version History:
---------------
v7 Series:
- Use gpio iclks asmain_clkin OMAP3 & OMAP4
- Implement GPIO as a platform device (use hwmod FW for OMAP2+) ?and the implementation is similar to current GPIO code. Does not ?modify the gpio suspend/ resume/ prepare for odle and resume after ?idle code and these modifications would be done in a separate patch ?series. This was suggested by Kevin in another internal email thread.
Quoted 2 lines
OK, I'm ready to merge this series, and we can deal with the runtime PM conversion in another series as that's where the tricky part lies.
Thanks.
Quoted 3 lines
However, I'd like one more rebase/retest due to some other dependencies. Can you rebase/retest using my current pm-core branch?
Sure I will do that.
Quoted 11 lines
That includes
several dependencies that are also targetted for 2.6.38:- misc. PM fixes
- i2c hwmod + runtime PM conversion (my pm-hwmod-i2c branch)
- several board file changes/updates (Tony's devel-board branch)
- hwmod core fixes (Paul's hwmod_a_2.6.38 branch)
- wdt hwmod cleanups (Paul's wdt_2.6.38 branch)Also, can you collect the acks from Beno?t and update your changelogs to include them. ?Thanks.
Sure.
Quoted 3 lines
Please be sure your board file changes are updated for the board file changes in the devel-board branch.
Okay. But if it is different, should I send only the board files changes on devel-board branch as a separate patch mentioning the dependencies on my patch series?
v7 cover OMAP: GPIO: Implement GPIO as a platform device
Hi Charu,
[...]
Quoted 8 lines
Quoted 3 lines
Please be sure your board file changes are updated for the board file changes in the devel-board branch.
Okay. But if it is different, should I send only the board files changes on devel-board ?branch as a separate patch mentioning the dependencies on my patch series?
My pm-core includes the devel-board branch since it's part of Tony's for-next, so that shouldn't be necessary.
However, if you find it's easier to break it into separate series feel free, as long as the dependencies are mentioned.
Thanks,
Kevin
v7 cover OMAP: GPIO: Implement GPIO as a platform device
Quoted 13 lines · Kevin Hilman
Hi Charu,
[...]
Quoted 8 lines
Quoted 3 lines
Please be sure your board file changes are updated for the board file changes in the devel-board branch.
Okay. But if it is different, should I send only the board files changes on devel-board ?branch as a separate patch mentioning the dependencies on my patch series?
Quoted 5 lines
My pm-core includes the devel-board branch since it's part of Tony's for-next, so that shouldn't be necessary.
However, if you find it's easier to break it into separate series feel free, as long as the dependencies are mentioned.
Okay. Thanks.
Quoted 5 lines
Thanks,
Kevin