summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-loki-fan.c
diff options
context:
space:
mode:
authorAnshul Jain <anshulj@nvidia.com>2013-11-01 20:38:51 -0700
committerSachin Nikam <snikam@nvidia.com>2013-11-08 21:15:39 -0800
commit99aba650b7f67b8ba09e057ee1eca3788e890636 (patch)
tree119f6e65380bf4d086fde4d1cbf48778ae55756c /arch/arm/mach-tegra/board-loki-fan.c
parent2636273c055dbb909b716e524e11a76dda34e807 (diff)
arm: tegra: loki: Add pwm gpio
Add pwm gpio in fan data, so it can be accessed by pwm_fan driver. Bug 1388303 Bug 1399542 Change-Id: I300723451556af611252fead806bef894d8b9355 Signed-off-by: Anshul Jain <anshulj@nvidia.com> Reviewed-on: http://git-master/r/325898 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Tao Xie <txie@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-loki-fan.c')
-rw-r--r--arch/arm/mach-tegra/board-loki-fan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-loki-fan.c b/arch/arm/mach-tegra/board-loki-fan.c
index b493a908b969..4049f94ea172 100644
--- a/arch/arm/mach-tegra/board-loki-fan.c
+++ b/arch/arm/mach-tegra/board-loki-fan.c
@@ -47,6 +47,7 @@ static struct pwm_fan_platform_data fan_data_delta_6k = {
.state_cap = 2,
.precision_multiplier = 1024,
.tach_gpio = TEGRA_GPIO_PU2,
+ .pwm_gpio = TEGRA_GPIO_PU3,
};
static struct platform_device pwm_fan_therm_cooling_device_delta_6k = {
@@ -70,7 +71,6 @@ int __init loki_fan_init(void)
pr_err("FAN:gpio request failed\n");
return err;
}
- gpio_free(TEGRA_GPIO_PU3);
platform_device_register(
&pwm_fan_therm_cooling_device_delta_6k);