summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorAshwini Ghuge <aghuge@nvidia.com>2012-06-05 10:32:36 +0530
committerSimone Willett <swillett@nvidia.com>2012-06-07 13:35:58 -0700
commitff445fc9ec43b59642c0dc81a66146cdbc3adbaf (patch)
tree3fc8e8bc6f36a20659a55f45a1cc4c29b6887dcd /arch/arm/mach-tegra
parent08139881d07bec1f0e419c0e49f10b84250ebc21 (diff)
ARM: tegra: enterprise: Remove tegra_gpio_enb/dis
Removing tegra_gpio_enable and disable calls from board files as they are supported through set direction calls in the driver Bug 984439 Change-Id: I011fc1ec52b31b1b0602d577f02a6d20f37e402d Signed-off-by: Ashwini Ghuge <aghuge@nvidia.com> Reviewed-on: http://git-master/r/102773 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/board-enterprise-baseband.c10
-rw-r--r--arch/arm/mach-tegra/board-enterprise-panel.c6
-rw-r--r--arch/arm/mach-tegra/board-enterprise-pinmux.c1
-rw-r--r--arch/arm/mach-tegra/board-enterprise-power.c13
-rw-r--r--arch/arm/mach-tegra/board-enterprise-sdhci.c5
-rw-r--r--arch/arm/mach-tegra/board-enterprise-sensors.c4
-rw-r--r--arch/arm/mach-tegra/board-enterprise.c41
7 files changed, 1 insertions, 79 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-baseband.c b/arch/arm/mach-tegra/board-enterprise-baseband.c
index f2c94fda7727..47cf83d0c4b9 100644
--- a/arch/arm/mach-tegra/board-enterprise-baseband.c
+++ b/arch/arm/mach-tegra/board-enterprise-baseband.c
@@ -233,16 +233,6 @@ static int baseband_init(void)
tegra_pinmux_set_pullupdown(TEGRA_PINGROUP_GPIO_PV0,
TEGRA_PUPD_PULL_UP);
- tegra_gpio_enable(MODEM_PWR_ON);
- tegra_gpio_enable(MODEM_RESET);
- tegra_gpio_enable(AP2MDM_ACK2);
- tegra_gpio_enable(BB_RST_OUT);
- tegra_gpio_enable(AP2MDM_ACK);
- tegra_gpio_enable(MDM2AP_ACK);
- tegra_gpio_enable(TEGRA_GPIO_PY3);
- tegra_gpio_enable(TEGRA_GPIO_PO1);
- tegra_gpio_enable(TEGRA_GPIO_PO2);
-
/* export GPIO for user space access through sysfs */
gpio_export(MODEM_PWR_ON, false);
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c
index 5b3dacea135f..8876c8ebf88e 100644
--- a/arch/arm/mach-tegra/board-enterprise-panel.c
+++ b/arch/arm/mach-tegra/board-enterprise-panel.c
@@ -541,7 +541,6 @@ static int enterprise_dsi_panel_enable(void)
gpio_free(enterprise_dsi_panel_reset);
return ret;
}
- tegra_gpio_enable(enterprise_dsi_panel_reset);
gpio_set_value(enterprise_dsi_panel_reset, 0);
udelay(2000);
@@ -560,7 +559,6 @@ static int enterprise_dsi_panel_disable(void)
#if DSI_PANEL_RESET
if (kernel_1st_panel_init != true) {
- tegra_gpio_disable(enterprise_dsi_panel_reset);
gpio_free(enterprise_dsi_panel_reset);
} else
kernel_1st_panel_init = false;
@@ -863,22 +861,18 @@ int __init enterprise_panel_init(void)
enterprise_carveouts[1].size = tegra_carveout_size;
#endif
- tegra_gpio_enable(enterprise_hdmi_hpd);
gpio_request(enterprise_hdmi_hpd, "hdmi_hpd");
gpio_direction_input(enterprise_hdmi_hpd);
- tegra_gpio_enable(enterprise_lcd_2d_3d);
gpio_request(enterprise_lcd_2d_3d, "lcd_2d_3d");
gpio_direction_output(enterprise_lcd_2d_3d, 0);
enterprise_stereo_set_mode(enterprise_stereo.mode_2d_3d);
- tegra_gpio_enable(enterprise_lcd_swp_pl);
gpio_request(enterprise_lcd_swp_pl, "lcd_swp_pl");
gpio_direction_output(enterprise_lcd_swp_pl, 0);
enterprise_stereo_set_orientation(enterprise_stereo.orientation);
#if !(DC_CTRL_MODE & TEGRA_DC_OUT_ONE_SHOT_MODE)
- tegra_gpio_enable(enterprise_lcd_te);
gpio_request(enterprise_lcd_swp_pl, "lcd_te");
gpio_direction_input(enterprise_lcd_te);
#endif
diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c
index fc5851848864..e64d65b84153 100644
--- a/arch/arm/mach-tegra/board-enterprise-pinmux.c
+++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c
@@ -534,7 +534,6 @@ static void enterprise_set_unused_pin_gpio(struct pin_info_low_power_mode *lpm_p
gpio_free(pin_info->gpio_nr);
continue;
}
- tegra_gpio_enable(pin_info->gpio_nr);
}
}
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c
index f32365d808a7..5e5d40728f15 100644
--- a/arch/arm/mach-tegra/board-enterprise-power.c
+++ b/arch/arm/mach-tegra/board-enterprise-power.c
@@ -309,7 +309,6 @@ int battery_charger_init(void *board_data)
" charger fails\n", __func__);
}
gpio_direction_output(TEGRA_GPIO_PF6, 1);
- tegra_gpio_enable(TEGRA_GPIO_PF6);
return 0;
}
@@ -683,8 +682,6 @@ static int __init enterprise_fixed_regulator_init(void)
for (i = 0; i < nfixreg_devs; ++i) {
struct fixed_voltage_config *fixed_reg_pdata =
fixed_regs_devices[i]->dev.platform_data;
- if (fixed_reg_pdata->gpio < TEGRA_NR_GPIOS)
- tegra_gpio_enable(fixed_reg_pdata->gpio);
}
return platform_add_devices(fixed_regs_devices, nfixreg_devs);
}
@@ -693,14 +690,6 @@ static int __init enterprise_gpio_regulator_init(void)
{
int i, j;
- for (i = 0; i < ARRAY_SIZE(gpio_regs_devices); ++i) {
- struct gpio_regulator_config *gpio_reg_pdata =
- gpio_regs_devices[i]->dev.platform_data;
- for (j = 0; j < gpio_reg_pdata->nr_gpios; ++j) {
- if (gpio_reg_pdata->gpios[j].gpio < TEGRA_NR_GPIOS)
- tegra_gpio_enable(gpio_reg_pdata->gpios[j].gpio);
- }
- }
return platform_add_devices(gpio_regs_devices,
ARRAY_SIZE(gpio_regs_devices));
}
@@ -841,8 +830,6 @@ void __init enterprise_bpc_mgmt_init(void)
{
int int_gpio = TEGRA_GPIO_TO_IRQ(TEGRA_BPC_TRIGGER);
- tegra_gpio_enable(TEGRA_BPC_TRIGGER);
-
#ifdef CONFIG_SMP
cpumask_setall(&(bpc_mgmt_platform_data.affinity_mask));
irq_set_affinity_hint(int_gpio,
diff --git a/arch/arm/mach-tegra/board-enterprise-sdhci.c b/arch/arm/mach-tegra/board-enterprise-sdhci.c
index 4e9690899082..7a5632601fe6 100644
--- a/arch/arm/mach-tegra/board-enterprise-sdhci.c
+++ b/arch/arm/mach-tegra/board-enterprise-sdhci.c
@@ -264,10 +264,6 @@ static int __init enterprise_wifi_init(void)
if (rc)
pr_err("WLAN_WOW gpio request failed:%d\n", rc);
- tegra_gpio_enable(ENTERPRISE_WLAN_PWR);
- tegra_gpio_enable(ENTERPRISE_WLAN_RST);
- tegra_gpio_enable(ENTERPRISE_WLAN_WOW);
-
rc = gpio_direction_output(ENTERPRISE_WLAN_PWR, 0);
if (rc)
pr_err("WLAN_PWR gpio direction configuration failed:%d\n", rc);
@@ -286,7 +282,6 @@ int __init enterprise_sdhci_init(void)
{
platform_device_register(&tegra_sdhci_device3);
- tegra_gpio_enable(ENTERPRISE_SD_CD);
tegra_sdhci_platform_data2.cd_gpio = ENTERPRISE_SD_CD;
platform_device_register(&tegra_sdhci_device2);
diff --git a/arch/arm/mach-tegra/board-enterprise-sensors.c b/arch/arm/mach-tegra/board-enterprise-sensors.c
index f775c2bd3b3e..9bfed40325df 100644
--- a/arch/arm/mach-tegra/board-enterprise-sensors.c
+++ b/arch/arm/mach-tegra/board-enterprise-sensors.c
@@ -131,7 +131,6 @@ static void enterprise_nct1008_init(void)
{
int ret;
- tegra_gpio_enable(TEGRA_GPIO_PH7);
ret = gpio_request(TEGRA_GPIO_PH7, "temp_alert");
if (ret < 0) {
pr_err("%s: gpio_request failed %d\n", __func__, ret);
@@ -213,7 +212,6 @@ static void mpuirq_init(void)
#if (MPU_GYRO_TYPE == MPU_TYPE_MPU3050)
#if MPU_ACCEL_IRQ_GPIO
/* ACCEL-IRQ assignment */
- tegra_gpio_enable(MPU_ACCEL_IRQ_GPIO);
ret = gpio_request(MPU_ACCEL_IRQ_GPIO, MPU_ACCEL_NAME);
if (ret < 0) {
pr_err("%s: gpio_request failed %d\n", __func__, ret);
@@ -230,7 +228,6 @@ static void mpuirq_init(void)
#endif
/* MPU-IRQ assignment */
- tegra_gpio_enable(MPU_GYRO_IRQ_GPIO);
ret = gpio_request(MPU_GYRO_IRQ_GPIO, MPU_GYRO_NAME);
if (ret < 0) {
pr_err("%s: gpio_request failed %d\n", __func__, ret);
@@ -589,7 +586,6 @@ static int enterprise_cam_init(void)
gpio_direction_output(enterprise_cam_gpio_data[i].gpio,
enterprise_cam_gpio_data[i].value);
gpio_export(enterprise_cam_gpio_data[i].gpio, false);
- tegra_gpio_enable(enterprise_cam_gpio_data[i].gpio);
}
tegra_get_board_info(&bi);
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index e23a9a468081..ed56a090fd69 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -126,8 +126,6 @@ static struct platform_device enterprise_bluesleep_device = {
static void __init enterprise_setup_bluesleep(void)
{
platform_device_register(&enterprise_bluesleep_device);
- tegra_gpio_enable(TEGRA_GPIO_PS2);
- tegra_gpio_enable(TEGRA_GPIO_PE7);
return;
}
@@ -599,9 +597,6 @@ static struct i2c_board_info __initdata atmel_i2c_info[] = {
static int __init enterprise_touch_init(void)
{
- tegra_gpio_enable(TEGRA_GPIO_PH6);
- tegra_gpio_enable(TEGRA_GPIO_PF5);
-
gpio_request(TEGRA_GPIO_PH6, "atmel-irq");
gpio_direction_input(TEGRA_GPIO_PH6);
@@ -812,11 +807,6 @@ static void enterprise_audio_init(void)
ARRAY_SIZE(enterprise_audio_devices));
}
-static void enterprise_gps_init(void)
-{
- tegra_gpio_enable(TEGRA_GPIO_PE4);
- tegra_gpio_enable(TEGRA_GPIO_PE5);
-}
static struct baseband_power_platform_data tegra_baseband_power_data = {
.baseband_type = BASEBAND_XMM,
@@ -891,23 +881,11 @@ static void enterprise_baseband_init(void)
/* baseband-power.ko will register ehci2 device */
tegra_ehci2_device.dev.platform_data =
&tegra_ehci2_hsic_xmm_pdata;
- /* enable XMM6260 baseband gpio(s) */
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .mdm_reset);
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .mdm_on);
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .ap2mdm_ack);
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .mdm2ap_ack);
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .ap2mdm_ack2);
- tegra_gpio_enable(tegra_baseband_power_data.modem.generic
- .mdm2ap_ack2);
tegra_baseband_power_data.hsic_register =
&tegra_usb_hsic_host_register;
tegra_baseband_power_data.hsic_unregister =
&tegra_usb_hsic_host_unregister;
+
platform_device_register(&tegra_baseband_power_device);
platform_device_register(&tegra_baseband_power2_device);
break;
@@ -922,21 +900,6 @@ static void enterprise_baseband_init(void)
}
}
-static void enterprise_nfc_init(void)
-{
- struct board_info bi;
-
- tegra_gpio_enable(TEGRA_GPIO_PS4);
- tegra_gpio_enable(TEGRA_GPIO_PM6);
-
- /* Enable firmware GPIO PX7 for board E1205 */
- tegra_get_board_info(&bi);
- if (bi.board_id == BOARD_E1205 && bi.fab >= BOARD_FAB_A03) {
- nfc_pdata.firm_gpio = TEGRA_GPIO_PX7;
- tegra_gpio_enable(TEGRA_GPIO_PX7);
- }
-}
-
static void __init tegra_enterprise_init(void)
{
tegra_thermal_init(&thermal_data);
@@ -955,7 +918,6 @@ static void __init tegra_enterprise_init(void)
enterprise_kbc_init();
enterprise_touch_init();
enterprise_audio_init();
- enterprise_gps_init();
enterprise_baseband_init();
enterprise_panel_init();
enterprise_setup_bluesleep();
@@ -964,7 +926,6 @@ static void __init tegra_enterprise_init(void)
enterprise_suspend_init();
enterprise_bpc_mgmt_init();
tegra_release_bootloader_fb();
- enterprise_nfc_init();
}
static void __init tegra_enterprise_reserve(void)