--- arch/arm/mach-msm/board-m2_att-gpiomux.c
+++ arch/arm/mach-msm/board-m2_att-gpiomux.c
@@ -103,21 +103,6 @@ static struct gpiomux_setting cdc_mclk =
.pull = GPIOMUX_PULL_NONE,
};
-static struct gpiomux_setting audio_auxpcm[] = {
- /* Suspended state */
- {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
- },
- /* Active state */
- {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_NONE,
- },
-};
-
#if defined(CONFIG_KS8851) || defined(CONFIG_KS8851_MODULE)
static struct gpiomux_setting gpio_eth_config = {
.pull = GPIOMUX_PULL_NONE,
@@ -126,12 +111,6 @@ static struct gpiomux_setting gpio_eth_c
};
#endif
-static struct gpiomux_setting slimbus = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_KEEPER,
-};
-
static struct gpiomux_setting gpio_key_active_cfg = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_8MA,
@@ -227,12 +206,6 @@ static struct gpiomux_setting mdm2ap_err
.pull = GPIOMUX_PULL_DOWN,
};
-static struct gpiomux_setting ap2mdm_kpdpwr_n_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_NONE,
-};
-
static struct gpiomux_setting mdp_vsync_suspend_cfg = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_2MA,
@@ -270,34 +243,6 @@ static struct gpiomux_setting hdmi_activ
.pull = GPIOMUX_PULL_DOWN,
.dir = GPIOMUX_IN,
};
-
-static struct gpiomux_setting hdmi_active_4_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_UP,
- .dir = GPIOMUX_OUT_HIGH,
-};
-#endif
-#if defined(CONFIG_VIDEO_MHL_V1) || defined(CONFIG_VIDEO_MHL_V2)
-static struct gpiomux_setting mhl_suspend_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
-};
-
-static struct gpiomux_setting mhl_active_1_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
- .dir = GPIOMUX_OUT_LOW,
-};
-
-static struct gpiomux_setting mhl_active_2_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_NONE,
-};
-
#endif
#ifdef CONFIG_USB_SWITCH_FSA9485
@@ -554,21 +499,6 @@ static struct msm_gpiomux_config msm8960
},
};
-static struct msm_gpiomux_config msm8960_slimbus_config[] __initdata = {
- {
- .gpio = 60, /* slimbus data */
- .settings = {
- [GPIOMUX_SUSPENDED] = &slimbus,
- },
- },
- {
- .gpio = 61, /* slimbus clk */
- .settings = {
- [GPIOMUX_SUSPENDED] = &slimbus,
- },
- },
-};
-
static struct msm_gpiomux_config msm8960_audio_codec_configs[] __initdata = {
{
.gpio = 59,
@@ -641,12 +571,6 @@ static struct gpiomux_setting cdc_i2s_tx
.pull = GPIOMUX_PULL_NONE,
};
-static struct gpiomux_setting cdc_i2s_tx_d1 = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_NONE,
-};
-
static struct gpiomux_setting cdc_i2s_tx_ws = {
.func = GPIOMUX_FUNC_1,
.drv = GPIOMUX_DRV_8MA,
@@ -682,37 +606,6 @@ static struct msm_gpiomux_config msm8960
};
-static struct msm_gpiomux_config msm8960_audio_auxpcm_configs[] __initdata = {
- {
- .gpio = 63,
- .settings = {
- [GPIOMUX_SUSPENDED] = &audio_auxpcm[0],
- [GPIOMUX_ACTIVE] = &audio_auxpcm[1],
- },
- },
- {
- .gpio = 64,
- .settings = {
- [GPIOMUX_SUSPENDED] = &audio_auxpcm[0],
- [GPIOMUX_ACTIVE] = &audio_auxpcm[1],
- },
- },
- {
- .gpio = 65,
- .settings = {
- [GPIOMUX_SUSPENDED] = &audio_auxpcm[0],
- [GPIOMUX_ACTIVE] = &audio_auxpcm[1],
- },
- },
- {
- .gpio = 66,
- .settings = {
- [GPIOMUX_SUSPENDED] = &audio_auxpcm[0],
- [GPIOMUX_ACTIVE] = &audio_auxpcm[1],
- },
- },
-};
-
static struct msm_gpiomux_config wcnss_5wire_interface[] = {
{
.gpio = 84,
@@ -914,47 +807,6 @@ static struct msm_gpiomux_config msm8960
},
};
#endif
-#if defined(CONFIG_VIDEO_MHL_V1) || defined(CONFIG_VIDEO_MHL_V2)
-static struct msm_gpiomux_config msm8960_mhl_configs[] __initdata = {
- {
- .gpio = GPIO_MHL_EN,
- .settings = {
- [GPIOMUX_ACTIVE] = &mhl_active_1_cfg,
- [GPIOMUX_SUSPENDED] = &mhl_suspend_cfg,
- },
- },
- {
- .gpio = GPIO_MHL_RST,
- .settings = {
- [GPIOMUX_ACTIVE] = &mhl_active_1_cfg,
- [GPIOMUX_SUSPENDED] = &mhl_suspend_cfg,
- },
- },
- {
- .gpio = GPIO_MHL_WAKE_UP,
- .settings = {
- [GPIOMUX_SUSPENDED] = &mhl_suspend_cfg,
- },
- },
- {
- .gpio = GPIO_MHL_SDA,
- .settings = {
- [GPIOMUX_ACTIVE] = &mhl_active_2_cfg,
- [GPIOMUX_SUSPENDED] = &mhl_suspend_cfg,
- },
- },
- {
- .gpio = GPIO_MHL_SCL,
- .settings = {
- [GPIOMUX_ACTIVE] = &mhl_active_2_cfg,
- [GPIOMUX_SUSPENDED] = &mhl_suspend_cfg,
- },
- },
-
-
-
-};
-#endif
#ifdef CONFIG_I2C
projects / ziggy471-sgs3-jb.git / blobdiff