ARM: tegra114: remove palmas pad configuration from platform data
Laxman Dewangan [Fri, 15 Mar 2013 11:33:48 +0000 (16:33 +0530)]
Palmas pad configuration can be done from the palma pincontrol driver
and hence it is not require to explicitly set the pad setting.

Remove this duplicate configuration.

bug 1242260
Bug 1249130
Bug 1249783

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/209994
(cherry picked from commit 7d9d52472a3266eb6ee3366e83b0ac1aaf20b9aa)

Change-Id: I08828e3dbba367a5a956d9dd50fb579dff2ccba7
Signed-off-by: Sumit Sharma <sumsharma@nvidia.com>
Reviewed-on: http://git-master/r/214917
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User

arch/arm/mach-tegra/board-dalmore-power.c
arch/arm/mach-tegra/board-macallan-power.c
arch/arm/mach-tegra/board-pluto-power.c
arch/arm/mach-tegra/board-roth-power.c

index 1a6ae51..6fc80ea 100644 (file)
@@ -813,10 +813,6 @@ static struct palmas_platform_data palmas_pdata = {
        .irq_base = PALMAS_TEGRA_IRQ_BASE,
        .pmic_pdata = &pmic_platform,
        .rtc_pdata = &rtc_platform,
-       .mux_from_pdata = true,
-       .pad1 = 0,
-       .pad2 = 0,
-       .pad3 = PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1,
        .use_power_off = true,
        .pinctrl_pdata = &palmas_pinctrl_pdata,
 };
index 5de1576..9c48ec0 100644 (file)
@@ -377,10 +377,6 @@ static struct palmas_platform_data palmas_pdata = {
        .gpio_base = PALMAS_TEGRA_GPIO_BASE,
        .irq_base = PALMAS_TEGRA_IRQ_BASE,
        .pmic_pdata = &pmic_platform,
-       .mux_from_pdata = true,
-       .pad1 = 0,
-       .pad2 = 0,
-       .pad3 = PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1,
        .use_power_off = true,
        .pinctrl_pdata = &palmas_pinctrl_pdata,
 };
index 4d7f971..f42f42d 100644 (file)
@@ -640,11 +640,6 @@ static struct palmas_platform_data palmas_pdata = {
        .gpio_base = PALMAS_TEGRA_GPIO_BASE,
        .irq_base = PALMAS_TEGRA_IRQ_BASE,
        .pmic_pdata = &pmic_platform,
-       .mux_from_pdata = true,
-       .pad1 = 0,
-       .pad2 = (PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_5_MASK &
-                       (1 << PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_5_SHIFT)),
-       .pad3 = PALMAS_PRIMARY_SECONDARY_PAD3_DVFS2,
        .clk32k_init_data =  palmas_clk32k_idata,
        .clk32k_init_data_size = ARRAY_SIZE(palmas_clk32k_idata),
        .irq_type = IRQ_TYPE_LEVEL_HIGH,
index a2986d8..6303134 100644 (file)
@@ -402,10 +402,6 @@ static struct palmas_platform_data palmas_pdata = {
        .gpio_base = PALMAS_TEGRA_GPIO_BASE,
        .irq_base = PALMAS_TEGRA_IRQ_BASE,
        .pmic_pdata = &pmic_platform,
-       .mux_from_pdata = true,
-       .pad1 = 0,
-       .pad2 = 0,
-       .pad3 = PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1,
        .use_power_off = true,
        .pinctrl_pdata = &palmas_pinctrl_pdata,
 };