aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-04-18 16:46:48 +0200
committerSebastian Reichel <sebastian.reichel@collabora.com>2019-04-18 21:51:36 +0200
commit47e120d3337b83ac6de2ebc622b3c9b6c1a9f315 (patch)
tree158c3f8ab7cf6697b7a3412ff81929f762b6a477 /arch/x86/platform
parentx86/platform/olpc: Don't split string literals when fixing up the DT (diff)
downloadlinux-dev-47e120d3337b83ac6de2ebc622b3c9b6c1a9f315.tar.xz
linux-dev-47e120d3337b83ac6de2ebc622b3c9b6c1a9f315.zip
x86/platform/olpc: Trivial code move in DT fixup
This makes the following patch more concise. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/olpc/olpc_dt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index 87e1d81684c6..820236b511b3 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -241,11 +241,6 @@ void __init olpc_dt_fixup(void)
pr_info("PROM DT: Old firmware detected, applying fixes\n");
- /* Add olpc,xo1-battery compatible marker to battery node */
- olpc_dt_interpret("\" /battery@0\" find-device");
- olpc_dt_interpret(" \" olpc,xo1-battery\" +compatible");
- olpc_dt_interpret("device-end");
-
board_rev = olpc_dt_get_board_revision();
if (!board_rev)
return;
@@ -271,6 +266,11 @@ void __init olpc_dt_fixup(void)
olpc_dt_interpret(" \" olpc,xo1-rtc\" +compatible");
olpc_dt_interpret("device-end");
}
+
+ /* Add olpc,xo1-battery compatible marker to battery node */
+ olpc_dt_interpret("\" /battery@0\" find-device");
+ olpc_dt_interpret(" \" olpc,xo1-battery\" +compatible");
+ olpc_dt_interpret("device-end");
}
void __init olpc_dt_build_devicetree(void)