diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-06-24 14:48:57 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-06-24 16:34:31 -0700 |
| commit | 587036b5eef05de0192bd1923b7942c37f4a3b27 (patch) | |
| tree | aac05f0760298e05a1b7e828a2ee81d1482d5076 /arch | |
| parent | 499a9edc0efad4a48a461f777ad333a071cebbf7 (diff) | |
i.MX6Q: mx6q_sabrelite: fix SDHC write-protect pins
SDHC4 is microSD and has no write-protect pin on Sabre Lite or Nitrogen6X
SDHC3 is microSD on Nitrogen6X, full-size SD on Sabre Lite
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 2c7f5e000600..f84f6fdbd175 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -448,7 +448,7 @@ static int plt_sd4_pad_change(int clock) } } -static const struct esdhc_platform_data mx6q_sabrelite_sd3_data __initconst = { +static struct esdhc_platform_data mx6q_sabrelite_sd3_data = { .cd_gpio = MX6Q_SABRELITE_SD3_CD, .wp_gpio = MX6Q_SABRELITE_SD3_WP, .keep_power_at_suspend = 1, @@ -457,7 +457,7 @@ static const struct esdhc_platform_data mx6q_sabrelite_sd3_data __initconst = { static const struct esdhc_platform_data mx6q_sabrelite_sd4_data __initconst = { .cd_gpio = MX6Q_SABRELITE_SD4_CD, - .wp_gpio = MX6Q_SABRELITE_SD4_WP, + .wp_gpio = -1, .keep_power_at_suspend = 1, .platform_pad_change = plt_sd4_pad_change, }; @@ -1102,16 +1102,19 @@ static void __init mx6_sabrelite_board_init(void) struct clk *clko2; struct clk *new_parent; int rate; + int isn6 ; mxc_iomux_v3_setup_multiple_pads(mx6q_sabrelite_pads, ARRAY_SIZE(mx6q_sabrelite_pads)); - ret = is_nitrogen6w(); - if (ret) + isn6 = is_nitrogen6w(); + if (isn6) { mx6_sabrelite_audio_data.ext_port = 3; + mx6q_sabrelite_sd3_data.wp_gpio = -1 ; + } printk(KERN_ERR "------------ Board type %s\n", - is_nitrogen6w() ? "Nitrogen6X/W" : "Sabre Lite"); + isn6 ? "Nitrogen6X/W" : "Sabre Lite"); #ifdef CONFIG_FEC_1588 /* Set GPIO_16 input for IEEE-1588 ts_clk and RMII reference clock |