From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=) Date: Mon, 22 Nov 2010 10:16:50 +0100 Subject: [PATCH] MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) In-Reply-To: <19690.11351.308680.365060@ipc1.ka-ro> References: <1288084042-21722-1-git-send-email-LW@KARO-electronics.de> <19690.11351.308680.365060@ipc1.ka-ro> Message-ID: <20101122091650.GE14002@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Nov 22, 2010 at 09:39:51AM +0100, Lothar Wa?mann wrote: > This patch actually replaces the 'struct pad_desc' with a u64 cookie > to facilitate adding platform specific pad_ctrl settings to an > existing pad definition. > > So, instead of: > iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21; > power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2; > mxc_iomux_v3_setup_pad(&power_key); > one can write: > mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2); > > Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6 minor nitpick: This doens't belong here, but after the triple dash below (IMHO). > Signed-Off-By: Lothar Wa?mann minor nitpick: The more usual way to write that is: Signed-off-by: ... (i.e. off and by in lower case). This might prevent you to appear in the various hit lists like http://www.remword.com/kps_result/ :-) > --- > mach-mx3/mach-pcm043.c | 14 +++--- > mach-mx5/board-mx51_babbage.c | 11 ++--- > plat-mxc/include/mach/iomux-v3.h | 84 ++++++++++++++++++++++----------------- > plat-mxc/iomux-v3.c | 4 - > 4 files changed, 63 insertions(+), 50 deletions(-) > > diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c > index 6b17b40..bb97e6b 100644 > --- a/arch/arm/mach-mx3/mach-pcm043.c > +++ b/arch/arm/mach-mx3/mach-pcm043.c > @@ -240,7 +240,7 @@ static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) > return; > } > > - mxc_iomux_v3_setup_pad(&txfs_gpio); > + mxc_iomux_v3_setup_pad(txfs_gpio); > > /* warm reset */ > gpio_direction_output(AC97_GPIO_TXFS, 1); > @@ -248,7 +248,7 @@ static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) > gpio_set_value(AC97_GPIO_TXFS, 0); > > gpio_free(AC97_GPIO_TXFS); > - mxc_iomux_v3_setup_pad(&txfs); > + mxc_iomux_v3_setup_pad(txfs); > } > > static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) > @@ -272,9 +272,9 @@ static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) > if (ret) > goto err3; > > - mxc_iomux_v3_setup_pad(&txfs_gpio); > - mxc_iomux_v3_setup_pad(&txd_gpio); > - mxc_iomux_v3_setup_pad(&reset_gpio); > + mxc_iomux_v3_setup_pad(txfs_gpio); > + mxc_iomux_v3_setup_pad(txd_gpio); > + mxc_iomux_v3_setup_pad(reset_gpio); > > gpio_direction_output(AC97_GPIO_TXFS, 0); > gpio_direction_output(AC97_GPIO_TXD, 0); > @@ -284,8 +284,8 @@ static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) > udelay(10); > gpio_direction_output(AC97_GPIO_RESET, 1); > > - mxc_iomux_v3_setup_pad(&txd); > - mxc_iomux_v3_setup_pad(&txfs); > + mxc_iomux_v3_setup_pad(txd); > + mxc_iomux_v3_setup_pad(txfs); > > gpio_free(AC97_GPIO_RESET); > err3: > diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c > index 66b07d8..35b8f61 100644 > --- a/arch/arm/mach-mx5/board-mx51_babbage.c > +++ b/arch/arm/mach-mx5/board-mx51_babbage.c > @@ -193,7 +193,7 @@ static int gpio_usbh1_active(void) > int ret; > > /* Set USBH1_STP to GPIO and toggle it */ > - mxc_iomux_v3_setup_pad(&usbh1stp_gpio); > + mxc_iomux_v3_setup_pad(usbh1stp_gpio); > ret = gpio_request(BABBAGE_USBH1_STP, "usbh1_stp"); > > if (ret) { > @@ -206,7 +206,7 @@ static int gpio_usbh1_active(void) > gpio_free(BABBAGE_USBH1_STP); > > /* De-assert USB PHY RESETB */ > - mxc_iomux_v3_setup_pad(&phyreset_gpio); > + mxc_iomux_v3_setup_pad(phyreset_gpio); > ret = gpio_request(BABBAGE_PHY_RESET, "phy_reset"); > > if (ret) { > @@ -348,7 +348,8 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = { > static void __init mxc_board_init(void) > { > iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP; > - iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21; > + iomux_v3_cfg_t power_key = (MX51_PAD_EIM_A27__GPIO_2_21 & > + ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2; > > #if defined(CONFIG_CPU_FREQ_IMX) > get_cpu_op = mx51_get_cpu_op; > @@ -360,8 +361,7 @@ static void __init mxc_board_init(void) > imx51_add_fec(NULL); > > /* Set the PAD settings for the pwr key. */ > - power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2; > - mxc_iomux_v3_setup_pad(&power_key); > + mxc_iomux_v3_setup_pad(power_key); > imx51_add_gpio_keys(&imx_button_data); > > imx51_add_imx_i2c(0, &babbage_i2c_data); > @@ -378,7 +378,7 @@ static void __init mxc_board_init(void) > gpio_usbh1_active(); > mxc_register_device(&mxc_usbh1_device, &usbh1_config); > /* setback USBH1_STP to be function */ > - mxc_iomux_v3_setup_pad(&usbh1stp); > + mxc_iomux_v3_setup_pad(usbh1stp); > babbage_usbhub_reset(); > > imx51_add_esdhc(0, NULL); > diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h > index 811716f..ae6dec9 100644 > --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h > +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h > @@ -42,58 +42,72 @@ > * If or refers to a GPIO, it is named > * GPIO__ > * > - */ > - > -typedef struct deprecated_pad_desc { > - unsigned mux_ctrl_ofs:12; /* IOMUXC_SW_MUX_CTL_PAD offset */ > - unsigned mux_mode:8; > - unsigned pad_ctrl_ofs:12; /* IOMUXC_SW_PAD_CTRL offset */ > -#define NO_PAD_CTRL (1 << 16) > - unsigned pad_ctrl:17; > - unsigned select_input_ofs:12; /* IOMUXC_SELECT_INPUT offset */ > - unsigned select_input:3; > -} iomux_v3_cfg_t; > - > -static inline unsigned int MUX_CTRL_OFS(iomux_v3_cfg_t *pad) > + * IOMUX/PAD Bit field definitions > + * > + * MUX_CTRL_OFS: 0..11 (12) > + * PAD_CTRL_OFS: 12..23 (12) > + * SEL_INPUT_OFS: 24..35 (12) > + * MUX_MODE + SION: 36..40 (5) > + * PAD_CTRL + NO_PAD_CTRL: 41..57 (17) > + * SEL_INP: 58..61 (4) > + * reserved: 63 (1) > +*/ > + > +typedef u64 iomux_v3_cfg_t; > + > +#define MUX_CTRL_OFS_SHIFT 0 > +#define MUX_CTRL_OFS_MASK ((iomux_v3_cfg_t)0xfff << MUX_CTRL_OFS_SHIFT) It doesn't matter for the compiler, but for the reader ((iomux_v3_cfg_t)(0xfff << MUX_CTRL_OFS_SHIFT)) might be clearer?! Ah, I see the problem: ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT) != ((iomux_v3_cfg_t)(0x1f << MUX_MODE_SHIFT)) Well, OK. And these constants should be named (e.g.) IMX_IOMUXV3_CTRL_OFS_MASK to use the proper namespace. IMHO this applies to NO_PAD_CTRL and IOMUX_PAD, too. Maybe fix the name and define the old name to the new for now? > +#define MUX_PAD_CTRL_OFS_SHIFT 12 > +#define MUX_PAD_CTRL_OFS_MASK ((iomux_v3_cfg_t)0xfff << MUX_PAD_CTRL_OFS_SHIFT) > +#define MUX_SEL_INPUT_OFS_SHIFT 24 > +#define MUX_SEL_INPUT_OFS_MASK ((iomux_v3_cfg_t)0xfff << MUX_SEL_INPUT_OFS_SHIFT) > + > +#define MUX_MODE_SHIFT 36 > +#define MUX_MODE_MASK ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT) > +#define MUX_PAD_CTRL_SHIFT 41 > +#define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x1ffff << MUX_PAD_CTRL_SHIFT) > +#define NO_PAD_CTRL ((iomux_v3_cfg_t)1 << (MUX_PAD_CTRL_SHIFT + 16)) > +#define MUX_SEL_INPUT_SHIFT 58 > +#define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) > + > +static inline unsigned int MUX_CTRL_OFS(iomux_v3_cfg_t pad) > { > - return pad->mux_ctrl_ofs; > + return (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT; > } > > -static inline unsigned int MUX_MODE(iomux_v3_cfg_t *pad) > +static inline unsigned int MUX_MODE(iomux_v3_cfg_t pad) > { > - return pad->mux_mode; > + return (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT; > } > > -static inline unsigned int MUX_SELECT_INPUT_OFS(iomux_v3_cfg_t *pad) > +static inline unsigned int MUX_SELECT_INPUT_OFS(iomux_v3_cfg_t pad) > { > - return pad->select_input_ofs; > + return (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT; > } > > -static inline unsigned int MUX_SELECT_INPUT(iomux_v3_cfg_t *pad) > +static inline unsigned int MUX_SELECT_INPUT(iomux_v3_cfg_t pad) > { > - return pad->select_input; > + return (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT; > } > > -static inline unsigned int MUX_PAD_CTRL_OFS(iomux_v3_cfg_t *pad) > +static inline unsigned int MUX_PAD_CTRL_OFS(iomux_v3_cfg_t pad) > { > - return pad->pad_ctrl_ofs; > + return (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT; > } > > -static inline unsigned int MUX_PAD_CTRL(iomux_v3_cfg_t *pad) > +static inline unsigned int MUX_PAD_CTRL(iomux_v3_cfg_t pad) > { > - return pad->pad_ctrl; > + return (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT; > } > > -#define IOMUX_PAD(_pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs, \ > - _select_input, _pad_ctrl) \ > - { \ > - .mux_ctrl_ofs = _mux_ctrl_ofs, \ > - .mux_mode = _mux_mode, \ > - .pad_ctrl_ofs = _pad_ctrl_ofs, \ > - .pad_ctrl = _pad_ctrl, \ > - .select_input_ofs = _select_input_ofs, \ > - .select_input = _select_input, \ > - } > +#define IOMUX_PAD(_pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _sel_input_ofs, \ > + _sel_input, _pad_ctrl) \ > + (((iomux_v3_cfg_t)(_mux_ctrl_ofs) << MUX_CTRL_OFS_SHIFT) | \ > + ((iomux_v3_cfg_t)(_mux_mode) << MUX_MODE_SHIFT) | \ > + ((iomux_v3_cfg_t)(_pad_ctrl_ofs) << MUX_PAD_CTRL_OFS_SHIFT) | \ > + ((iomux_v3_cfg_t)(_pad_ctrl) << MUX_PAD_CTRL_SHIFT) | \ > + ((iomux_v3_cfg_t)(_sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT) | \ > + ((iomux_v3_cfg_t)(_sel_input) << MUX_SEL_INPUT_SHIFT)) > > /* > * Use to set PAD control > @@ -137,7 +151,7 @@ static inline unsigned int MUX_PAD_CTRL(iomux_v3_cfg_t *pad) > /* > * setups a single pad in the iomuxer > */ > -int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t *pad); > +int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad); > > /* > * setups mutliple pads > diff --git a/arch/arm/plat-mxc/iomux-v3.c b/arch/arm/plat-mxc/iomux-v3.c > index 4cbbf2c..09fb5b8 100644 > --- a/arch/arm/plat-mxc/iomux-v3.c > +++ b/arch/arm/plat-mxc/iomux-v3.c > @@ -34,7 +34,7 @@ static void __iomem *base; > /* > * configures a single pad in the iomuxer > */ > -int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t *pad) > +int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad) > { > if (MUX_CTRL_OFS(pad)) > __raw_writel(MUX_MODE(pad), base + MUX_CTRL_OFS(pad)); > @@ -56,7 +56,7 @@ int mxc_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count) > int ret; > > for (i = 0; i < count; i++) { > - ret = mxc_iomux_v3_setup_pad(p); > + ret = mxc_iomux_v3_setup_pad(*p); > if (ret) > return ret; > p++; > > > Lothar Wa?mann > -- > ___________________________________________________________ > > Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen > Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 > Gesch?ftsf?hrer: Matthias Kaussen > Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 > > www.karo-electronics.de | info at karo-electronics.de > ___________________________________________________________ > -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |