Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[karo-tx-linux.git] / drivers / pinctrl / tegra / pinctrl-tegra30.c

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra30.c b/drivers/pinctrl/tegra/pinctrl-tegra30.c
index 47b2fd8bb2e9daba9b0209869fc211add86997fc..fb7817fea2d942d1a3a2cb98b1d3e3b7a8cddddf 100644 (file)
--- a/drivers/pinctrl/tegra/pinctrl-tegra30.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra30.c
@@ -2139,6 +2139,7 @@ static struct tegra_function tegra30_functions[] = {
                .lock_bit = 7,                                          \
                .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                .rcv_sel_bit = -1,                                      \
+               .parked_reg = -1,                                       \
                .drv_reg = -1,                                          \
        }
 
@@ -2159,6 +2160,7 @@ static struct tegra_function tegra30_functions[] = {
                .rcv_sel_bit = -1,                                      \
                .drv_reg = DRV_PINGROUP_REG(r),                         \
                .drv_bank = 0,                                          \
+               .parked_reg = -1,                                       \
                .hsm_bit = hsm_b,                                       \
                .schmitt_bit = schmitt_b,                               \
                .lpmd_bit = lpmd_b,                                     \
@@ -2498,7 +2500,6 @@ static struct platform_driver tegra30_pinctrl_driver = {
                .of_match_table = tegra30_pinctrl_of_match,
        },
        .probe = tegra30_pinctrl_probe,
-       .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra30_pinctrl_driver);