summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board-dt.c
diff options
context:
space:
mode:
authorStephen Warren2011-12-16 23:12:32 +0100
committerOlof Johansson2011-12-20 03:03:11 +0100
commita58116f331fd30462b4a7372725e090e1a7d0eb7 (patch)
treef095c9fba0e480bc4449a4ee4893cb52525017b0 /arch/arm/mach-tegra/board-dt.c
parentarm/tegra: Refactor board-*-pinmux.c to share code (diff)
downloadkernel-qcow2-linux-a58116f331fd30462b4a7372725e090e1a7d0eb7.tar.gz
kernel-qcow2-linux-a58116f331fd30462b4a7372725e090e1a7d0eb7.tar.xz
kernel-qcow2-linux-a58116f331fd30462b4a7372725e090e1a7d0eb7.zip
arm/tegra: Use bus notifiers to trigger pinmux setup
Currently, the Tegra pinmux is initialized at different times when booting with and without device tree: Without device tree: 1) Pinmux and GPIO drivers are registered. 2) Pinmux is configured. 3) All other drivers are registered. With device tree: 1) All drivers are registered and probed, including pinmux and GPIO. 2) Pinmux is configured. This change modifies board-pinmux.c to detect pinmux and GPIO driver registration using bus notifiers. This allows pinmux configuration to happen immediately after the pinmux driver is probed, irrespective of whether the pinmux driver is manually registered by board-pinmux.c, or if it's instantiated during device tree parsing. To support this with device tree, the pinmux init functions must be called prior to instantiating devices from device tree, so that the notifiers are set up before-hand. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board-dt.c')
-rw-r--r--arch/arm/mach-tegra/board-dt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
index 96f4df598238..909065f62e38 100644
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@ -103,13 +103,6 @@ static void __init tegra_dt_init(void)
tegra_clk_init_from_table(tegra_dt_clk_init_table);
- /*
- * Finished with the static registrations now; fill in the missing
- * devices
- */
- of_platform_populate(NULL, tegra_dt_match_table,
- tegra20_auxdata_lookup, NULL);
-
for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
if (of_machine_is_compatible(pinmux_configs[i].machine)) {
pinmux_configs[i].init();
@@ -119,6 +112,13 @@ static void __init tegra_dt_init(void)
WARN(i == ARRAY_SIZE(pinmux_configs),
"Unknown platform! Pinmuxing not initialized\n");
+
+ /*
+ * Finished with the static registrations now; fill in the missing
+ * devices
+ */
+ of_platform_populate(NULL, tegra_dt_match_table,
+ tegra20_auxdata_lookup, NULL);
}
static const char * tegra_dt_board_compat[] = {