| Message ID | 1313189697-21287-13-git-send-email-swarren@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 13-08-2011 2:54, Stephen Warren wrote: > This reverts commit "arm/tegra: Prevent duplicate gpio/pinmux pdev Would be good to also include the commit ID for gitweb. > registration with dt"; board-dt.c no long calls harmony/ > seaboard_pinmux_init(), so the workaround is no longer needed. > Signed-off-by: Stephen Warren<swarren@nvidia.com> WBR, Sergei
Sergei Shtylyov wrote at Monday, August 15, 2011 5:13 AM: > Hello. > > On 13-08-2011 2:54, Stephen Warren wrote: > > > This reverts commit "arm/tegra: Prevent duplicate gpio/pinmux pdev > > Would be good to also include the commit ID for gitweb. I can't do that yet, because the commit that's being reverted is earlier in the patch series being posted, and hence doesn't have a commit ID that will be valid in any upstream repository. I suppose this is the last commit in the series though, so I could remove it and submit the revert separately once the rest is upstream. > > registration with dt"; board-dt.c no long calls harmony/ > > seaboard_pinmux_init(), so the workaround is no longer needed. > > > Signed-off-by: Stephen Warren<swarren@nvidia.com> > > WBR, Sergei
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c index 130018d..e99b456 100644 --- a/arch/arm/mach-tegra/board-harmony-pinmux.c +++ b/arch/arm/mach-tegra/board-harmony-pinmux.c @@ -14,8 +14,6 @@ * */ -#include <asm/mach-types.h> - #include <linux/kernel.h> #include <linux/gpio.h> #include <mach/pinmux.h> @@ -163,8 +161,7 @@ static struct tegra_gpio_table gpio_table[] = { void harmony_pinmux_init(void) { - if (machine_is_harmony()) - platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); + platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux)); diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c index bc4dc17..f092298 100644 --- a/arch/arm/mach-tegra/board-seaboard-pinmux.c +++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c @@ -12,8 +12,6 @@ * */ -#include <asm/mach-types.h> - #include <linux/kernel.h> #include <linux/init.h> #include <linux/gpio.h> @@ -178,8 +176,7 @@ static struct tegra_gpio_table gpio_table[] = { void __init seaboard_pinmux_init(void) { - if (machine_is_seaboard()) - platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); + platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));
This reverts commit "arm/tegra: Prevent duplicate gpio/pinmux pdev registration with dt"; board-dt.c no long calls harmony/ seaboard_pinmux_init(), so the workaround is no longer needed. Signed-off-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/mach-tegra/board-harmony-pinmux.c | 5 +---- arch/arm/mach-tegra/board-seaboard-pinmux.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-)