From nobody Fri Oct 2 11:42:33 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B73A23D7F4; Sat, 1 Aug 2026 21:30:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; cv=none; b=Ck2tHgJowLKH1p8goMJpYY/xm1xPIdakkIJWDnm5ZQKUaumbzlYpdGUePIWdd7EBhksOX8T8cJBh/n/qMp3Pd+OH+L7obuZNq/QbyEPFJAt9N2Qcz8p4lteW7b0rzX7exsMiwxUFuYIeG3I5532tchHIbn1Ay/+My0YCeJIEIXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; c=relaxed/simple; bh=HLfrMJHx/3cQgTp030Hr466tjj0ppbN8Q6eIcTsqdII=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z83IObqoOpoExlsa2ceNK4bdM7S4YmzRXk+7vOLDPnFXUvPe5qnF2ejBlaPANPx8NRM4iEmFhlgDIPb3sv5ViLdEqtxsiGWuppLVc7yRp+uZ6PtFTrFsddqfsoKNLHuiPTj+dlj85zEGNQV8JTlplwxcF2clQlUoEch4bM88v68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=XX3PbnFF; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="XX3PbnFF" Received: by chaosmail.tech (Postfix) id CCED31C8806; Sat, 01 Aug 2026 21:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785619846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W5DiJCajdy+f7EAjWHD0E6m9Wp5JC04xl4hwWKQ+e9c=; b=XX3PbnFFhcBab/JiHRgdr+ShETJaKijGaYSqjSXtIHqzcuxBt43qaZb1HV5Z0ZWCMRMDY4 guUKhP0wBSJeOlSyhSCeXqvCPVwOYrFgVYH6p1ZlWWWz+HmMZyatqNFoxRxFrewvll2TYf c12WMU60KHaZ8YSZ1YGjMa9AUh6G1lk= From: Sasha Finkelstein Date: Sat, 01 Aug 2026 23:30:10 +0200 Subject: [PATCH v3 1/3] dt-bindings: usb: tps6598x: Add sn201202x/ACE3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260801-tipd-ace3-v3-1-8332f2eca4fc@chaosmail.tech> References: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> In-Reply-To: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> To: Sven Peter , Janne Grunau , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heikki Krogerus Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein X-Developer-Signature: v=1; a=ed25519-sha256; t=1785619844; l=3417; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=HLfrMJHx/3cQgTp030Hr466tjj0ppbN8Q6eIcTsqdII=; b=fnwe289chuPE9v/l46w3ff20w4AAZbUW8EQVgRPqi5IUGsWaMTPPjImNesR4Fe+oH8VD2VcrW sqmITGOw1qFCYlrn33TJWUA30X4gg1FiZFbMBTc0x0mk++XPUt6/UNB X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= A variant of tps6598x that is attached to a SPMI bus and is found on Apple devices starting from the M3 series Signed-off-by: Sasha Finkelstein --- Documentation/devicetree/bindings/usb/apple,sn201202x.yaml | 78 ++++++++++= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 79 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/apple,sn201202x.yaml b/D= ocumentation/devicetree/bindings/usb/apple,sn201202x.yaml new file mode 100644 index 000000000000..133a71bbedb7 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/apple,sn201202x.yaml @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/apple,sn201202x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments sn201202x Type-C Power Delivery controller + +maintainers: + - Sasha Finkelstein + +description: | + Texas Instruments sn201202x Type-C Power Delivery controller + + A variant of tps6598x controller also known as Apple ACE3 + present on hardware with Apple SoCs starting from the M3. + +properties: + compatible: + enum: + - apple,sn201202x + + reg: + maxItems: 1 + + interrupts: + items: + - description: Primary irq used for tps6598x events + - description: Logical register selection completed + - description: Standby command completed + - description: Wakeup command completed + + interrupt-names: + items: + - const: irq + - const: select + - const: sleep + - const: wake + + connector: + $ref: /schemas/connector/usb-connector.yaml# + +required: + - compatible + - reg + - interrupts + - interrupt-names + +additionalProperties: false + +examples: + - | + #include + #include + spmi { + #address-cells =3D <2>; + #size-cells =3D <0>; + usb-pd@c { + compatible =3D "apple,sn201202x"; + reg =3D <0xc SPMI_USID>; + interrupts =3D <11 IRQ_TYPE_EDGE_RISING>, + <13 IRQ_TYPE_EDGE_RISING>, + <17 IRQ_TYPE_EDGE_RISING>, + <19 IRQ_TYPE_EDGE_RISING>; + interrupt-names =3D "irq", "select", "sleep", "wake"; + + connector { + compatible =3D "usb-c-connector"; + label =3D "USB-C"; + + port { + typec_ep: endpoint { + remote-endpoint =3D <&otg_ep>; + }; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index ff08a65d942a..b2819ca62e0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2610,6 +2610,7 @@ F: Documentation/devicetree/bindings/rtc/apple,smc-rt= c.yaml F: Documentation/devicetree/bindings/spi/apple,spi.yaml F: Documentation/devicetree/bindings/spmi/apple,spmi.yaml F: Documentation/devicetree/bindings/usb/apple,dwc3.yaml +F: Documentation/devicetree/bindings/usb/apple,sn201202x.yaml F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml F: Documentation/hwmon/macsmc-hwmon.rst F: arch/arm64/boot/dts/apple/ --=20 2.55.0 From nobody Fri Oct 2 11:42:33 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F08F835202B; Sat, 1 Aug 2026 21:30:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; cv=none; b=h6K2sk9On/yDzj9KmPjOmTiO1j+NK1t/t1hYOsKKtFv9EwQnXCA9ef0u+sDDoNNSzPs9P+apsibRNYV82O1HwjX2SIiYOxH2PLZ3x++ysoSD1DFmgg/j6JmNdnd9fR2iG88qwQFXsDnif70XqHuUiDWw63q4TlhqpyDW4h+Ax5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; c=relaxed/simple; bh=VLcTosJGv95oDVbNcDX+n0/hpCugYWCZ9CPRKZ45KEg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X8eKTvEgatiZ8q06dR1OGGk5uz0AbyKtsOrPrRBaJYBJ2K2Re6W36BwjaeZZztpeu9T0LoWJ8A1lncRLacFlpu+a6gd/0hrI29iSA7yD4rt3vssEefxHsh88zee0rvkDCAie6H8+63n7Xn6s+zZugIS1gJ8ANxqKzQagVlDkEl0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=ZB6n2yXp; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="ZB6n2yXp" Received: by chaosmail.tech (Postfix) id 931AD1C8820; Sat, 01 Aug 2026 21:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785619847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9sOhTC50i6GV28hiHDMXMoCnG5pbJsjNhocI4y4hReU=; b=ZB6n2yXpKJYynvz+IUTzThqDrsVmLsR5zZGLODjGRccukH8Wsl8pTW6hFMETrOysU4m0Qy zOdDlBkrpcp95J8SHQQN7FJLKsGXuMDKlgUe2C/uGZANL8fR/UKOy7PVYc2rFKlFqbTJeA kJIR9TXW9tUOwK4bRK0CFAlyX1f+VZM= From: Sasha Finkelstein Date: Sat, 01 Aug 2026 23:30:11 +0200 Subject: [PATCH v3 2/3] usb: typec: tipd: Factor out i2c specifics Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260801-tipd-ace3-v3-2-8332f2eca4fc@chaosmail.tech> References: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> In-Reply-To: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> To: Sven Peter , Janne Grunau , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heikki Krogerus Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Alyssa Milburn X-Developer-Signature: v=1; a=ed25519-sha256; t=1785619844; l=20417; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=Ecf2JiEq4QhMUrFV6KpHOyJOzhdnwRBXv4jL6qMkflQ=; b=ixbvfDcei0LTbj4mSLYi6LYwIm2EtePiDWDYaBN/PVSjH39+B7uWiYsIlEY20b4R8hx3bCZNn wu7ljmetGKmBBQaobqbo/d1eyfuqxejDf87ATJ5htu8KQY1kK1rLPTT X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alyssa Milburn Make the core driver more bus-agnostic to prepare for SPMI variants of the tipd chip Signed-off-by: Alyssa Milburn Signed-off-by: Sasha Finkelstein --- drivers/usb/typec/tipd/Kconfig | 8 ++++-- drivers/usb/typec/tipd/Makefile | 11 ++++--- drivers/usb/typec/tipd/core.c | 225 ++++++++++++++++++++++------------= ---------------------------------------------------------------------------= ---------------------------------- drivers/usb/typec/tipd/i2c.c | 104 ++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++++++ drivers/usb/typec/tipd/tps6598x.h | 115 ++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++ 5 files changed, 266 insertions(+), 197 deletions(-) diff --git a/drivers/usb/typec/tipd/Kconfig b/drivers/usb/typec/tipd/Kconfig index b82715293072..c87cbe6109ca 100644 --- a/drivers/usb/typec/tipd/Kconfig +++ b/drivers/usb/typec/tipd/Kconfig @@ -1,9 +1,13 @@ +config TYPEC_TPS6598X_CORE + tristate + select USB_ROLE_SWITCH + select POWER_SUPPLY + config TYPEC_TPS6598X tristate "TI TPS6598x USB Power Delivery controller driver" depends on I2C - select POWER_SUPPLY select REGMAP_I2C - select USB_ROLE_SWITCH + select TYPEC_TPS6598X_CORE help Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power Delivery controller. diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makef= ile index aa439f80a889..c741bf44f52f 100644 --- a/drivers/usb/typec/tipd/Makefile +++ b/drivers/usb/typec/tipd/Makefile @@ -1,6 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS_trace.o :=3D -I$(src) +CFLAGS_trace.o :=3D -I$(src) =20 -obj-$(CONFIG_TYPEC_TPS6598X) +=3D tps6598x.o -tps6598x-y :=3D core.o -tps6598x-$(CONFIG_TRACING) +=3D trace.o +obj-$(CONFIG_TYPEC_TPS6598X_CORE) +=3D tps6598x-core.o +tps6598x-core-y :=3D core.o +tps6598x-core-$(CONFIG_TRACING) +=3D trace.o + +obj-$(CONFIG_TYPEC_TPS6598X) +=3D tps6598x.o +tps6598x-y :=3D i2c.o diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index d5ee0af9058b..31098bdce109 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -9,11 +9,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -92,31 +90,6 @@ struct tps6598x_rx_identity_reg { struct usb_pd_identity identity; } __packed; =20 -/* TPS_REG_USB4_STATUS */ -struct tps6598x_usb4_status_reg { - u8 mode_status; - __le32 eudo; - __le32 unknown; -} __packed; - -/* TPS_REG_DP_SID_STATUS */ -struct tps6598x_dp_sid_status_reg { - u8 mode_status; - __le32 status_tx; - __le32 status_rx; - __le32 configure; - __le32 mode_data; -} __packed; - -/* TPS_REG_INTEL_VID_STATUS */ -struct tps6598x_intel_vid_status_reg { - u8 mode_status; - __le32 attention_vdo; - __le16 enter_vdo; - __le16 device_mode; - __le16 cable_mode; -} __packed; - /* Standard Task return codes */ #define TPS_TASK_TIMEOUT 1 #define TPS_TASK_REJECTED 3 @@ -143,81 +116,6 @@ static const char *const modes[] =3D { /* Unrecognized commands will be replaced with "!CMD" */ #define INVALID_CMD(_cmd_) (_cmd_ =3D=3D 0x444d4321) =20 -struct tps6598x; - -struct tipd_data { - irq_handler_t irq_handler; - u64 irq_mask1; - size_t tps_struct_size; - void (*remove)(struct tps6598x *tps); - int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node); - void (*unregister_port)(struct tps6598x *tps); - void (*trace_data_status)(u32 status); - void (*trace_power_status)(u16 status); - void (*trace_status)(u32 status); - int (*apply_patch)(struct tps6598x *tps); - int (*init)(struct tps6598x *tps); - int (*switch_power_state)(struct tps6598x *tps, u8 target_state); - bool (*read_data_status)(struct tps6598x *tps); - int (*reset)(struct tps6598x *tps); - int (*connect)(struct tps6598x *tps, u32 status); -}; - -struct tps6598x { - struct device *dev; - struct regmap *regmap; - struct mutex lock; /* device lock */ - u8 i2c_protocol:1; - - struct gpio_desc *reset; - struct typec_port *port; - struct typec_partner *partner; - struct usb_pd_identity partner_identity; - struct usb_role_switch *role_sw; - struct typec_capability typec_cap; - - struct power_supply *psy; - struct power_supply_desc psy_desc; - enum power_supply_usb_type usb_type; - - int wakeup; - u32 status; /* status reg */ - u32 data_status; - u16 pwr_status; - struct delayed_work wq_poll; - - const struct tipd_data *data; -}; - -struct cd321x_status { - u32 status; - u32 pwr_status; - u32 data_status; - u32 status_changed; - struct usb_pd_identity partner_identity; - struct tps6598x_dp_sid_status_reg dp_sid_status; - struct tps6598x_intel_vid_status_reg intel_vid_status; - struct tps6598x_usb4_status_reg usb4_status; -}; - -struct cd321x { - struct tps6598x tps; - - struct tps6598x_dp_sid_status_reg dp_sid_status; - struct tps6598x_intel_vid_status_reg intel_vid_status; - struct tps6598x_usb4_status_reg usb4_status; - - struct typec_altmode *port_altmode_dp; - struct typec_altmode *port_altmode_tbt; - - struct typec_mux *mux; - struct typec_mux_state state; - - struct cd321x_status update_status; - struct delayed_work update_work; - struct usb_pd_identity cur_partner_identity; -}; - static enum power_supply_property tps6598x_psy_props[] =3D { POWER_SUPPLY_PROP_USB_TYPE, POWER_SUPPLY_PROP_ONLINE, @@ -1087,11 +985,12 @@ static int tps6598x_check_mode(struct tps6598x *tps) return -ENODEV; } =20 -static const struct regmap_config tps6598x_regmap_config =3D { +const struct regmap_config tps6598x_regmap_config =3D { .reg_bits =3D 8, .val_bits =3D 8, .max_register =3D 0x7F, }; +EXPORT_SYMBOL_GPL(tps6598x_regmap_config); =20 static int tps6598x_psy_get_online(struct tps6598x *tps, union power_supply_propval *val) @@ -1738,27 +1637,13 @@ static void cd321x_remove(struct tps6598x *tps) cancel_delayed_work_sync(&cd321x->update_work); } =20 -static int tps6598x_probe(struct i2c_client *client) +int tipd_init(struct tps6598x *tps) { - const struct tipd_data *data; - struct tps6598x *tps; struct fwnode_handle *fwnode; u32 status; u32 vid; int ret; =20 - data =3D i2c_get_match_data(client); - if (!data) - return -EINVAL; - - tps =3D devm_kzalloc(&client->dev, data->tps_struct_size, GFP_KERNEL); - if (!tps) - return -ENOMEM; - - mutex_init(&tps->lock); - tps->dev =3D &client->dev; - tps->data =3D data; - tps->reset =3D devm_gpiod_get_optional(tps->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(tps->reset)) return dev_err_probe(tps->dev, PTR_ERR(tps->reset), @@ -1766,23 +1651,12 @@ static int tps6598x_probe(struct i2c_client *client) if (tps->reset) msleep(TPS_SETUP_MS); =20 - tps->regmap =3D devm_regmap_init_i2c(client, &tps6598x_regmap_config); - if (IS_ERR(tps->regmap)) - return PTR_ERR(tps->regmap); - if (!device_is_compatible(tps->dev, "ti,tps25750")) { ret =3D tps6598x_read32(tps, TPS_REG_VID, &vid); if (ret < 0 || !vid) return -ENODEV; } =20 - /* - * Checking can the adapter handle SMBus protocol. If it can not, the - * driver needs to take care of block reads separately. - */ - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) - tps->i2c_protocol =3D true; - if (tps->data->switch_power_state) { ret =3D tps->data->switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0); if (ret) @@ -1816,7 +1690,7 @@ static int tps6598x_probe(struct i2c_client *client) * with existing DT files, we work around this by deleting any * fwnode_links to/from this fwnode. */ - fwnode =3D device_get_named_child_node(&client->dev, "connector"); + fwnode =3D device_get_named_child_node(tps->dev, "connector"); if (fwnode) fw_devlink_purge_absent_suppliers(fwnode); =20 @@ -1842,14 +1716,14 @@ static int tps6598x_probe(struct i2c_client *client) goto err_unregister_port; ret =3D tps->data->connect(tps, status); if (ret) - dev_err(&client->dev, "failed to register partner\n"); + dev_err(tps->dev, "failed to register partner\n"); } =20 - if (client->irq) { - ret =3D devm_request_threaded_irq(&client->dev, client->irq, NULL, + if (tps->irq) { + ret =3D devm_request_threaded_irq(tps->dev, tps->irq, NULL, tps->data->irq_handler, IRQF_SHARED | IRQF_ONESHOT, - dev_name(&client->dev), tps); + dev_name(tps->dev), tps); } else { dev_warn(tps->dev, "Unable to find the interrupt, switching to polling\n= "); INIT_DELAYED_WORK(&tps->wq_poll, tps6598x_poll_work); @@ -1860,13 +1734,12 @@ static int tps6598x_probe(struct i2c_client *client) if (ret) goto err_disconnect; =20 - i2c_set_clientdata(client, tps); fwnode_handle_put(fwnode); =20 tps->wakeup =3D device_property_read_bool(tps->dev, "wakeup-source"); - if (tps->wakeup && client->irq) { - devm_device_init_wakeup(&client->dev); - enable_irq_wake(client->irq); + if (tps->wakeup && tps->irq) { + devm_device_init_wakeup(tps->dev); + enable_irq_wake(tps->irq); } =20 return 0; @@ -1887,15 +1760,14 @@ static int tps6598x_probe(struct i2c_client *client) =20 return ret; } +EXPORT_SYMBOL_GPL(tipd_init); =20 -static void tps6598x_remove(struct i2c_client *client) +void tipd_remove(struct tps6598x *tps) { - struct tps6598x *tps =3D i2c_get_clientdata(client); - - if (!client->irq) + if (!tps->irq) cancel_delayed_work_sync(&tps->wq_poll); else - devm_free_irq(tps->dev, client->irq, tps); + devm_free_irq(tps->dev, tps->irq, tps); =20 if (tps->data->remove) tps->data->remove(tps); @@ -1910,29 +1782,26 @@ static void tps6598x_remove(struct i2c_client *clie= nt) if (tps->reset) gpiod_set_value_cansleep(tps->reset, 1); } +EXPORT_SYMBOL_GPL(tipd_remove); =20 -static int __maybe_unused tps6598x_suspend(struct device *dev) +int tipd_suspend(struct tps6598x *tps) { - struct i2c_client *client =3D to_i2c_client(dev); - struct tps6598x *tps =3D i2c_get_clientdata(client); - if (tps->wakeup) { - disable_irq(client->irq); - enable_irq_wake(client->irq); + disable_irq(tps->irq); + enable_irq_wake(tps->irq); } else if (tps->reset) { gpiod_set_value_cansleep(tps->reset, 1); } =20 - if (!client->irq) + if (!tps->irq) cancel_delayed_work_sync(&tps->wq_poll); =20 return 0; } +EXPORT_SYMBOL_GPL(tipd_suspend); =20 -static int __maybe_unused tps6598x_resume(struct device *dev) +int tipd_resume(struct tps6598x *tps) { - struct i2c_client *client =3D to_i2c_client(dev); - struct tps6598x *tps =3D i2c_get_clientdata(client); int ret; =20 ret =3D tps6598x_check_mode(tps); @@ -1946,25 +1815,22 @@ static int __maybe_unused tps6598x_resume(struct de= vice *dev) } =20 if (tps->wakeup) { - disable_irq_wake(client->irq); - enable_irq(client->irq); + disable_irq_wake(tps->irq); + enable_irq(tps->irq); } else if (tps->reset) { gpiod_set_value_cansleep(tps->reset, 0); msleep(TPS_SETUP_MS); } =20 - if (!client->irq) + if (!tps->irq) queue_delayed_work(system_power_efficient_wq, &tps->wq_poll, msecs_to_jiffies(POLL_INTERVAL)); =20 return 0; } +EXPORT_SYMBOL_GPL(tipd_resume); =20 -static const struct dev_pm_ops tps6598x_pm_ops =3D { - SET_SYSTEM_SLEEP_PM_OPS(tps6598x_suspend, tps6598x_resume) -}; - -static const struct tipd_data cd321x_data =3D { +const struct tipd_data tipd_cd321x_data =3D { .irq_handler =3D cd321x_interrupt, .irq_mask1 =3D APPLE_CD_REG_INT_POWER_STATUS_UPDATE | APPLE_CD_REG_INT_DATA_STATUS_UPDATE | @@ -1982,8 +1848,9 @@ static const struct tipd_data cd321x_data =3D { .switch_power_state =3D cd321x_switch_power_state, .connect =3D cd321x_connect, }; +EXPORT_SYMBOL_GPL(tipd_cd321x_data); =20 -static const struct tipd_data tps6598x_data =3D { +const struct tipd_data tipd_tps6598x_data =3D { .irq_handler =3D tps6598x_interrupt, .irq_mask1 =3D TPS_REG_INT_POWER_STATUS_UPDATE | TPS_REG_INT_DATA_STATUS_UPDATE | @@ -2000,8 +1867,9 @@ static const struct tipd_data tps6598x_data =3D { .reset =3D tps6598x_reset, .connect =3D tps6598x_connect, }; +EXPORT_SYMBOL_GPL(tipd_tps6598x_data); =20 -static const struct tipd_data tps25750_data =3D { +const struct tipd_data tipd_tps25750_data =3D { .irq_handler =3D tps25750_interrupt, .irq_mask1 =3D TPS_REG_INT_POWER_STATUS_UPDATE | TPS_REG_INT_DATA_STATUS_UPDATE | @@ -2018,33 +1886,8 @@ static const struct tipd_data tps25750_data =3D { .reset =3D tps25750_reset, .connect =3D tps6598x_connect, }; - -static const struct of_device_id tps6598x_of_match[] =3D { - { .compatible =3D "ti,tps6598x", &tps6598x_data}, - { .compatible =3D "apple,cd321x", &cd321x_data}, - { .compatible =3D "ti,tps25750", &tps25750_data}, - {} -}; -MODULE_DEVICE_TABLE(of, tps6598x_of_match); - -static const struct i2c_device_id tps6598x_id[] =3D { - { .name =3D "tps6598x", .driver_data =3D (kernel_ulong_t)&tps6598x_data }, - { } -}; -MODULE_DEVICE_TABLE(i2c, tps6598x_id); - -static struct i2c_driver tps6598x_i2c_driver =3D { - .driver =3D { - .name =3D "tps6598x", - .pm =3D &tps6598x_pm_ops, - .of_match_table =3D tps6598x_of_match, - }, - .probe =3D tps6598x_probe, - .remove =3D tps6598x_remove, - .id_table =3D tps6598x_id, -}; -module_i2c_driver(tps6598x_i2c_driver); +EXPORT_SYMBOL_GPL(tipd_tps25750_data); =20 MODULE_AUTHOR("Heikki Krogerus "); -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("TI TPS6598x USB Power Delivery Controller Driver"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("TI TPS6598x USB Power Delivery Controller Core Functio= ns"); diff --git a/drivers/usb/typec/tipd/i2c.c b/drivers/usb/typec/tipd/i2c.c new file mode 100644 index 000000000000..d369a708828c --- /dev/null +++ b/drivers/usb/typec/tipd/i2c.c @@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for TI TPS6598x USB Power Delivery controller family + * + * Copyright (C) The Asahi Linux Contributors + */ + +#include +#include +#include + +#include "tps6598x.h" + +static int tps6598x_probe_i2c(struct i2c_client *client) +{ + const struct tipd_data *data; + struct tps6598x *tps; + int ret; + + data =3D i2c_get_match_data(client); + if (!data) + return -EINVAL; + + tps =3D devm_kzalloc(&client->dev, data->tps_struct_size, GFP_KERNEL); + if (!tps) + return -ENOMEM; + + mutex_init(&tps->lock); + tps->dev =3D &client->dev; + tps->data =3D data; + tps->irq =3D client->irq; + + tps->regmap =3D devm_regmap_init_i2c(client, &tps6598x_regmap_config); + if (IS_ERR(tps->regmap)) + return PTR_ERR(tps->regmap); + + /* + * Checking can the adapter handle SMBus protocol. If it can not, the + * driver needs to take care of block reads separately. + */ + if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + tps->i2c_protocol =3D true; + + ret =3D tipd_init(tps); + + if (ret =3D=3D 0) + i2c_set_clientdata(client, tps); + + return ret; +} + +static void tps6598x_remove_i2c(struct i2c_client *client) +{ + struct tps6598x *tps =3D i2c_get_clientdata(client); + + tipd_remove(tps); +} + +static int __maybe_unused tps6598x_suspend(struct device *dev) +{ + struct tps6598x *tps =3D dev_get_drvdata(dev); + + return tipd_suspend(tps); +} + +static int __maybe_unused tps6598x_resume(struct device *dev) +{ + struct tps6598x *tps =3D dev_get_drvdata(dev); + + return tipd_resume(tps); +} + +static const struct dev_pm_ops tps6598x_pm_ops =3D { + SET_SYSTEM_SLEEP_PM_OPS(tps6598x_suspend, tps6598x_resume) +}; + +static const struct of_device_id tps6598x_of_match[] =3D { + { .compatible =3D "ti,tps6598x", &tipd_tps6598x_data}, + { .compatible =3D "apple,cd321x", &tipd_cd321x_data}, + { .compatible =3D "ti,tps25750", &tipd_tps25750_data}, + {} +}; +MODULE_DEVICE_TABLE(of, tps6598x_of_match); + +static const struct i2c_device_id tps6598x_id[] =3D { + { .name =3D "tps6598x", .driver_data =3D (kernel_ulong_t)&tipd_tps6598x_d= ata }, + { } +}; +MODULE_DEVICE_TABLE(i2c, tps6598x_id); + +static struct i2c_driver tps6598x_i2c_driver =3D { + .driver =3D { + .name =3D "tps6598x", + .pm =3D &tps6598x_pm_ops, + .of_match_table =3D tps6598x_of_match, + }, + .probe =3D tps6598x_probe_i2c, + .remove =3D tps6598x_remove_i2c, + .id_table =3D tps6598x_id, +}; +module_i2c_driver(tps6598x_i2c_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("TI TPS6598x USB Power Delivery Controller Driver"); diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps= 6598x.h index 03edbb77bbd6..2b61963d97c9 100644 --- a/drivers/usb/typec/tipd/tps6598x.h +++ b/drivers/usb/typec/tipd/tps6598x.h @@ -8,6 +8,10 @@ =20 #include #include +#include +#include +#include +#include =20 #ifndef __TPS6598X_H__ #define __TPS6598X_H__ @@ -269,4 +273,115 @@ #define TPS_65981_2_6_INTEVENT_LEN 8 #define TPS_65987_8_INTEVENT_LEN 11 =20 +struct tps6598x; + +struct tipd_data { + irq_handler_t irq_handler; + u64 irq_mask1; + size_t tps_struct_size; + void (*remove)(struct tps6598x *tps); + int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node); + void (*unregister_port)(struct tps6598x *tps); + void (*trace_data_status)(u32 status); + void (*trace_power_status)(u16 status); + void (*trace_status)(u32 status); + int (*apply_patch)(struct tps6598x *tps); + int (*init)(struct tps6598x *tps); + int (*switch_power_state)(struct tps6598x *tps, u8 target_state); + bool (*read_data_status)(struct tps6598x *tps); + int (*reset)(struct tps6598x *tps); + int (*connect)(struct tps6598x *tps, u32 status); +}; + +struct tps6598x { + struct device *dev; + struct regmap *regmap; + struct mutex lock; /* device lock */ + int irq; + u8 i2c_protocol:1; + + struct gpio_desc *reset; + struct typec_port *port; + struct typec_partner *partner; + struct usb_pd_identity partner_identity; + struct usb_role_switch *role_sw; + struct typec_capability typec_cap; + + struct power_supply *psy; + struct power_supply_desc psy_desc; + enum power_supply_usb_type usb_type; + + int wakeup; + u32 status; /* status reg */ + u32 data_status; + u16 pwr_status; + struct delayed_work wq_poll; + + const struct tipd_data *data; +}; + +/* TPS_REG_USB4_STATUS */ +struct tps6598x_usb4_status_reg { + u8 mode_status; + __le32 eudo; + __le32 unknown; +} __packed; + +/* TPS_REG_DP_SID_STATUS */ +struct tps6598x_dp_sid_status_reg { + u8 mode_status; + __le32 status_tx; + __le32 status_rx; + __le32 configure; + __le32 mode_data; +} __packed; + +/* TPS_REG_INTEL_VID_STATUS */ +struct tps6598x_intel_vid_status_reg { + u8 mode_status; + __le32 attention_vdo; + __le16 enter_vdo; + __le16 device_mode; + __le16 cable_mode; +} __packed; + +struct cd321x_status { + u32 status; + u32 pwr_status; + u32 data_status; + u32 status_changed; + struct usb_pd_identity partner_identity; + struct tps6598x_dp_sid_status_reg dp_sid_status; + struct tps6598x_intel_vid_status_reg intel_vid_status; + struct tps6598x_usb4_status_reg usb4_status; +}; + +struct cd321x { + struct tps6598x tps; + + struct tps6598x_dp_sid_status_reg dp_sid_status; + struct tps6598x_intel_vid_status_reg intel_vid_status; + struct tps6598x_usb4_status_reg usb4_status; + + struct typec_altmode *port_altmode_dp; + struct typec_altmode *port_altmode_tbt; + + struct typec_mux *mux; + struct typec_mux_state state; + + struct cd321x_status update_status; + struct delayed_work update_work; + struct usb_pd_identity cur_partner_identity; +}; + +extern const struct tipd_data tipd_cd321x_data; +extern const struct tipd_data tipd_tps6598x_data; +extern const struct tipd_data tipd_tps25750_data; +extern const struct regmap_config tps6598x_regmap_config; + +int tipd_init(struct tps6598x *tps); +void tipd_remove(struct tps6598x *tps); +int tipd_suspend(struct tps6598x *tps); +int tipd_resume(struct tps6598x *tps); + #endif /* __TPS6598X_H__ */ --=20 2.55.0 From nobody Fri Oct 2 11:42:33 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C5C53624D3; Sat, 1 Aug 2026 21:30:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; cv=none; b=nAHrzBWaXW2bdGAcDUaXiu0GkQX6GuNYeDoFMOgVTtumr28f+Y6iOHSw2JMoZOfdwqzm6O4M+Rfea66IVI7qAR6koHQvyem3kVClqDhJ24RAdAcyMgklc1PbBvGpSJAkpuULn62g81eZYsJ21bJ6M/QLxaTiR3eypohHEwtK5CU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785619857; c=relaxed/simple; bh=101XP0bk84bhheNozSFLyMBOiCvLy29leBg7vPGv1RU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=awqiMrsU+MR22fLX358cwOXFHQIE9D0KMOYrknaVJuYN4EdT9Dp5iVPRAK6rl6sP7ZsBbFnFI+WZvmiBfqv6sV9cMCDcQdL70mPQ+B6LDROuFWwRMDUyW0VoE+LmuAyULK3DLTbHI+hLdCsW0uknxnGhA+Y1kYnDjA7A7lWbqdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=Gg2Ildsu; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="Gg2Ildsu" Received: by chaosmail.tech (Postfix) id 70B4E1C8825; Sat, 01 Aug 2026 21:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785619848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tet+UIXdMChomnGy3nh/SpMSKQZgngFrvkCNWVj5Iyc=; b=Gg2IldsuKnYZ9JZb/oWTIWpZ8vhC+aY18Mk/dfWA3jBEzn1SzFCj+gO5nD0/mvpLnBvCjq czBSYJSXhNkxMxD4M3E0+9okp0leFcIOczs82M03CaD1xqBcLeODVAxNVq8R+oBl2krFCn /hc/S18hDirpiJctEgDuYZVk8OfGqkQ= From: Sasha Finkelstein Date: Sat, 01 Aug 2026 23:30:12 +0200 Subject: [PATCH v3 3/3] usb: typec: tipd: Add sn201202x support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260801-tipd-ace3-v3-3-8332f2eca4fc@chaosmail.tech> References: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> In-Reply-To: <20260801-tipd-ace3-v3-0-8332f2eca4fc@chaosmail.tech> To: Sven Peter , Janne Grunau , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heikki Krogerus Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Alyssa Milburn X-Developer-Signature: v=1; a=ed25519-sha256; t=1785619844; l=11992; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=101XP0bk84bhheNozSFLyMBOiCvLy29leBg7vPGv1RU=; b=+Aj9mtvxkh7LXe5uw9i3wemvj0KtlkN2qHPR12AO5BpxUGxToC7MHb0kF6raEp0Vgtw2astUY iO+BA7Z7NDfB99QP5KxNKrO1h9n5lBfgReal4CZoI1mym1CxBkU3g75 X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= Add support for sn201202x (aka ACE3), a tipd variant that uses a very similar register map, that is exposed over a "logical register" interface on the SPMI bus. Co-developed-by: Alyssa Milburn Signed-off-by: Alyssa Milburn Signed-off-by: Sasha Finkelstein --- MAINTAINERS | 1 + drivers/usb/typec/tipd/Kconfig | 12 ++++++ drivers/usb/typec/tipd/Makefile | 3 ++ drivers/usb/typec/tipd/core.c | 20 ++++++++++ drivers/usb/typec/tipd/spmi.c | 297 ++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++++++++ drivers/usb/typec/tipd/tps6598x.h | 9 +++++ 6 files changed, 342 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b2819ca62e0c..821932703b60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2641,6 +2641,7 @@ F: drivers/soc/apple/* F: drivers/spi/spi-apple.c F: drivers/spmi/spmi-apple-controller.c F: drivers/usb/dwc3/dwc3-apple.c +F: drivers/usb/typec/tipd/spmi.c F: drivers/video/backlight/apple_dwi_bl.c F: drivers/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h diff --git a/drivers/usb/typec/tipd/Kconfig b/drivers/usb/typec/tipd/Kconfig index c87cbe6109ca..8177f860f89d 100644 --- a/drivers/usb/typec/tipd/Kconfig +++ b/drivers/usb/typec/tipd/Kconfig @@ -14,3 +14,15 @@ config TYPEC_TPS6598X =20 If you choose to build this driver as a dynamically linked module, the module will be called tps6598x.ko. + +config TYPEC_SN201202X + tristate "TI SN201202x USB Power Delivery controller support" + depends on SPMI + select TYPEC_TPS6598X_CORE + help + Say Y here to enable support for SN201202x, a TPS6598x variant + that uses SPMI as a host bus, and is found on Apple devices starting + from the M3 series. + + If you choose to build this driver as a dynamically linked module, the + module will be called sn201202x.ko. diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makef= ile index c741bf44f52f..6f5ebc1e1a5f 100644 --- a/drivers/usb/typec/tipd/Makefile +++ b/drivers/usb/typec/tipd/Makefile @@ -7,3 +7,6 @@ tps6598x-core-$(CONFIG_TRACING) +=3D trace.o =20 obj-$(CONFIG_TYPEC_TPS6598X) +=3D tps6598x.o tps6598x-y :=3D i2c.o + +obj-$(CONFIG_TYPEC_SN201202X) +=3D sn201202x.o +sn201202x-y :=3D spmi.o diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 31098bdce109..3120055213c8 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -1888,6 +1888,26 @@ const struct tipd_data tipd_tps25750_data =3D { }; EXPORT_SYMBOL_GPL(tipd_tps25750_data); =20 +const struct tipd_data tipd_sn201202x_data =3D { + .irq_handler =3D cd321x_interrupt, + .irq_mask1 =3D APPLE_CD_REG_INT_POWER_STATUS_UPDATE | + APPLE_CD_REG_INT_DATA_STATUS_UPDATE | + APPLE_CD_REG_INT_PLUG_EVENT, + .tps_struct_size =3D sizeof(struct sn201202x), + .remove =3D cd321x_remove, + .register_port =3D cd321x_register_port, + .unregister_port =3D cd321x_unregister_port, + .trace_data_status =3D trace_cd321x_data_status, + .trace_power_status =3D trace_tps6598x_power_status, + .trace_status =3D trace_tps6598x_status, + .init =3D cd321x_init, + .read_data_status =3D cd321x_read_data_status, + .reset =3D cd321x_reset, + .switch_power_state =3D cd321x_switch_power_state, + .connect =3D cd321x_connect, +}; +EXPORT_SYMBOL_GPL(tipd_sn201202x_data); + MODULE_AUTHOR("Heikki Krogerus "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("TI TPS6598x USB Power Delivery Controller Core Functio= ns"); diff --git a/drivers/usb/typec/tipd/spmi.c b/drivers/usb/typec/tipd/spmi.c new file mode 100644 index 000000000000..73575a854bde --- /dev/null +++ b/drivers/usb/typec/tipd/spmi.c @@ -0,0 +1,297 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include + +#include "tps6598x.h" + +#define tps_to_sn(tps) container_of_const((tps), struct sn201202x, cd.tps) + +static int regmap_sn201202x_select_reg(struct spmi_device *sdev, u8 reg) +{ + int err; + u8 val; + bool warned =3D false; + int attempts =3D 5; + struct tps6598x *tps =3D spmi_device_get_drvdata(sdev); + struct sn201202x *sn =3D tps_to_sn(tps); + + reinit_completion(&sn->select_completion); + err =3D spmi_register_zero_write(sdev, reg); + if (err) + return err; + + if (!wait_for_completion_timeout(&sn->select_completion, msecs_to_jiffies= (100))) + return -ETIMEDOUT; + + while (--attempts) { + err =3D spmi_register_read(sdev, 0, &val); + if (err) + return err; + if (val =3D=3D (reg | 0x80)) { + if (!warned) { + dev_warn(tps->dev, + "Got interrupt but selection not complete?\n"); + warned =3D true; + } + msleep(20); + continue; + } + if (val =3D=3D reg) + return 0; + return -EIO; + } + + return -EIO; +} + +static int regmap_sn201202x_read(void *context, + const void *reg, size_t reg_size, + void *val, size_t val_size) +{ + int err; + unsigned int offset =3D 0x20; + size_t len; + u8 addr; + + if (reg_size !=3D 1) { + WARN_ON(1); + return -EINVAL; + } + if (val_size > 0x40) { + WARN_ON(1); + return -EINVAL; + } + + addr =3D *(u8 *)reg; + + err =3D regmap_sn201202x_select_reg(context, addr); + if (err) + return err; + + while (val_size) { + len =3D min_t(size_t, val_size, 16); + err =3D spmi_ext_register_read(context, offset, val, len); + if (err) + return err; + offset +=3D len; + val +=3D len; + val_size -=3D len; + } + + return 0; +} + +static int regmap_sn201202x_write(void *context, const void *data, + size_t count) +{ + int err =3D 0; + unsigned int offset =3D 0xa0; + size_t len; + u8 addr; + + if (count < 1) { + WARN_ON(1); + return -EINVAL; + } + + addr =3D *(u8 *)data; + data +=3D 1; + count -=3D 1; + + if (count > 0x40) { + WARN_ON(1); + return -EINVAL; + } + + err =3D regmap_sn201202x_select_reg(context, addr); + if (err) + return err; + + while (count) { + len =3D min_t(size_t, count, 16); + err =3D spmi_ext_register_write(context, offset, data, len); + if (err) + return err; + offset +=3D len; + data +=3D len; + count -=3D len; + } + + return err; +} + +static irqreturn_t sn201202x_irq(int irq, void *data) +{ + struct completion *c =3D data; + + complete(c); + return IRQ_HANDLED; +} + +static const struct regmap_bus regmap_sn201202x =3D { + .read =3D regmap_sn201202x_read, + .write =3D regmap_sn201202x_write, + .reg_format_endian_default =3D REGMAP_ENDIAN_NATIVE, + .val_format_endian_default =3D REGMAP_ENDIAN_NATIVE, +}; + +static struct regmap *__devm_regmap_init_sn201202x(struct spmi_device *sde= v, + const struct regmap_config *config, + struct lock_class_key *lock_key, + const char *lock_name) +{ + return __devm_regmap_init(&sdev->dev, ®map_sn201202x, sdev, config, + lock_key, lock_name); +} + +#define devm_regmap_init_sn201202x(dev, config) \ + __regmap_lockdep_wrapper(__devm_regmap_init_sn201202x, #config, \ + dev, config) + +static const struct of_device_id sn201202x_of_match[] =3D { + { .compatible =3D "apple,sn201202x", &tipd_sn201202x_data}, + {} +}; + +static int sn201202x_probe(struct spmi_device *device) +{ + const struct of_device_id *match; + const struct tipd_data *data; + struct sn201202x *sn; + struct tps6598x *tps; + int irq_select, irq_sleep, irq_wake; + int ret; + + match =3D of_match_device(sn201202x_of_match, &device->dev); + if (!match) + return -EINVAL; + data =3D match->data; + + sn =3D devm_kzalloc(&device->dev, data->tps_struct_size, GFP_KERNEL); + if (!sn) + return -ENOMEM; + sn->sdev =3D device; + tps =3D &sn->cd.tps; + + mutex_init(&tps->lock); + tps->dev =3D &device->dev; + tps->data =3D data; + + tps->irq =3D of_irq_get_byname(device->dev.of_node, "irq"); + if (tps->irq < 0) + return tps->irq; + irq_select =3D of_irq_get_byname(device->dev.of_node, "select"); + if (irq_select < 0) + return irq_select; + irq_sleep =3D of_irq_get_byname(device->dev.of_node, "sleep"); + if (irq_sleep < 0) + return irq_sleep; + irq_wake =3D of_irq_get_byname(device->dev.of_node, "wake"); + if (irq_wake < 0) + return irq_wake; + + init_completion(&sn->select_completion); + init_completion(&sn->sleep_completion); + init_completion(&sn->wake_completion); + + ret =3D devm_request_irq(&device->dev, irq_select, sn201202x_irq, + 0, NULL, &sn->select_completion); + if (ret) + return ret; + ret =3D devm_request_irq(&device->dev, irq_sleep, sn201202x_irq, + 0, NULL, &sn->sleep_completion); + if (ret) + return ret; + ret =3D devm_request_irq(&device->dev, irq_wake, sn201202x_irq, + 0, NULL, &sn->wake_completion); + if (ret) + return ret; + + spmi_device_set_drvdata(device, tps); + tps->regmap =3D devm_regmap_init_sn201202x(device, &tps6598x_regmap_confi= g); + if (IS_ERR(tps->regmap)) + return PTR_ERR(tps->regmap); + + ret =3D spmi_command_wakeup(device); + if (ret) + return ret; + if (!wait_for_completion_timeout(&sn->wake_completion, msecs_to_jiffies(1= 00))) + return -ETIMEDOUT; + + ret =3D tipd_init(tps); + if (ret) + spmi_command_sleep(device); + return ret; +} + +static void sn201202x_remove(struct spmi_device *device) +{ + struct tps6598x *tps =3D spmi_device_get_drvdata(device); + struct sn201202x *sn =3D tps_to_sn(tps); + + tipd_remove(tps); + spmi_command_sleep(sn->sdev); +} + +static int __maybe_unused sn201202x_resume(struct device *dev) +{ + struct tps6598x *tps =3D dev_get_drvdata(dev); + struct sn201202x *sn =3D tps_to_sn(tps); + int err; + + reinit_completion(&sn->wake_completion); + err =3D spmi_command_wakeup(sn->sdev); + if (err) + return err; + if (!wait_for_completion_timeout(&sn->wake_completion, msecs_to_jiffies(1= 00))) + return -ETIMEDOUT; + return tipd_resume(tps); +} + +static int __maybe_unused sn201202x_suspend(struct device *dev) +{ + struct tps6598x *tps =3D dev_get_drvdata(dev); + struct sn201202x *sn =3D tps_to_sn(tps); + int err; + + err =3D tipd_suspend(tps); + if (err) + return err; + reinit_completion(&sn->sleep_completion); + err =3D spmi_command_sleep(sn->sdev); + if (err) + goto out_resume; + if (!wait_for_completion_timeout(&sn->sleep_completion, msecs_to_jiffies(= 100))) { + err =3D -ETIMEDOUT; + goto out_resume; + } + return 0; + +out_resume: + tipd_resume(tps); + return err; +} + +MODULE_DEVICE_TABLE(of, sn201202x_of_match); + +static const struct dev_pm_ops sn201202x_pm_ops =3D { + SET_SYSTEM_SLEEP_PM_OPS(sn201202x_suspend, sn201202x_resume) +}; + +static struct spmi_driver sn201202x_driver =3D { + .driver =3D { + .name =3D "sn201202x", + .pm =3D &sn201202x_pm_ops, + .of_match_table =3D sn201202x_of_match, + }, + .probe =3D sn201202x_probe, + .remove =3D sn201202x_remove, +}; +module_spmi_driver(sn201202x_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("TI SN201202x USB Power Delivery Controller Driver"); diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps= 6598x.h index 2b61963d97c9..ab60aeb0c274 100644 --- a/drivers/usb/typec/tipd/tps6598x.h +++ b/drivers/usb/typec/tipd/tps6598x.h @@ -374,9 +374,18 @@ struct cd321x { struct usb_pd_identity cur_partner_identity; }; =20 +struct sn201202x { + struct cd321x cd; + struct completion select_completion; + struct completion sleep_completion; + struct completion wake_completion; + struct spmi_device *sdev; +}; + extern const struct tipd_data tipd_cd321x_data; extern const struct tipd_data tipd_tps6598x_data; extern const struct tipd_data tipd_tps25750_data; +extern const struct tipd_data tipd_sn201202x_data; extern const struct regmap_config tps6598x_regmap_config; =20 int tipd_init(struct tps6598x *tps); --=20 2.55.0