From: b-cousson@ti.com (Cousson, Benoit)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 06/11] OMAP2430: hwmod data: Add GPIO
Date: Wed, 24 Nov 2010 23:42:56 +0100 [thread overview]
Message-ID: <4CED94F0.1040703@ti.com> (raw)
In-Reply-To: <1290524213-395-7-git-send-email-charu@ti.com>
On 11/23/2010 3:56 PM, Varadarajan, Charulatha wrote:
> Add GPIO hwmod data for OMAP2430
>
> Signed-off-by: Charulatha V<charu@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_2430_data.c | 279 ++++++++++++++++++++++++++++
> 1 files changed, 279 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> index 7cf0d3a..397471c 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> @@ -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
>
> #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,
> };
>
next prev parent reply other threads:[~2010-11-24 22:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-23 14:56 [PATCH v7 00/11] OMAP: GPIO: Implement GPIO as a platform device Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 01/11] OMAP: GPIO: prepare for platform driver Varadarajan, Charulatha
2010-11-26 4:38 ` Olof Johansson
2010-11-26 5:03 ` Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 02/11] OMAP15xx: GPIO: Introduce support for GPIO init Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 03/11] OMAP16xx: " Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 04/11] OMAP7xx: " Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 05/11] OMAP2420: hwmod data: Add GPIO Varadarajan, Charulatha
2010-11-24 22:13 ` Cousson, Benoit
2010-11-25 4:36 ` Varadarajan, Charulatha
2010-11-25 7:55 ` Cousson, Benoit
2010-11-25 8:02 ` Cousson, Benoit
2010-11-25 8:31 ` Varadarajan, Charulatha
2010-11-25 9:33 ` Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 06/11] OMAP2430: " Varadarajan, Charulatha
2010-11-24 22:42 ` Cousson, Benoit [this message]
2010-11-23 14:56 ` [PATCH v7 07/11] OMAP3: " Varadarajan, Charulatha
2010-11-24 22:51 ` Cousson, Benoit
2010-11-25 4:37 ` Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 08/11] OMAP4: " Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 09/11] OMAP2+: GPIO: device registration Varadarajan, Charulatha
2010-11-24 23:00 ` Cousson, Benoit
2010-11-23 14:56 ` [PATCH v7 10/11] OMAP: GPIO: Implement GPIO as a platform device Varadarajan, Charulatha
2010-11-23 14:56 ` [PATCH v7 11/11] OMAP: GPIO: Remove omap_gpio_init() Varadarajan, Charulatha
2010-11-24 23:28 ` Tony Lindgren
2010-11-25 1:40 ` [PATCH v7 00/11] OMAP: GPIO: Implement GPIO as a platform device Kevin Hilman
2010-11-25 4:31 ` Varadarajan, Charulatha
2010-11-25 6:19 ` Kevin Hilman
2010-11-25 6:20 ` Varadarajan, Charulatha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CED94F0.1040703@ti.com \
--to=b-cousson@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).