All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lubomir Rintel <lkundrak@v3.sk>
To: Sebastian Reichel <sre@kernel.org>
Cc: Darren Hart <dvhart@infradead.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	x86@kernel.org, linux-pm@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lubomir Rintel <lkundrak@v3.sk>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH v7 03/10] x86/platform/olpc: Trivial code move in DT fixup
Date: Thu, 18 Apr 2019 16:46:48 +0200	[thread overview]
Message-ID: <20190418144655.18758-4-lkundrak@v3.sk> (raw)
In-Reply-To: <20190418144655.18758-1-lkundrak@v3.sk>

This makes the following patch more concise.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Thomas Gleixner <tglx@linutronix.de>

---
Changes since v6:
- Collect ack from Thomas Gleixner
- Fix the subject prefix to "x86/platform/olpc:"

Changes since v5:
- This patch was split off from "x86, olpc: Use a correct version when
  making up a battery node"

 arch/x86/platform/olpc/olpc_dt.c | 10 +++++-----
 1 file 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)
-- 
2.21.0


  parent reply	other threads:[~2019-04-18 14:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-18 14:46 [PATCH v7 00/10] Add support for XO 1.75 to OLPC battery driver Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 01/10] dt-bindings: olpc_battery: Add XO-1.5 battery Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 02/10] x86/platform/olpc: Don't split string literals when fixing up the DT Lubomir Rintel
2019-04-18 14:46 ` Lubomir Rintel [this message]
2019-04-18 14:46 ` [PATCH v7 04/10] x86/platform/olpc: Use a correct version when making up a battery node Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 05/10] power: supply: olpc_battery: Use DT to get battery version Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 06/10] power: supply: olpc_battery: Move priv data to a struct Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 07/10] power: supply: olpc_battery: Use devm_power_supply_register() Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 08/10] power: supply: olpc_battery: Avoid using platform_info Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 09/10] power: supply: olpc_battery: Add OLPC XO 1.75 support Lubomir Rintel
2019-04-18 14:46 ` [PATCH v7 10/10] power: supply: olpc_battery: Have the framework register sysfs files for us Lubomir Rintel
2019-04-18 20:20 ` [PATCH v7 00/10] Add support for XO 1.75 to OLPC battery driver Sebastian Reichel
2019-04-19  7:57   ` Ingo Molnar
2019-04-19 12:42     ` Sebastian Reichel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190418144655.18758-4-lkundrak@v3.sk \
    --to=lkundrak@v3.sk \
    --cc=devicetree@vger.kernel.org \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=sre@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.