From: Mahesh Mahadevan Date: Thu, 10 Nov 2011 11:54:37 +0000 (-0600) Subject: ENGR00161926 Change the PAD settings on SD3 Write Protect X-Git-Tag: v3.0.35-fsl_4.1.0~2074 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9feff8a08b7d64b17138c90049762d5067811143;p=karo-tx-linux.git ENGR00161926 Change the PAD settings on SD3 Write Protect Update the PAD settings to lower pull-up resistor as this was causing WP to not be detected. Signed-off-by: Mahesh Mahadevan --- diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 4d791f7c379a..8fef605b8929 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -80,6 +80,10 @@ #define MX6Q_SABRELITE_CAP_TCH_INT1 IMX_GPIO_NR(1, 9) #define MX6Q_SABRELITE_USB_HUB_RESET IMX_GPIO_NR(7, 12) +#define MX6Q_SABRELITE_SD3_WP_PADCFG (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_HYS) + void __init early_console_setup(unsigned long base, struct clk *clk); extern struct regulator *(*get_cpu_regulator)(void); @@ -288,7 +292,7 @@ static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { MX6Q_PAD_SD3_DAT2__USDHC3_DAT2_50MHZ, MX6Q_PAD_SD3_DAT3__USDHC3_DAT3_50MHZ, MX6Q_PAD_SD3_DAT5__GPIO_7_0, /* J18 - SD3_CD */ - MX6Q_PAD_SD3_DAT4__GPIO_7_1, /* J18 - SD3_WP */ + NEW_PAD_CTRL(MX6Q_PAD_SD3_DAT4__GPIO_7_1, MX6Q_SABRELITE_SD3_WP_PADCFG), /* USDHC4 */ MX6Q_PAD_SD4_CLK__USDHC4_CLK_50MHZ, diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 8d60baed78b4..60fb82ecbc1b 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h @@ -80,6 +80,8 @@ typedef u64 iomux_v3_cfg_t; ((iomux_v3_cfg_t)(_sel_input_ofs) << MUX_SEL_INPUT_OFS_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 */