From: Lubomir Rintel <lkundrak@v3.sk> To: Mark Brown <broonie@kernel.org>, Geert Uytterhoeven <geert+renesas@glider.be>, Darren Hart <dvhart@infradead.org>, Andy Shevchenko <andy@infradead.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, James Cameron <quozl@laptop.org>, Sebastian Reichel <sre@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Eric Miao <eric.y.miao@gmail.com>, Haojian Zhuang <haojian.zhuang@gmail.com>, Daniel Mack <daniel@zonque.org>, Robert Jarzmik <robert.jarzmik@free.fr>, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, platform-driver-x86@vger.kernel.org, devel@driverdev.osuosl.org, linux-pm@vger.kernel.org, Lubomir Rintel <lkundrak@v3.sk> Subject: [PATCH v2 13/17] power: supply: olpc_battery: Use DT to get battery version Date: Fri, 16 Nov 2018 17:23:59 +0100 [thread overview] Message-ID: <20181116162403.49854-14-lkundrak@v3.sk> (raw) In-Reply-To: <20181116162403.49854-1-lkundrak@v3.sk> Avoid using the x86 OLPC platform specific call to get the board version. It won't work on FDT-based ARM MMP2 platform. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> --- Changes since v1: - Sort the new include a bit higher drivers/power/supply/olpc_battery.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c index 5a97e42a3547..5323987d9284 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/err.h> #include <linux/device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/jiffies.h> @@ -622,11 +623,13 @@ static int olpc_battery_probe(struct platform_device *pdev) olpc_ac = power_supply_register(&pdev->dev, &olpc_ac_desc, NULL); if (IS_ERR(olpc_ac)) return PTR_ERR(olpc_ac); - - if (olpc_board_at_least(olpc_board_pre(0xd0))) { /* XO-1.5 */ + if (of_property_match_string(pdev->dev.of_node, "compatible", + "olpc,xo1.5-battery") >= 0) { + /* XO-1.5 */ olpc_bat_desc.properties = olpc_xo15_bat_props; olpc_bat_desc.num_properties = ARRAY_SIZE(olpc_xo15_bat_props); - } else { /* XO-1 */ + } else { + /* XO-1 */ olpc_bat_desc.properties = olpc_xo1_bat_props; olpc_bat_desc.num_properties = ARRAY_SIZE(olpc_xo1_bat_props); } @@ -672,6 +675,7 @@ static int olpc_battery_remove(struct platform_device *pdev) static const struct of_device_id olpc_battery_ids[] = { { .compatible = "olpc,xo1-battery" }, + { .compatible = "olpc,xo1.5-battery" }, {} }; MODULE_DEVICE_TABLE(of, olpc_battery_ids); -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: lkundrak@v3.sk (Lubomir Rintel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 13/17] power: supply: olpc_battery: Use DT to get battery version Date: Fri, 16 Nov 2018 17:23:59 +0100 [thread overview] Message-ID: <20181116162403.49854-14-lkundrak@v3.sk> (raw) In-Reply-To: <20181116162403.49854-1-lkundrak@v3.sk> Avoid using the x86 OLPC platform specific call to get the board version. It won't work on FDT-based ARM MMP2 platform. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> --- Changes since v1: - Sort the new include a bit higher drivers/power/supply/olpc_battery.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c index 5a97e42a3547..5323987d9284 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/err.h> #include <linux/device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/jiffies.h> @@ -622,11 +623,13 @@ static int olpc_battery_probe(struct platform_device *pdev) olpc_ac = power_supply_register(&pdev->dev, &olpc_ac_desc, NULL); if (IS_ERR(olpc_ac)) return PTR_ERR(olpc_ac); - - if (olpc_board_at_least(olpc_board_pre(0xd0))) { /* XO-1.5 */ + if (of_property_match_string(pdev->dev.of_node, "compatible", + "olpc,xo1.5-battery") >= 0) { + /* XO-1.5 */ olpc_bat_desc.properties = olpc_xo15_bat_props; olpc_bat_desc.num_properties = ARRAY_SIZE(olpc_xo15_bat_props); - } else { /* XO-1 */ + } else { + /* XO-1 */ olpc_bat_desc.properties = olpc_xo1_bat_props; olpc_bat_desc.num_properties = ARRAY_SIZE(olpc_xo1_bat_props); } @@ -672,6 +675,7 @@ static int olpc_battery_remove(struct platform_device *pdev) static const struct of_device_id olpc_battery_ids[] = { { .compatible = "olpc,xo1-battery" }, + { .compatible = "olpc,xo1.5-battery" }, {} }; MODULE_DEVICE_TABLE(of, olpc_battery_ids); -- 2.19.1
next prev parent reply other threads:[~2018-11-16 16:25 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-16 16:23 [PATCH v2 0/17] Add support for OLPC XO 1.75 Embedded Controller Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 01/17] power: supply: olpc_battery: correct the temperature units Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-12-05 21:05 ` Sebastian Reichel 2018-12-05 21:05 ` Sebastian Reichel 2018-11-16 16:23 ` [PATCH v2 02/17] dt-bindings: olpc,xo1.75-ec: Add OLPC XO-1.75 EC bindings Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 02/17] dt-bindings: olpc, xo1.75-ec: " Lubomir Rintel 2018-11-17 16:03 ` [PATCH v2 02/17] dt-bindings: olpc,xo1.75-ec: " Rob Herring 2018-11-17 16:03 ` Rob Herring 2018-11-17 16:03 ` Rob Herring 2018-11-16 16:23 ` [PATCH v2 03/17] Platform: OLPC: Remove an unused include Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 04/17] Revert "platform/olpc: Make ec explicitly non-modular" Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 05/17] Platform: OLPC: Move OLPC config symbol out of x86 tree Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 06/17] Platform: OLPC: Add XO-1.75 EC driver Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-12-02 23:13 ` Darren Hart 2018-12-02 23:13 ` Darren Hart 2018-12-02 23:13 ` Darren Hart 2018-12-03 7:54 ` Andy Shevchenko 2018-12-03 7:54 ` Andy Shevchenko 2018-12-03 7:54 ` Andy Shevchenko 2018-12-03 7:54 ` Andy Shevchenko 2018-11-16 16:23 ` [PATCH v2 07/17] Platform: OLPC: Avoid a warning if the EC didn't register yet Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-12-02 23:15 ` Darren Hart 2018-12-02 23:15 ` Darren Hart 2018-12-02 23:15 ` Darren Hart 2018-11-16 16:23 ` [PATCH v2 08/17] Platform: OLPC: Move EC-specific functionality out from x86 Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 09/17] Platform: OLPC: Use BIT() and GENMASK() for event masks Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 10/17] Platform: OLPC: add a regulator for the DCON Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` [PATCH v2 11/17] dt-bindings: olpc_battery: Add XO-1.5 battery Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-12-05 20:53 ` Sebastian Reichel 2018-12-05 20:53 ` Sebastian Reichel 2018-11-16 16:23 ` [PATCH v2 12/17] x86, olpc: Use a correct version when making up a battery node Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel 2018-11-16 16:23 ` Lubomir Rintel [this message] 2018-11-16 16:23 ` [PATCH v2 13/17] power: supply: olpc_battery: Use DT to get battery version Lubomir Rintel 2018-12-02 23:24 ` Darren Hart 2018-12-02 23:24 ` Darren Hart 2018-12-02 23:24 ` Darren Hart 2018-12-05 20:54 ` Sebastian Reichel 2018-12-05 20:54 ` Sebastian Reichel 2019-01-07 18:25 ` Lubomir Rintel 2019-01-07 18:25 ` Lubomir Rintel 2019-01-07 18:25 ` Lubomir Rintel 2018-11-16 16:24 ` [PATCH v2 14/17] power: supply: olpc_battery: Move priv data to a struct Lubomir Rintel 2018-11-16 16:24 ` Lubomir Rintel 2018-12-05 20:57 ` Sebastian Reichel 2018-12-05 20:57 ` Sebastian Reichel 2018-12-05 20:57 ` Sebastian Reichel 2018-11-16 16:24 ` [PATCH v2 15/17] power: supply: olpc_battery: Use devm_power_supply_register() Lubomir Rintel 2018-11-16 16:24 ` Lubomir Rintel 2018-12-05 20:58 ` Sebastian Reichel 2018-12-05 20:58 ` Sebastian Reichel 2018-12-05 20:58 ` Sebastian Reichel 2018-11-16 16:24 ` [PATCH v2 16/17] power: supply: olpc_battery: Avoid using platform_info Lubomir Rintel 2018-11-16 16:24 ` Lubomir Rintel 2018-12-05 20:59 ` Sebastian Reichel 2018-12-05 20:59 ` Sebastian Reichel 2018-11-16 16:24 ` [PATCH v2 17/17] power: supply: olpc_battery: Add OLPC XO 1.75 support Lubomir Rintel 2018-11-16 16:24 ` Lubomir Rintel 2018-11-16 16:24 ` Lubomir Rintel 2018-12-02 23:34 ` Darren Hart 2018-12-02 23:34 ` Darren Hart 2018-12-02 23:34 ` Darren Hart 2019-01-07 18:02 ` Lubomir Rintel 2019-01-07 18:02 ` Lubomir Rintel
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=20181116162403.49854-14-lkundrak@v3.sk \ --to=lkundrak@v3.sk \ --cc=andy@infradead.org \ --cc=broonie@kernel.org \ --cc=daniel@zonque.org \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=dvhart@infradead.org \ --cc=eric.y.miao@gmail.com \ --cc=geert+renesas@glider.be \ --cc=gregkh@linuxfoundation.org \ --cc=haojian.zhuang@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=platform-driver-x86@vger.kernel.org \ --cc=quozl@laptop.org \ --cc=robert.jarzmik@free.fr \ --cc=robh+dt@kernel.org \ --cc=sre@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: linkBe 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.