ARM: i.MX51: Remove _MX51_PAD_xxx references
Use new macro NEW_PAD_CTRL to remove _MX51_PAD_xxx references. A later patch will remove the _MX51_PAD_xxx symbols. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
93ee7a9340
commit
7242e24a0f
arch/arm
mach-mx5
plat-mxc/include/mach
@ -108,7 +108,7 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = {
|
|||||||
|
|
||||||
/* Touchscreen */
|
/* Touchscreen */
|
||||||
/* IRQ */
|
/* IRQ */
|
||||||
_MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
|
NEW_PAD_CTRL(MX51_PAD_GPIO_NAND__GPIO_NAND, PAD_CTL_PUS_22K_UP |
|
||||||
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
||||||
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
||||||
};
|
};
|
||||||
|
@ -357,8 +357,8 @@ static const struct esdhc_platform_data mx51_babbage_sd2_data __initconst = {
|
|||||||
static void __init mx51_babbage_init(void)
|
static void __init mx51_babbage_init(void)
|
||||||
{
|
{
|
||||||
iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
|
iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
|
||||||
iomux_v3_cfg_t power_key = _MX51_PAD_EIM_A27__GPIO2_21 |
|
iomux_v3_cfg_t power_key = NEW_PAD_CTRL(MX51_PAD_EIM_A27__GPIO2_21,
|
||||||
MUX_PAD_CTRL(PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP);
|
PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP);
|
||||||
|
|
||||||
imx51_soc_init();
|
imx51_soc_init();
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
|
|||||||
/* LED */
|
/* LED */
|
||||||
MX51_PAD_NANDF_D10__GPIO3_30,
|
MX51_PAD_NANDF_D10__GPIO3_30,
|
||||||
/* SWITCH */
|
/* SWITCH */
|
||||||
_MX51_PAD_NANDF_D9__GPIO3_31 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
|
NEW_PAD_CTRL(MX51_PAD_NANDF_D9__GPIO3_31, PAD_CTL_PUS_22K_UP |
|
||||||
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
||||||
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
||||||
/* UART2 */
|
/* UART2 */
|
||||||
@ -66,7 +66,7 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
|
|||||||
MX51_PAD_SD1_DATA2__SD1_DATA2,
|
MX51_PAD_SD1_DATA2__SD1_DATA2,
|
||||||
MX51_PAD_SD1_DATA3__SD1_DATA3,
|
MX51_PAD_SD1_DATA3__SD1_DATA3,
|
||||||
/* SD1 CD */
|
/* SD1 CD */
|
||||||
_MX51_PAD_GPIO1_0__SD1_CD | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
|
NEW_PAD_CTRL(MX51_PAD_GPIO1_0__SD1_CD, PAD_CTL_PUS_22K_UP |
|
||||||
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
|
||||||
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
|
||||||
};
|
};
|
||||||
|
@ -80,6 +80,7 @@ typedef u64 iomux_v3_cfg_t;
|
|||||||
((iomux_v3_cfg_t)(_sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT) | \
|
((iomux_v3_cfg_t)(_sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT) | \
|
||||||
((iomux_v3_cfg_t)(_sel_input) << MUX_SEL_INPUT_SHIFT))
|
((iomux_v3_cfg_t)(_sel_input) << MUX_SEL_INPUT_SHIFT))
|
||||||
|
|
||||||
|
#define NEW_PAD_CTRL(cfg, pad) (((cfg) & ~MUX_PAD_CTRL_MASK) | MUX_PAD_CTRL(pad))
|
||||||
/*
|
/*
|
||||||
* Use to set PAD control
|
* Use to set PAD control
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user