linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sven Peter <sven@svenpeter.dev>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: "Sven Peter" <sven@svenpeter.dev>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Guido Günther" <agx@sigxcpu.org>,
	"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Hector Martin" <marcan@marcan.st>,
	"Mohamed Mediouni" <mohamed.mediouni@caramail.com>,
	"Stan Skowronek" <stan@corellium.com>,
	"Mark Kettenis" <mark.kettenis@xs4all.nl>,
	"Alexander Graf" <graf@amazon.com>,
	"Alyssa Rosenzweig" <alyssa@rosenzweig.io>
Subject: [RFT PATCH 2/9] usb: typec: tipd: Prepare supporting different variants
Date: Sat, 18 Sep 2021 14:09:27 +0200	[thread overview]
Message-ID: <20210918120934.28252-3-sven@svenpeter.dev> (raw)
In-Reply-To: <20210918120934.28252-1-sven@svenpeter.dev>

Apple M1 machines come with a variant of the TI TPS6598x and will need
some changes to the current logic. Let's prepare for that by setting up
the infrastructure required to support different variants of this chip
identified by the DT compatible.

Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
 drivers/usb/typec/tipd/core.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 21b3ae25c76d..656020e7f533 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -9,6 +9,7 @@
 #include <linux/i2c.h>
 #include <linux/acpi.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/power_supply.h>
 #include <linux/regmap.h>
 #include <linux/interrupt.h>
@@ -76,6 +77,10 @@ static const char *const modes[] = {
 /* Unrecognized commands will be replaced with "!CMD" */
 #define INVALID_CMD(_cmd_)		(_cmd_ == 0x444d4321)
 
+struct tps6598x_hw {
+};
+static const struct tps6598x_hw ti_tps6598x_data;
+
 struct tps6598x {
 	struct device *dev;
 	struct regmap *regmap;
@@ -91,6 +96,8 @@ struct tps6598x {
 	struct power_supply *psy;
 	struct power_supply_desc psy_desc;
 	enum power_supply_usb_type usb_type;
+
+	const struct tps6598x_hw *hw;
 };
 
 static enum power_supply_property tps6598x_psy_props[] = {
@@ -590,6 +597,13 @@ static int tps6598x_probe(struct i2c_client *client)
 	if (!tps)
 		return -ENOMEM;
 
+	if (client->dev.of_node)
+		tps->hw = of_device_get_match_data(&client->dev);
+	else
+		tps->hw = &ti_tps6598x_data;
+	if (!tps->hw)
+		return -EINVAL;
+
 	mutex_init(&tps->lock);
 	tps->dev = &client->dev;
 
@@ -729,8 +743,11 @@ static int tps6598x_remove(struct i2c_client *client)
 	return 0;
 }
 
+static const struct tps6598x_hw ti_tps6598x_data = {
+};
+
 static const struct of_device_id tps6598x_of_match[] = {
-	{ .compatible = "ti,tps6598x", },
+	{ .compatible = "ti,tps6598x", .data = &ti_tps6598x_data },
 	{}
 };
 MODULE_DEVICE_TABLE(of, tps6598x_of_match);
-- 
2.25.1


  parent reply	other threads:[~2021-09-18 12:10 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-18 12:09 [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Sven Peter
2021-09-18 12:09 ` [RFT PATCH 1/9] dt-bindings: usb: tps6598x: Add Apple CD321x compatible Sven Peter
2021-09-19 11:25   ` Alyssa Rosenzweig
2021-09-22 20:38   ` Rob Herring
2021-09-18 12:09 ` Sven Peter [this message]
2021-09-19 11:27   ` [RFT PATCH 2/9] usb: typec: tipd: Prepare supporting different variants Alyssa Rosenzweig
2021-09-21 13:10   ` Heikki Krogerus
2021-09-22 14:55     ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 3/9] usb: typec: tipd: Allow irq controller selection Sven Peter
2021-09-19 11:28   ` Alyssa Rosenzweig
2021-09-21 13:21   ` Heikki Krogerus
2021-09-22 14:56     ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 4/9] usb: typec: tipd: Add short-circuit for no irqs Sven Peter
2021-09-21 13:23   ` Heikki Krogerus
2021-09-18 12:09 ` [RFT PATCH 5/9] usb: typec: tipd: Allow to configure irq bits Sven Peter
2021-09-21 13:34   ` Heikki Krogerus
2021-09-22 14:58     ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 6/9] usb: typec: tipd: Setup IntMask explicitly Sven Peter
2021-09-19 11:31   ` Alyssa Rosenzweig
2021-09-21 13:40   ` Heikki Krogerus
2021-09-22 14:58     ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 7/9] usb: typec: tipd: Add support for apple,cd321x Sven Peter
2021-09-19 11:32   ` Alyssa Rosenzweig
2021-09-18 12:09 ` [RFT PATCH 8/9] usb: typec: tipd: Switch power state to S0 for Apple variant Sven Peter
2021-09-19 11:33   ` Alyssa Rosenzweig
2021-09-21 13:46   ` Heikki Krogerus
2021-09-22 15:00     ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 9/9] usb: typec: tipd: Remove FIXME about testing with I2C_FUNC_I2C Sven Peter
2021-09-19 11:33   ` Alyssa Rosenzweig
2021-09-21 13:41   ` Heikki Krogerus
2021-09-19 11:35 ` [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Alyssa Rosenzweig

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=20210918120934.28252-3-sven@svenpeter.dev \
    --to=sven@svenpeter.dev \
    --cc=agx@sigxcpu.org \
    --cc=alyssa@rosenzweig.io \
    --cc=bryan.odonoghue@linaro.org \
    --cc=graf@amazon.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=marcan@marcan.st \
    --cc=mark.kettenis@xs4all.nl \
    --cc=mohamed.mediouni@caramail.com \
    --cc=stan@corellium.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).