@@ -14,6 +14,8 @@
*
*/
+#include <asm/mach-types.h>
+
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <mach/pinmux.h>
@@ -161,7 +163,8 @@ static struct tegra_gpio_table gpio_table[] = {
void harmony_pinmux_init(void)
{
- platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+ if (machine_is_harmony())
+ platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));
@@ -12,6 +12,8 @@
*
*/
+#include <asm/mach-types.h>
+
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/gpio.h>
@@ -176,7 +178,8 @@ static struct tegra_gpio_table gpio_table[] = {
void __init seaboard_pinmux_init(void)
{
- platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+ if (machine_is_seaboard())
+ platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));
A future change will set up complete gpio and pinmux platform device registration in device-tree files, via board-dt.c. When board-dt.c calls into harmony/seaboard_pinmux_init(), this will cause a duplicate registration of those platform devices, which will kernel boot failure. To solve this, modify so that it only registers the platform devices when actually running on Harmony; when board-dt.c is in use, a different machine type is used. This change is a temporary measure to ensure git bisectability. It will be reverted when board-dt.c no longer calls harmony/seaboard_pinmux_init(). 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, 8 insertions(+), 2 deletions(-)