| Message ID | 1353015597-22703-1-git-send-email-oleg.matcovschi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* oleg.matcovschi@ti.com <oleg.matcovschi@ti.com> [121115 13:42]: > From: Oleg Matcovschi <oleg.matcovschi@ti.com> > > OMAP_MODE_GPIO() macro verified only OMAP_MUX_MODE4. Indeed, that needs to be fixed. > It is not correct for following platforms: > 2430 - gpio mux mode 3 > 44xx - gpio mux mode 3 Looks like these are set properly to GPIO_IN_MODE3 with omap_mux_init(). > 54xx - gpio mux mode 6 This will be only using pinctrl-single.c, so we don't really have to worrry about this one. But I guess we might as well fix that too while at it if somebody backports omap5 support to some older kernel.. > Patch reserves first 3 bits in partition flags for storing gpio mux > mode in same format as stored in control pad register. > Modified OMAP_MODE_GPIO() macro handles all possible cases of gpio mux mode. > Modified omap_mux_init() flags of omap34xx to include OMAP_MUX_GPIO_IN_MODE4. Why don't you just add int gpio to struct omap_mux_partition? You're not saving many bytes as at most we have two partitions so far per SoC. > --- a/arch/arm/mach-omap2/mux34xx.c > +++ b/arch/arm/mach-omap2/mux34xx.c > @@ -2053,7 +2053,7 @@ int __init omap3_mux_init(struct omap_board_mux *board_subset, int flags) > return -EINVAL; > } > > - return omap_mux_init("core", 0, > + return omap_mux_init("core", OMAP_MUX_GPIO_IN_MODE4, > OMAP3_CONTROL_PADCONF_MUX_PBASE, > OMAP3_CONTROL_PADCONF_MUX_SIZE, > omap3_muxmodes, package_subset, board_subset, The default is GPIO_IN_MODE4, but that seems to be a bad default choice as only omap3 uses it. So yeah, might as well initialize that too and not assume any defaults GPIO mode. Regards, Tony
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 701e17c..75f854e 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -799,7 +799,7 @@ int __init omap_mux_late_init(void) struct omap_mux *m = &e->mux; u16 mode = omap_mux_read(partition, m->reg_offset); - if (OMAP_MODE_GPIO(mode)) + if (OMAP_MODE_GPIO(partition, mode)) continue; #ifndef CONFIG_DEBUG_FS @@ -1064,7 +1064,7 @@ static void __init omap_mux_init_list(struct omap_mux_partition *partition, } #else /* Skip pins that are not muxed as GPIO by bootloader */ - if (!OMAP_MODE_GPIO(omap_mux_read(partition, + if (!OMAP_MODE_GPIO(partition, omap_mux_read(partition, superset->reg_offset))) { superset++; continue; diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 76f9b3c..8393284 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h @@ -58,7 +58,8 @@ #define OMAP_PIN_OFF_INPUT_PULLDOWN (OMAP_OFF_EN | OMAP_OFF_PULL_EN) #define OMAP_PIN_OFF_WAKEUPENABLE OMAP_WAKEUP_EN -#define OMAP_MODE_GPIO(x) (((x) & OMAP_MUX_MODE7) == OMAP_MUX_MODE4) +#define OMAP_MODE_GPIO(partition, x) (((x) & OMAP_MUX_MODE7) == \ + (partition->flags & OMAP_MUX_MODE7)) #define OMAP_MODE_UART(x) (((x) & OMAP_MUX_MODE7) == OMAP_MUX_MODE0) /* Flags for omapX_mux_init */ @@ -79,13 +80,20 @@ /* * omap_mux_init flags definition: * + * OMAP_GPIO_MUX_MODE, bits 0-2: gpio muxing mode, same like pad control + * register which includes values from 0-7. * OMAP_MUX_REG_8BIT: Ensure that access to padconf is done in 8 bits. * The default value is 16 bits. - * OMAP_MUX_GPIO_IN_MODE3: The GPIO is selected in mode3. - * The default is mode4. */ -#define OMAP_MUX_REG_8BIT (1 << 0) -#define OMAP_MUX_GPIO_IN_MODE3 (1 << 1) +#define OMAP_MUX_GPIO_IN_MODE0 OMAP_MUX_MODE0 +#define OMAP_MUX_GPIO_IN_MODE1 OMAP_MUX_MODE1 +#define OMAP_MUX_GPIO_IN_MODE2 OMAP_MUX_MODE2 +#define OMAP_MUX_GPIO_IN_MODE3 OMAP_MUX_MODE3 +#define OMAP_MUX_GPIO_IN_MODE4 OMAP_MUX_MODE4 +#define OMAP_MUX_GPIO_IN_MODE5 OMAP_MUX_MODE5 +#define OMAP_MUX_GPIO_IN_MODE6 OMAP_MUX_MODE6 +#define OMAP_MUX_GPIO_IN_MODE7 OMAP_MUX_MODE7 +#define OMAP_MUX_REG_8BIT (1 << 3) /** * struct omap_board_data - board specific device data diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c index c47140b..c53609f4 100644 --- a/arch/arm/mach-omap2/mux34xx.c +++ b/arch/arm/mach-omap2/mux34xx.c @@ -2053,7 +2053,7 @@ int __init omap3_mux_init(struct omap_board_mux *board_subset, int flags) return -EINVAL; } - return omap_mux_init("core", 0, + return omap_mux_init("core", OMAP_MUX_GPIO_IN_MODE4, OMAP3_CONTROL_PADCONF_MUX_PBASE, OMAP3_CONTROL_PADCONF_MUX_SIZE, omap3_muxmodes, package_subset, board_subset,