* [RESEND PATCH v2 0/7] Add pm8150b TPCM driver
@ 2021-10-28 16:49 Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 1/7] dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header Bryan O'Donoghue
` (6 more replies)
0 siblings, 7 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
V2 resend:
- Adding omitted devicetree mailing list
V2:
Guenter Roeck's review
- Converts suggested qcom_pmic_tcpm_core.c into one-liners
- Adds comment on how polarity is set in set_polarity()
- Removes optional set_current_limit()
- regmap_read/regmap_write
Reviwing other pm8150b/spmi drivers I then added in checks for all
reamap_read()/regmap_write() calls.
- Fixes (type == TCPC_TX_CABLE_RESET || TCPC_TX_HARD_RESET)
thanks I definitely had the blinkers on there and didn't see that at all
- qcom_pmic_tcpm_pdphy_pd_transmit_payload()
Treats regmap_read and read value as separate error paths
- qcom_pmic_tcpm_pdphy_set_pd_rx()
Replaces boolean if/else with !on as suggested
- Returns -ENODEV not -EINVAL on dev_get_regmap() error
- qcom_pmic_tcpm_pdphy_pd_receive()
Guenter asks: "No error return ?"
bod: No we are inside an ISR here if we read data we pass that off to TCPM
if somehow we don't read the data - it is "junk" there's no value IMO
in pushing an error upwards back to the handler.
Heikki Krogerus' review
- Includes Makefile I missed adding to my git index
- Removes old Kconfig entry for remove driver
Randy Dunlap's review
- Rewords drivers/usb/typec/tcpm/Kconfig
- Drops tautology "aggregates togther"
- Corrects spelling typos
BOD's own review
- Drops redundant include of regmap.h in qcom_pmic_tcpm_core.c
- Propogates qcom_pmic_tcpm_pdphy_disable() error upwards
- Propogates pmic_pdphy_reset() error upwards
- Drops error prints in qcom_pmic_tcpm_pdphy_pd_transmit_payload()
I had these in-place during development and don't recall them being
triggered even once, they are redundant, remove.
Differences between the two can be seen by
git diff usb-next-27-10-21-pm8150b-tcpm-v2..usb-next-25-10-21-pm8150b-tcpm -- drivers/usb/typec/tcpm
Latest bootable series can be found here:
Link: https://git.linaro.org/people/bryan.odonoghue/kernel.git/log/?h=usb-next-27-10-21-pm8150b-tcpm-v2
Previous set:
Link: https://lore.kernel.org/all/20211025150906.176686-1-bryan.odonoghue@linaro.org/T/#t
V1:
This series adds a set of yaml and a driver to bind together the type-c and
pdphy silicon in qcom's pm8150b block as a Linux type-c port manager.
As part of that we retire the existing qcom-pmic-typec driver and fully
replicate its functionality inside of the new block with the additional
pdphy stuff along with it.
An additional series will follow this one for the SoC and RB5 dtsi and dts
respectively.
A bootable series can be found here
Link: https://git.linaro.org/people/bryan.odonoghue/kernel.git/log/?h=usb-next-25-10-21-pm8150b-tcpm
Bryan O'Donoghue (7):
dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header
dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema
dt-bindings: usb: Add qcom,pmic-usb-pdphy dt-binding header
dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema
dt-bindings: usb: Add Qualcomm PMIC TCPM YAML schema
usb: typec: qcom: Remove standalone qcom pm8150b typec driver
usb: typec: qcom: Add a pm8150b TCPM driver
.../bindings/usb/qcom,pmic-pdphy.yaml | 115 ++++
.../bindings/usb/qcom,pmic-tcpm.yaml | 110 +++
.../bindings/usb/qcom,pmic-typec.yaml | 116 ++++
MAINTAINERS | 8 +
drivers/usb/typec/Kconfig | 13 -
drivers/usb/typec/Makefile | 1 -
drivers/usb/typec/qcom-pmic-typec.c | 262 -------
drivers/usb/typec/tcpm/Kconfig | 11 +
drivers/usb/typec/tcpm/Makefile | 1 +
drivers/usb/typec/tcpm/qcom/Makefile | 6 +
.../usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c | 313 +++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c | 606 +++++++++++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h | 85 +++
.../typec/tcpm/qcom/qcom_pmic_tcpm_typec.c | 638 ++++++++++++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_typec.h | 163 +++++
.../usb/typec/tcpm/qcom,pmic-usb-pdphy.h | 18 +
.../usb/typec/tcpm/qcom,pmic-usb-typec.h | 18 +
17 files changed, 2208 insertions(+), 276 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c
create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.h
create mode 100644 include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h
create mode 100644 include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 1/7] dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema Bryan O'Donoghue
` (5 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Adds a series of defines which are used in the DTS and type-c driver for
identifying interrupts.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
.../usb/typec/tcpm/qcom,pmic-usb-typec.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h
diff --git a/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h b/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h
new file mode 100644
index 0000000000000..263c999b59b8d
--- /dev/null
+++ b/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_TCPM_QCOM_PMIC_USB_TYPEC_H
+#define _DT_BINDINGS_TCPM_QCOM_PMIC_USB_TYPEC_H
+
+#define PMIC_TYPEC_OR_RID_IRQ 0x0
+#define PMIC_TYPEC_VPD_IRQ 0x1
+#define PMIC_TYPEC_CC_STATE_IRQ 0x2
+#define PMIC_TYPEC_VCONN_OC_IRQ 0x3
+#define PMIC_TYPEC_VBUS_IRQ 0x4
+#define PMIC_TYPEC_ATTACH_DETACH_IRQ 0x5
+#define PMIC_TYPEC_LEGACY_CABLE_IRQ 0x6
+#define PMIC_TYPEC_TRY_SNK_SRC_IRQ 0x7
+
+#endif
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 1/7] dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
2021-10-28 20:38 ` Rob Herring
2021-10-28 16:49 ` [RESEND PATCH v2 3/7] dt-bindings: usb: Add qcom,pmic-usb-pdphy dt-binding header Bryan O'Donoghue
` (4 subsequent siblings)
6 siblings, 2 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Add a YAML binding for the type-c silicon interface inside Qualcomm's
pm8150b hardware block.
The type-c driver operates with a pdphy driver inside of a high level
single TCPM device.
Based on original work by Wesley.
Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
.../bindings/usb/qcom,pmic-typec.yaml | 116 ++++++++++++++++++
1 file changed, 116 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
new file mode 100644
index 0000000000000..72602daf910bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
@@ -0,0 +1,116 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/usb/qcom,pmic-typec.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm PMIC based USB type C Detection Driver
+
+maintainers:
+ - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+
+description: |
+ Qualcomm PMIC Type C Detect
+
+properties:
+ compatible:
+ enum:
+ - qcom,pm8150b-usb-typec
+
+ reg:
+ maxItems: 1
+ description: Type C base address
+
+ interrupts:
+ items:
+ - description: Bitmask of CC attach, VBUS error, tCCDebounce done and more
+ - description: VCONN Powered Detection
+ - description: CC state change
+ - description: VCONN over-current condition
+ - description: VBUS state change
+ - description: Attach Deteach notification
+ - description: Legacy cable detect
+ - description: Try.Src Try.Snk state change
+
+ interrupt-names:
+ items:
+ - const: pmic-typec-or-rid-detect-change
+ - const: pmic-typec-vpd-detect
+ - const: pmic-typec-cc-state-change
+ - const: pmic-typec-vconn-oc
+ - const: pmic-typec-vbus-change
+ - const: pmic-typec-attach-detach
+ - const: pmic-typec-legacy-cable-detect
+ - const: pmic-typec-try-snk-src-detect
+
+ ports:
+ description: Remote endpoint connections
+ $ref: /connector/usb-connector.yaml#/properties/ports
+
+ properties:
+ port@0:
+ description: Remote endpoints for the TCPM driver
+
+ required:
+ - port@0
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - interrupt-names
+ - ports
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h>
+ pm8150b {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8150b_typec: typec@1500 {
+ compatible = "qcom,pm8150b-typec";
+ reg = <0x1500>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <0x2 0x15 PMIC_TYPEC_OR_RID_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x15 PMIC_TYPEC_VPD_IRQ
+ IRQ_TYPE_EDGE_BOTH>,
+ <0x2 0x15 PMIC_TYPEC_CC_STATE_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x15 PMIC_TYPEC_VCONN_OC_IRQ
+ IRQ_TYPE_EDGE_BOTH>,
+ <0x2 0x15 PMIC_TYPEC_VBUS_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x15 PMIC_TYPEC_ATTACH_DETACH_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x15 PMIC_TYPEC_LEGACY_CABLE_IRQ
+ IRQ_TYPE_EDGE_BOTH>,
+ <0x2 0x15 PMIC_TYPEC_TRY_SNK_SRC_IRQ
+ IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "pmic-typec-or-rid-detect-change",
+ "pmic-typec-vpd-detect",
+ "pmic-typec-cc-state-change",
+ "pmic-typec-vconn-oc",
+ "pmic-typec-vbus-change",
+ "pmic-typec-attach-detach",
+ "pmic-typec-legacy-cable-detect",
+ "pmic-typec-try-snk-src-detect";
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ pmic_typec: endpoint {
+ remote-endpoint = <&pmic_tcpm_typec>;
+ };
+ };
+ };
+ };
+ };
+...
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 3/7] dt-bindings: usb: Add qcom,pmic-usb-pdphy dt-binding header
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 1/7] dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema Bryan O'Donoghue
` (3 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Adds a series of defines which are used in the DTS and pdphy driver for
identifying interrupts.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
.../usb/typec/tcpm/qcom,pmic-usb-pdphy.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h
diff --git a/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h b/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h
new file mode 100644
index 0000000000000..0bb1ce677fe5c
--- /dev/null
+++ b/include/dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_TCPM_QCOM_PMIC_USB_PDPHY_H
+#define _DT_BINDINGS_TCPM_QCOM_PMIC_USB_PDPHY_H
+
+#define PMIC_PDPHY_SIG_TX_IRQ 0x0
+#define PMIC_PDPHY_SIG_RX_IRQ 0x1
+#define PMIC_PDPHY_MSG_TX_IRQ 0x2
+#define PMIC_PDPHY_MSG_RX_IRQ 0x3
+#define PMIC_PDPHY_MSG_TX_FAIL_IRQ 0x4
+#define PMIC_PDPHY_MSG_TX_DISCARD_IRQ 0x5
+#define PMIC_PDPHY_MSG_RX_DISCARD_IRQ 0x6
+#define PMIC_PDPHY_FR_SWAP_IRQ 0x7
+
+#endif
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
` (2 preceding siblings ...)
2021-10-28 16:49 ` [RESEND PATCH v2 3/7] dt-bindings: usb: Add qcom,pmic-usb-pdphy dt-binding header Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
2021-10-28 20:39 ` Rob Herring
2021-10-28 16:49 ` [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM " Bryan O'Donoghue
` (2 subsequent siblings)
6 siblings, 2 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Add a YAML binding for the power-delivery PHY silicon interface inside
Qualcomm's pm8150b hardware block.
The pdphy driver operates with a type-c driver inside of a high level
single TCPM device to provide overall TCPM functionality.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
.../bindings/usb/qcom,pmic-pdphy.yaml | 115 ++++++++++++++++++
1 file changed, 115 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
new file mode 100644
index 0000000000000..9110f6203b87f
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
@@ -0,0 +1,115 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/usb/qcom,pmic-pdphy.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm PMIC based USB PDPHY driver
+
+maintainers:
+ - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+
+description: |
+ Qualcomm PMIC Power Delivery PHY driver
+
+properties:
+ compatible:
+ enum:
+ - qcom,pm8150b-pdphy
+
+ reg:
+ maxItems: 1
+ description: PDPHY base address
+
+ interrupts:
+ items:
+ - description: Sig TX - transmitted reset signal
+ - description: Sig RX - received reset signal
+ - description: TX completion
+ - description: RX completion
+ - description: TX fail
+ - description: TX discgard
+ - description: RX discgard
+ - description: Fast Role Swap event
+
+ interrupt-names:
+ items:
+ - const: pmic-pdphy-sig-tx
+ - const: pmic-pdphy-sig-rx
+ - const: pmic-pdphy-msg-tx
+ - const: pmic-pdphy-msg-rx
+ - const: pmic-pdphy-msg-tx-failed
+ - const: pmic-pdphy-msg-tx-discarded
+ - const: pmic-pdphy-msg-rx-discarded
+ - const: pmic-pdphy-fr-swap
+
+ ports:
+ description: Remote endpoint connections
+ $ref: /connector/usb-connector.yaml#/properties/ports
+
+ properties:
+ port@0:
+ description: Remote endpoints for the TCPM driver
+
+ required:
+ - port@0
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - interrupt-names
+ - ports
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h>
+
+ pm8150b {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8150b_pdphy: pdphy@1700 {
+ compatible = "qcom,pm8150b-pdphy";
+ reg = <0x1700>;
+ interrupts = <0x2 0x17 PMIC_PDPHY_SIG_TX_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_SIG_RX_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_MSG_TX_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_MSG_RX_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_MSG_TX_FAIL_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_MSG_TX_DISCARD_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_MSG_RX_DISCARD_IRQ
+ IRQ_TYPE_EDGE_RISING>,
+ <0x2 0x17 PMIC_PDPHY_FR_SWAP_IRQ
+ IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "pmic-pdphy-sig-tx",
+ "pmic-pdphy-sig-rx",
+ "pmic-pdphy-msg-tx",
+ "pmic-pdphy-msg-rx",
+ "pmic-pdphy-msg-tx-failed",
+ "pmic-pdphy-msg-tx-discarded",
+ "pmic-pdphy-msg-rx-discarded",
+ "pmic-pdphy-fr-swap";
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ pmic_pdphy: endpoint {
+ remote-endpoint = <&pmic_tcpm_pdphy>;
+ };
+ };
+ };
+ };
+ };
+...
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM YAML schema
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
` (3 preceding siblings ...)
2021-10-28 16:49 ` [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 20:43 ` Rob Herring
2021-10-28 16:49 ` [RESEND PATCH v2 6/7] usb: typec: qcom: Remove standalone qcom pm8150b typec driver Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver Bryan O'Donoghue
6 siblings, 1 reply; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Add a YAML description for the pm8150b-tcpm driver. The pm8150b-tcpm
encapsulates a type-c block and a pdphy block into one block presented to
the tcpm Linux API.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
.../bindings/usb/qcom,pmic-tcpm.yaml | 110 ++++++++++++++++++
1 file changed, 110 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
new file mode 100644
index 0000000000000..6dd51a1dd944f
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
@@ -0,0 +1,110 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/usb/qcom,pmic-tcpm.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm PMIC TCPM Driver
+
+maintainers:
+ - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+
+description: |
+ Qualcomm PMIC Type-C Port Manager Driver
+
+properties:
+ compatible:
+ enum:
+ - qcom,pm8150b-tcpm
+
+ ports:
+ description: Remote endpoint connections
+ $ref: /connector/usb-connector.yaml#/properties/ports
+
+ properties:
+ port@0:
+ description: Remote endpoints for the type-c device
+
+ port@1:
+ description: Remote endpoints for the pdphy device
+
+ port@2:
+ description: Connection to role switch node
+
+ required:
+ - port@0
+ - port@1
+ - port@2
+
+required:
+ - compatible
+ - ports
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/usb/pd.h>
+ #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h>
+ #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h>
+
+ pm8150b_tcpm: pmic-tcpm {
+ compatible = "qcom,pmic-tcpm";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ status = "disabled";
+ ports {
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ pmic_tcpm_typec: endpoint {
+ remote-endpoint = <&pmic_typec>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ pmic_tcpm_pdphy: endpoint {
+ remote-endpoint = <&pmic_pdphy>;
+ };
+ };
+ port@2 {
+ ret = <2>;
+ usb3_role: endpoint@0 {
+ remote-endpoint = <&dwc3_drd_switch>;
+ };
+ };
+ };
+
+ connector {
+ compatible = "usb-c-connector";
+
+ power-role = "source";
+ data-role = "dual";
+ self-powered;
+
+ source-pdos = <PDO_FIXED(5000, 3000,
+ PDO_FIXED_DUAL_ROLE |
+ PDO_FIXED_USB_COMM |
+ PDO_FIXED_DATA_SWAP)>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ pmic_tcpm_ss_mux: endpoint@0 {
+ remote-endpoint = <&qmp_ss_mux>;
+ };
+ };
+ };
+ };
+ };
+
+...
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 6/7] usb: typec: qcom: Remove standalone qcom pm8150b typec driver
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
` (4 preceding siblings ...)
2021-10-28 16:49 ` [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM " Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver Bryan O'Donoghue
6 siblings, 0 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
Remove the standalone PMIC Type-C driver. We have implemented a full TCPM
driver which covers and extends the functionality in this driver.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
drivers/usb/typec/Kconfig | 13 --
drivers/usb/typec/Makefile | 1 -
drivers/usb/typec/qcom-pmic-typec.c | 262 ----------------------------
3 files changed, 276 deletions(-)
delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index ab480f38523aa..61fba7bd1671d 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -75,19 +75,6 @@ config TYPEC_STUSB160X
If you choose to build this driver as a dynamically linked module, the
module will be called stusb160x.ko.
-config TYPEC_QCOM_PMIC
- tristate "Qualcomm PMIC USB Type-C driver"
- depends on ARCH_QCOM || COMPILE_TEST
- depends on USB_ROLE_SWITCH || !USB_ROLE_SWITCH
- help
- Driver for supporting role switch over the Qualcomm PMIC. This will
- handle the USB Type-C role and orientation detection reported by the
- QCOM PMIC if the PMIC has the capability to handle USB Type-C
- detection.
-
- It will also enable the VBUS output to connected devices when a
- DFP connection is made.
-
source "drivers/usb/typec/mux/Kconfig"
source "drivers/usb/typec/altmodes/Kconfig"
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index a0adb8947a301..4dc7fc91159df 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -6,6 +6,5 @@ obj-$(CONFIG_TYPEC_TCPM) += tcpm/
obj-$(CONFIG_TYPEC_UCSI) += ucsi/
obj-$(CONFIG_TYPEC_TPS6598X) += tipd/
obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o
-obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o
obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o
obj-$(CONFIG_TYPEC) += mux/
diff --git a/drivers/usb/typec/qcom-pmic-typec.c b/drivers/usb/typec/qcom-pmic-typec.c
deleted file mode 100644
index a0454a80c4a21..0000000000000
--- a/drivers/usb/typec/qcom-pmic-typec.c
+++ /dev/null
@@ -1,262 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- */
-
-#include <linux/err.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-#include <linux/usb/role.h>
-#include <linux/usb/typec_mux.h>
-
-#define TYPEC_MISC_STATUS 0xb
-#define CC_ATTACHED BIT(0)
-#define CC_ORIENTATION BIT(1)
-#define SNK_SRC_MODE BIT(6)
-#define TYPEC_MODE_CFG 0x44
-#define TYPEC_DISABLE_CMD BIT(0)
-#define EN_SNK_ONLY BIT(1)
-#define EN_SRC_ONLY BIT(2)
-#define TYPEC_VCONN_CONTROL 0x46
-#define VCONN_EN_SRC BIT(0)
-#define VCONN_EN_VAL BIT(1)
-#define TYPEC_EXIT_STATE_CFG 0x50
-#define SEL_SRC_UPPER_REF BIT(2)
-#define TYPEC_INTR_EN_CFG_1 0x5e
-#define TYPEC_INTR_EN_CFG_1_MASK GENMASK(7, 0)
-
-struct qcom_pmic_typec {
- struct device *dev;
- struct regmap *regmap;
- u32 base;
-
- struct typec_port *port;
- struct usb_role_switch *role_sw;
-
- struct regulator *vbus_reg;
- bool vbus_enabled;
-};
-
-static void qcom_pmic_typec_enable_vbus_regulator(struct qcom_pmic_typec
- *qcom_usb, bool enable)
-{
- int ret;
-
- if (enable == qcom_usb->vbus_enabled)
- return;
-
- if (enable) {
- ret = regulator_enable(qcom_usb->vbus_reg);
- if (ret)
- return;
- } else {
- ret = regulator_disable(qcom_usb->vbus_reg);
- if (ret)
- return;
- }
- qcom_usb->vbus_enabled = enable;
-}
-
-static void qcom_pmic_typec_check_connection(struct qcom_pmic_typec *qcom_usb)
-{
- enum typec_orientation orientation;
- enum usb_role role;
- unsigned int stat;
- bool enable_vbus;
-
- regmap_read(qcom_usb->regmap, qcom_usb->base + TYPEC_MISC_STATUS,
- &stat);
-
- if (stat & CC_ATTACHED) {
- orientation = (stat & CC_ORIENTATION) ?
- TYPEC_ORIENTATION_REVERSE :
- TYPEC_ORIENTATION_NORMAL;
- typec_set_orientation(qcom_usb->port, orientation);
-
- role = (stat & SNK_SRC_MODE) ? USB_ROLE_HOST : USB_ROLE_DEVICE;
- if (role == USB_ROLE_HOST)
- enable_vbus = true;
- else
- enable_vbus = false;
- } else {
- role = USB_ROLE_NONE;
- enable_vbus = false;
- }
-
- qcom_pmic_typec_enable_vbus_regulator(qcom_usb, enable_vbus);
- usb_role_switch_set_role(qcom_usb->role_sw, role);
-}
-
-static irqreturn_t qcom_pmic_typec_interrupt(int irq, void *_qcom_usb)
-{
- struct qcom_pmic_typec *qcom_usb = _qcom_usb;
-
- qcom_pmic_typec_check_connection(qcom_usb);
- return IRQ_HANDLED;
-}
-
-static void qcom_pmic_typec_typec_hw_init(struct qcom_pmic_typec *qcom_usb,
- enum typec_port_type type)
-{
- u8 mode = 0;
-
- regmap_update_bits(qcom_usb->regmap,
- qcom_usb->base + TYPEC_INTR_EN_CFG_1,
- TYPEC_INTR_EN_CFG_1_MASK, 0);
-
- if (type == TYPEC_PORT_SRC)
- mode = EN_SRC_ONLY;
- else if (type == TYPEC_PORT_SNK)
- mode = EN_SNK_ONLY;
-
- regmap_update_bits(qcom_usb->regmap, qcom_usb->base + TYPEC_MODE_CFG,
- EN_SNK_ONLY | EN_SRC_ONLY, mode);
-
- regmap_update_bits(qcom_usb->regmap,
- qcom_usb->base + TYPEC_VCONN_CONTROL,
- VCONN_EN_SRC | VCONN_EN_VAL, VCONN_EN_SRC);
- regmap_update_bits(qcom_usb->regmap,
- qcom_usb->base + TYPEC_EXIT_STATE_CFG,
- SEL_SRC_UPPER_REF, SEL_SRC_UPPER_REF);
-}
-
-static int qcom_pmic_typec_probe(struct platform_device *pdev)
-{
- struct qcom_pmic_typec *qcom_usb;
- struct device *dev = &pdev->dev;
- struct fwnode_handle *fwnode;
- struct typec_capability cap;
- const char *buf;
- int ret, irq, role;
- u32 reg;
-
- ret = device_property_read_u32(dev, "reg", ®);
- if (ret < 0) {
- dev_err(dev, "missing base address\n");
- return ret;
- }
-
- qcom_usb = devm_kzalloc(dev, sizeof(*qcom_usb), GFP_KERNEL);
- if (!qcom_usb)
- return -ENOMEM;
-
- qcom_usb->dev = dev;
- qcom_usb->base = reg;
-
- qcom_usb->regmap = dev_get_regmap(dev->parent, NULL);
- if (!qcom_usb->regmap) {
- dev_err(dev, "Failed to get regmap\n");
- return -EINVAL;
- }
-
- qcom_usb->vbus_reg = devm_regulator_get(qcom_usb->dev, "usb_vbus");
- if (IS_ERR(qcom_usb->vbus_reg))
- return PTR_ERR(qcom_usb->vbus_reg);
-
- fwnode = device_get_named_child_node(dev, "connector");
- if (!fwnode)
- return -EINVAL;
-
- ret = fwnode_property_read_string(fwnode, "power-role", &buf);
- if (!ret) {
- role = typec_find_port_power_role(buf);
- if (role < 0)
- role = TYPEC_PORT_SNK;
- } else {
- role = TYPEC_PORT_SNK;
- }
- cap.type = role;
-
- ret = fwnode_property_read_string(fwnode, "data-role", &buf);
- if (!ret) {
- role = typec_find_port_data_role(buf);
- if (role < 0)
- role = TYPEC_PORT_UFP;
- } else {
- role = TYPEC_PORT_UFP;
- }
- cap.data = role;
-
- cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
- cap.fwnode = fwnode;
- qcom_usb->port = typec_register_port(dev, &cap);
- if (IS_ERR(qcom_usb->port)) {
- ret = PTR_ERR(qcom_usb->port);
- dev_err(dev, "Failed to register type c port %d\n", ret);
- goto err_put_node;
- }
- fwnode_handle_put(fwnode);
-
- qcom_usb->role_sw = fwnode_usb_role_switch_get(dev_fwnode(qcom_usb->dev));
- if (IS_ERR(qcom_usb->role_sw)) {
- if (PTR_ERR(qcom_usb->role_sw) != -EPROBE_DEFER)
- dev_err(dev, "failed to get role switch\n");
- ret = PTR_ERR(qcom_usb->role_sw);
- goto err_typec_port;
- }
-
- irq = platform_get_irq(pdev, 0);
- if (irq < 0)
- goto err_usb_role_sw;
-
- ret = devm_request_threaded_irq(qcom_usb->dev, irq, NULL,
- qcom_pmic_typec_interrupt, IRQF_ONESHOT,
- "qcom-pmic-typec", qcom_usb);
- if (ret) {
- dev_err(&pdev->dev, "Could not request IRQ\n");
- goto err_usb_role_sw;
- }
-
- platform_set_drvdata(pdev, qcom_usb);
- qcom_pmic_typec_typec_hw_init(qcom_usb, cap.type);
- qcom_pmic_typec_check_connection(qcom_usb);
-
- return 0;
-
-err_usb_role_sw:
- usb_role_switch_put(qcom_usb->role_sw);
-err_typec_port:
- typec_unregister_port(qcom_usb->port);
-err_put_node:
- fwnode_handle_put(fwnode);
-
- return ret;
-}
-
-static int qcom_pmic_typec_remove(struct platform_device *pdev)
-{
- struct qcom_pmic_typec *qcom_usb = platform_get_drvdata(pdev);
-
- usb_role_switch_set_role(qcom_usb->role_sw, USB_ROLE_NONE);
- qcom_pmic_typec_enable_vbus_regulator(qcom_usb, 0);
-
- typec_unregister_port(qcom_usb->port);
- usb_role_switch_put(qcom_usb->role_sw);
-
- return 0;
-}
-
-static const struct of_device_id qcom_pmic_typec_table[] = {
- { .compatible = "qcom,pm8150b-usb-typec" },
- { }
-};
-MODULE_DEVICE_TABLE(of, qcom_pmic_typec_table);
-
-static struct platform_driver qcom_pmic_typec = {
- .driver = {
- .name = "qcom,pmic-typec",
- .of_match_table = qcom_pmic_typec_table,
- },
- .probe = qcom_pmic_typec_probe,
- .remove = qcom_pmic_typec_remove,
-};
-module_platform_driver(qcom_pmic_typec);
-
-MODULE_DESCRIPTION("QCOM PMIC USB type C driver");
-MODULE_LICENSE("GPL v2");
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
` (5 preceding siblings ...)
2021-10-28 16:49 ` [RESEND PATCH v2 6/7] usb: typec: qcom: Remove standalone qcom pm8150b typec driver Bryan O'Donoghue
@ 2021-10-28 16:49 ` Bryan O'Donoghue
2021-10-29 16:40 ` kernel test robot
6 siblings, 1 reply; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 16:49 UTC (permalink / raw)
To: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: wcheng, bryan.odonoghue
The PM8150b contains both a type-c controller and a power-delivery PHY.
This driver binds both of those blocks together via a virtual TCPM driver.
qcom-pmic-tcpm.c is responsible for registering with tcpm and wrappers
calls into the type-c and pdphy drivers from tcpm.
Its up to qcom-pmic-tcpm.c to wait for both
qcom-pmic-pdphy.c and qcom-pmic-typec.c to probe before
registering a type-c port
qcom-pmic-pdphy.c implements a set functions that qcom-pmic-tcpm.c is
responsible for interfacing with the pdphy hardware and
processing power-delivery related calls from tcpm.
qcom-pmic-typec.c implements a similar interface for the typec hardware
interface and is responsible for notifying and processing
type-c related calls from tcpm.
In conjunction with appropriate entries in the platform dts we can
establish a source or sink contract with a PD peer and indeed negotiate SBU
alternative modes.
This code provides all of the same functionality as the existing
qcom typec driver plus power-delivery as well.
As a result commit 6c8cf3695176 ("usb: typec: Add QCOM PMIC typec detection
driver") can be deleted entirely.
References code from Jonathan Marek, Jack Pham, Wesley Cheng, Hemant Kumar,
Guru Das Srinagesh and Ashay Jaiswal.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
MAINTAINERS | 8 +
drivers/usb/typec/tcpm/Kconfig | 11 +
drivers/usb/typec/tcpm/Makefile | 1 +
drivers/usb/typec/tcpm/qcom/Makefile | 6 +
.../usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c | 313 +++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c | 606 +++++++++++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h | 85 +++
.../typec/tcpm/qcom/qcom_pmic_tcpm_typec.c | 638 ++++++++++++++++++
.../typec/tcpm/qcom/qcom_pmic_tcpm_typec.h | 163 +++++
9 files changed, 1831 insertions(+)
create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 8d118d7957d26..8f6a3099e5665 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15597,6 +15597,14 @@ S: Maintained
F: Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
F: drivers/thermal/qcom/
+QUALCOMM TYPEC PORT MANAGER DRIVER
+M: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+L: linux-arm-msm@vger.kernel.org
+L: linux-usb@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/usb/qcom,pmic-*.yaml
+F: drivers/usb/typec/tcpm/qcom/
+
QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
M: Stanimir Varbanov <stanimir.varbanov@linaro.org>
L: linux-media@vger.kernel.org
diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig
index 557f392fe24da..e012d90b1dc8c 100644
--- a/drivers/usb/typec/tcpm/Kconfig
+++ b/drivers/usb/typec/tcpm/Kconfig
@@ -66,4 +66,15 @@ config TYPEC_WCOVE
To compile this driver as module, choose M here: the module will be
called typec_wcove.ko
+config TYPEC_QCOM_PMIC
+ tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver"
+ depends on ARCH_QCOM || COMPILE_TEST
+ help
+ A Type-C port and Power Delivery driver which aggregates two
+ discrete pieces of silicon in the PM8150b PMIC block: the
+ Type-C port controller and the Power Delivery PHY.
+
+ This driver enables Type-C role switching, orientation, Alternate
+ mode and Power Delivery support both for VBUS and VCONN.
+
endif # TYPEC_TCPM
diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile
index 7d499f3569fde..b7333e0243672 100644
--- a/drivers/usb/typec/tcpm/Makefile
+++ b/drivers/usb/typec/tcpm/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o
obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o
obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o
obj-$(CONFIG_TYPEC_TCPCI_MAXIM) += tcpci_maxim.o
+obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom/
diff --git a/drivers/usb/typec/tcpm/qcom/Makefile b/drivers/usb/typec/tcpm/qcom/Makefile
new file mode 100644
index 0000000000000..b06dc116e21ef
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom_pmic_tcpm.o
+qcom_pmic_tcpm-y += qcom_pmic_tcpm_core.o \
+ qcom_pmic_tcpm_typec.o \
+ qcom_pmic_tcpm_pdphy.o
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c
new file mode 100644
index 0000000000000..d633a49cc9360
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_core.c
@@ -0,0 +1,313 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <linux/usb/role.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/typec_mux.h>
+#include "qcom_pmic_tcpm_pdphy.h"
+#include "qcom_pmic_tcpm_typec.h"
+
+struct pmic_tcpm {
+ struct device *dev;
+ struct pmic_typec *pmic_typec;
+ struct pmic_pdphy *pmic_pdphy;
+ struct tcpm_port *tcpm_port;
+ struct tcpc_dev tcpc;
+ bool vbus_enabled;
+ struct mutex lock; /* VBUS state serialization */
+};
+
+#define tcpc_to_tcpm(_tcpc_) container_of(_tcpc_, struct pmic_tcpm, tcpc)
+
+static int qcom_pmic_tcpm_core_get_vbus(struct tcpc_dev *tcpc)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+ int ret;
+
+ mutex_lock(&tcpm->lock);
+ ret = tcpm->vbus_enabled || qcom_pmic_tcpm_typec_get_vbus(tcpm->pmic_typec);
+ mutex_unlock(&tcpm->lock);
+
+ return ret;
+}
+
+static int qcom_pmic_tcpm_core_set_vbus(struct tcpc_dev *tcpc, bool on,
+ bool sink)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+ int ret = 0;
+
+ mutex_lock(&tcpm->lock);
+ if (tcpm->vbus_enabled == on)
+ goto done;
+
+ ret = qcom_pmic_tcpm_typec_set_vbus(tcpm->pmic_typec, on);
+ if (ret)
+ goto done;
+
+ tcpm->vbus_enabled = on;
+ tcpm_vbus_change(tcpm->tcpm_port);
+
+done:
+ dev_dbg(tcpm->dev, "set_vbus set: %d result %d\n", on, ret);
+ mutex_unlock(&tcpm->lock);
+
+ return ret;
+}
+
+static int qcom_pmic_tcpm_core_set_vconn(struct tcpc_dev *tcpc, bool on)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_typec_set_vconn(tcpm->pmic_typec, on);
+}
+
+static int qcom_pmic_tcpm_core_get_cc(struct tcpc_dev *tcpc,
+ enum typec_cc_status *cc1,
+ enum typec_cc_status *cc2)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_typec_get_cc(tcpm->pmic_typec, cc1, cc2);
+}
+
+static int qcom_pmic_tcpm_core_set_cc(struct tcpc_dev *tcpc,
+ enum typec_cc_status cc)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_typec_set_cc(tcpm->pmic_typec, cc);
+}
+
+static int qcom_pmic_tcpm_core_set_polarity(struct tcpc_dev *tcpc,
+ enum typec_cc_polarity pol)
+{
+ /* Polarity is set separately by phy-qcom-qmp.c */
+ return 0;
+}
+
+static int qcom_pmic_tcpm_core_start_toggling(struct tcpc_dev *tcpc,
+ enum typec_port_type port_type,
+ enum typec_cc_status cc)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_typec_start_toggling(tcpm->pmic_typec, port_type,
+ cc);
+}
+
+static int qcom_pmic_tcpm_core_set_roles(struct tcpc_dev *tcpc, bool attached,
+ enum typec_role power_role,
+ enum typec_data_role data_role)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_pdphy_set_roles(tcpm->pmic_pdphy, data_role,
+ power_role);
+}
+
+static int qcom_pmic_tcpm_core_set_pd_rx(struct tcpc_dev *tcpc, bool on)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_pdphy_set_pd_rx(tcpm->pmic_pdphy, on);
+}
+
+static int qcom_pmic_tcpm_core_pd_transmit(struct tcpc_dev *tcpc,
+ enum tcpm_transmit_type type,
+ const struct pd_message *msg,
+ unsigned int negotiated_rev)
+{
+ struct pmic_tcpm *tcpm = tcpc_to_tcpm(tcpc);
+
+ return qcom_pmic_tcpm_pdphy_pd_transmit(tcpm->pmic_pdphy, type, msg,
+ negotiated_rev);
+}
+
+static struct platform_device
+*qcom_pmic_tcpm_core_get_endpoint(struct device *dev, u32 port, u32 endpoint)
+{
+ struct device_node *remote;
+ struct platform_device *pdev;
+
+ remote = of_graph_get_remote_node(dev->of_node, port, endpoint);
+ if (!remote) {
+ dev_err(dev, "Remote endpoint %d not found\n", endpoint);
+ return ERR_PTR(-ENODEV);
+ }
+
+ pdev = of_find_device_by_node(remote);
+ of_node_put(remote);
+
+ if (pdev)
+ return pdev;
+
+ return ERR_PTR(-ENODEV);
+}
+
+static int qcom_pmic_tcpm_core_init(struct tcpc_dev *tcpc)
+{
+ return 0;
+}
+
+static int qcom_pmic_tcpm_core_probe(struct platform_device *pdev)
+{
+ struct pmic_tcpm *tcpm;
+ struct device *dev = &pdev->dev;
+ struct platform_device *typec_pdev;
+ struct platform_device *pdphy_pdev;
+ int ret;
+
+ tcpm = devm_kzalloc(dev, sizeof(*tcpm), GFP_KERNEL);
+ if (!tcpm)
+ return -ENOMEM;
+
+ tcpm->dev = dev;
+ tcpm->tcpc.init = qcom_pmic_tcpm_core_init;
+ tcpm->tcpc.get_vbus = qcom_pmic_tcpm_core_get_vbus;
+ tcpm->tcpc.set_vbus = qcom_pmic_tcpm_core_set_vbus;
+ tcpm->tcpc.set_cc = qcom_pmic_tcpm_core_set_cc;
+ tcpm->tcpc.get_cc = qcom_pmic_tcpm_core_get_cc;
+ tcpm->tcpc.set_polarity = qcom_pmic_tcpm_core_set_polarity;
+ tcpm->tcpc.set_vconn = qcom_pmic_tcpm_core_set_vconn;
+ tcpm->tcpc.start_toggling = qcom_pmic_tcpm_core_start_toggling;
+ tcpm->tcpc.set_pd_rx = qcom_pmic_tcpm_core_set_pd_rx;
+ tcpm->tcpc.set_roles = qcom_pmic_tcpm_core_set_roles;
+ tcpm->tcpc.pd_transmit = qcom_pmic_tcpm_core_pd_transmit;
+
+ mutex_init(&tcpm->lock);
+ platform_set_drvdata(pdev, tcpm);
+
+ typec_pdev = qcom_pmic_tcpm_core_get_endpoint(dev, 0, -1);
+ if (IS_ERR(typec_pdev)) {
+ dev_err(dev, "Error linking typec endpoint\n");
+ return PTR_ERR(typec_pdev);
+ }
+
+ tcpm->pmic_typec = platform_get_drvdata(typec_pdev);
+ if (!tcpm->pmic_typec) {
+ ret = -EPROBE_DEFER;
+ goto put_typec_pdev;
+ }
+
+ pdphy_pdev = qcom_pmic_tcpm_core_get_endpoint(dev, 1, -1);
+ if (IS_ERR(pdphy_pdev)) {
+ dev_err(dev, "Error linking pdphy endpoint\n");
+ ret = PTR_ERR(pdphy_pdev);
+ goto put_typec_pdev;
+ }
+
+ tcpm->pmic_pdphy = platform_get_drvdata(pdphy_pdev);
+ if (!tcpm->pmic_pdphy) {
+ ret = -EPROBE_DEFER;
+ goto put_pdphy_dev;
+ }
+
+ tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector");
+ if (IS_ERR(tcpm->tcpc.fwnode))
+ return PTR_ERR(tcpm->tcpc.fwnode);
+
+ tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc);
+ if (IS_ERR(tcpm->tcpm_port)) {
+ ret = PTR_ERR(tcpm->tcpm_port);
+ goto fwnode_remove;
+ }
+
+ ret = qcom_pmic_tcpm_pdphy_init(tcpm->pmic_pdphy, tcpm->tcpm_port);
+ if (ret)
+ goto fwnode_remove;
+
+ ret = qcom_pmic_tcpm_typec_init(tcpm->pmic_typec, tcpm->tcpm_port);
+ if (ret)
+ goto fwnode_remove;
+
+ return 0;
+
+fwnode_remove:
+ fwnode_remove_software_node(tcpm->tcpc.fwnode);
+
+put_pdphy_dev:
+ put_device(&pdphy_pdev->dev);
+
+put_typec_pdev:
+ put_device(&typec_pdev->dev);
+
+ return ret;
+}
+
+static int qcom_pmic_tcpm_core_remove(struct platform_device *pdev)
+{
+ struct pmic_tcpm *tcpm = platform_get_drvdata(pdev);
+
+ tcpm_unregister_port(tcpm->tcpm_port);
+ fwnode_remove_software_node(tcpm->tcpc.fwnode);
+ qcom_pmic_tcpm_pdphy_put(tcpm->pmic_pdphy);
+ qcom_pmic_tcpm_typec_put(tcpm->pmic_typec);
+
+ return 0;
+}
+
+static const struct of_device_id qcom_pmic_tcpm_core_table[] = {
+ { .compatible = "qcom,pmic-tcpm" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, qcom_pmic_tcpm_core_table);
+
+static struct platform_driver qcom_pmic_tcpm_core_platform_driver = {
+ .driver = {
+ .name = "qcom,pmic-tcpm",
+ .of_match_table = qcom_pmic_tcpm_core_table,
+ },
+ .probe = qcom_pmic_tcpm_core_probe,
+ .remove = qcom_pmic_tcpm_core_remove,
+};
+
+static int __init qcom_pmic_tcpm_core_module_init(void)
+{
+ int ret;
+
+ ret = platform_driver_register(&qcom_pmic_tcpm_typec_platform_driver);
+ if (ret)
+ return ret;
+
+ ret = platform_driver_register(&qcom_pmic_tcpm_pdphy_platform_driver);
+ if (ret)
+ goto unregister_typec;
+
+ ret = platform_driver_register(&qcom_pmic_tcpm_core_platform_driver);
+ if (ret)
+ goto unregister_pdphy;
+
+ return 0;
+
+unregister_pdphy:
+ platform_driver_unregister(&qcom_pmic_tcpm_pdphy_platform_driver);
+
+unregister_typec:
+ platform_driver_unregister(&qcom_pmic_tcpm_typec_platform_driver);
+
+ return ret;
+}
+module_init(qcom_pmic_tcpm_core_module_init);
+
+static void __exit qcom_pmic_tcpm_core_module_exit(void)
+{
+ platform_driver_unregister(&qcom_pmic_tcpm_core_platform_driver);
+ platform_driver_unregister(&qcom_pmic_tcpm_pdphy_platform_driver);
+ platform_driver_unregister(&qcom_pmic_tcpm_typec_platform_driver);
+}
+module_exit(qcom_pmic_tcpm_core_module_exit);
+
+MODULE_DESCRIPTION("QCOM PMIC USB Type-C Port Manager Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c
new file mode 100644
index 0000000000000..64821ad3fd345
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c
@@ -0,0 +1,606 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <linux/usb/pd.h>
+#include <linux/usb/tcpm.h>
+#include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h>
+#include "qcom_pmic_tcpm_pdphy.h"
+
+#define PMIC_PDPHY_MAX_IRQS 0x08
+
+struct pmic_pdphy_irq_params {
+ int virq;
+ char *irq_name;
+};
+
+struct pmic_pdphy_resources {
+ unsigned int nr_irqs;
+ struct pmic_pdphy_irq_params irq_params[PMIC_PDPHY_MAX_IRQS];
+};
+
+struct pmic_pdphy_irq_data {
+ int virq;
+ int irq;
+ struct pmic_pdphy *pmic_pdphy;
+};
+
+struct pmic_pdphy {
+ struct device *dev;
+ struct tcpm_port *tcpm_port;
+ struct regmap *regmap;
+ u32 base;
+
+ unsigned int nr_irqs;
+ struct pmic_pdphy_irq_data *irq_data;
+
+ struct work_struct reset_work;
+ struct work_struct receive_work;
+ struct regulator *vdd_pdphy;
+ spinlock_t lock; /* Register atomicity */
+};
+
+static void qcom_pmic_tcpm_pdphy_reset_on(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ int ret;
+
+ /* Terminate TX */
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_FRAME_FILTER_REG, 0);
+ if (ret)
+ goto err;
+
+ return;
+err:
+ dev_err(dev, "pd_reset_on error\n");
+}
+
+static void qcom_pmic_tcpm_pdphy_reset_off(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ int ret;
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_FRAME_FILTER_REG,
+ FRAME_FILTER_EN_SOP | FRAME_FILTER_EN_HARD_RESET);
+ if (ret)
+ dev_err(dev, "pd_reset_off error\n");
+
+ return;
+}
+
+static void qcom_pmic_tcpm_pdphy_sig_reset_work(struct work_struct *work)
+{
+ struct pmic_pdphy *pmic_pdphy = container_of(work, struct pmic_pdphy,
+ reset_work);
+ unsigned long flags;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ qcom_pmic_tcpm_pdphy_reset_on(pmic_pdphy);
+ qcom_pmic_tcpm_pdphy_reset_off(pmic_pdphy);
+
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ tcpm_pd_hard_reset(pmic_pdphy->tcpm_port);
+}
+
+static int
+qcom_pmic_tcpm_pdphy_clear_tx_control_reg(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ unsigned int val;
+ int ret;
+
+ /* Clear TX control register */
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0);
+ if (ret)
+ goto done;
+
+ /* Perform readback to ensure sufficient delay for command to latch */
+ ret = regmap_read(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_CONTROL_REG, &val);
+
+done:
+ if (ret)
+ dev_err(dev, "pd_clear_tx_control_reg: clear tx flag\n");
+
+ return ret;
+}
+
+static int
+qcom_pmic_tcpm_pdphy_pd_transmit_signal(struct pmic_pdphy *pmic_pdphy,
+ enum tcpm_transmit_type type,
+ unsigned int negotiated_rev)
+{
+ struct device *dev = pmic_pdphy->dev;
+ unsigned int val;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ /* Clear TX control register */
+ ret = qcom_pmic_tcpm_pdphy_clear_tx_control_reg(pmic_pdphy);
+ if (ret)
+ goto done;
+
+ val = TX_CONTROL_SEND_SIGNAL;
+ if (negotiated_rev == PD_REV30)
+ val |= TX_CONTROL_RETRY_COUNT(2);
+ else
+ val |= TX_CONTROL_RETRY_COUNT(3);
+
+ if (type == TCPC_TX_CABLE_RESET || type == TCPC_TX_HARD_RESET)
+ val |= TX_CONTROL_FRAME_TYPE(1);
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val);
+
+done:
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ dev_vdbg(dev, "pd_transmit_signal: type %d negotiate_rev %d send %d\n",
+ type, negotiated_rev, ret);
+
+ return ret;
+}
+
+static int
+qcom_pmic_tcpm_pdphy_pd_transmit_payload(struct pmic_pdphy *pmic_pdphy,
+ enum tcpm_transmit_type type,
+ const struct pd_message *msg,
+ unsigned int negotiated_rev)
+{
+ struct device *dev = pmic_pdphy->dev;
+ unsigned int val, hdr_len, txbuf_len, txsize_len;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ ret = regmap_read(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG,
+ &val);
+ if (ret)
+ goto done;
+
+ if (val) {
+ dev_err(dev, "pd_transmit_payload: RX message pending\n");
+ ret = -EBUSY;
+ goto done;
+ }
+
+ /* Clear TX control register */
+ ret = qcom_pmic_tcpm_pdphy_clear_tx_control_reg(pmic_pdphy);
+ if (ret)
+ goto done;
+
+ hdr_len = sizeof(msg->header);
+ txbuf_len = pd_header_cnt_le(msg->header) * 4;
+ txsize_len = hdr_len + txbuf_len - 1;
+
+ /* Write message header sizeof(u16) to USB_PDPHY_TX_BUFFER_HDR_REG */
+ ret = regmap_bulk_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_BUFFER_HDR_REG,
+ &msg->header, hdr_len);
+ if (ret)
+ goto done;
+
+ /* Write payload to USB_PDPHY_TX_BUFFER_DATA_REG for txbuf_len */
+ if (txbuf_len) {
+ ret = regmap_bulk_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_BUFFER_DATA_REG,
+ &msg->payload, txbuf_len);
+ if (ret)
+ goto done;
+ }
+
+ /* Write total length ((header + data) - 1) to USB_PDPHY_TX_SIZE_REG */
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_SIZE_REG,
+ txsize_len);
+ if (ret)
+ goto done;
+
+ /* Clear TX control register */
+ ret = qcom_pmic_tcpm_pdphy_clear_tx_control_reg(pmic_pdphy);
+ if (ret)
+ goto done;
+
+ /* Initiate transmit with retry count as indicated by PD revision */
+ val = TX_CONTROL_FRAME_TYPE(type) | TX_CONTROL_SEND_MSG;
+ if (pd_header_rev(msg->header) == PD_REV30)
+ val |= TX_CONTROL_RETRY_COUNT(2);
+ else
+ val |= TX_CONTROL_RETRY_COUNT(3);
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val);
+
+done:
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ if (ret) {
+ dev_err(dev, "pd_transmit_payload: %d hdr %*ph data %*ph ret %d\n",
+ ret, hdr_len, &msg->header, txbuf_len, &msg->payload, ret);
+ }
+
+ return ret;
+}
+
+int qcom_pmic_tcpm_pdphy_pd_transmit(struct pmic_pdphy *pmic_pdphy,
+ enum tcpm_transmit_type type,
+ const struct pd_message *msg,
+ unsigned int negotiated_rev)
+{
+ struct device *dev = pmic_pdphy->dev;
+ int ret;
+
+ if (msg) {
+ ret = qcom_pmic_tcpm_pdphy_pd_transmit_payload(pmic_pdphy, type,
+ msg,
+ negotiated_rev);
+ } else {
+ ret = qcom_pmic_tcpm_pdphy_pd_transmit_signal(pmic_pdphy, type,
+ negotiated_rev);
+ }
+
+ if (ret)
+ dev_dbg(dev, "pd_transmit: type %x result %d\n", type, ret);
+
+ return ret;
+}
+
+static void qcom_pmic_tcpm_pdphy_pd_receive(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ struct pd_message msg;
+ unsigned int size, rx_status;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ ret = regmap_read(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_SIZE_REG, &size);
+ if (ret)
+ goto done;
+
+ /* If we received a subsequent RX sig this value can be zero */
+ if ((size < 1 || size > sizeof(msg.payload))) {
+ dev_dbg(dev, "pd_receive: invalid size %d\n", size);
+ goto done;
+ }
+
+ size += 1;
+ ret = regmap_read(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_STATUS_REG,
+ &rx_status);
+
+ if (ret)
+ goto done;
+
+ ret = regmap_bulk_read(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_BUFFER_REG,
+ (u8 *)&msg, size);
+ if (ret)
+ goto done;
+
+ /* Return ownership of RX buffer to hardware */
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, 0);
+
+done:
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ if (!ret) {
+ dev_vdbg(dev, "pd_receive: handing %d bytes to tcpm\n", size);
+ tcpm_pd_receive(pmic_pdphy->tcpm_port, &msg);
+ }
+}
+
+static irqreturn_t qcom_pmic_tcpm_pdphy_isr(int irq, void *dev_id)
+{
+ struct pmic_pdphy_irq_data *irq_data = dev_id;
+ struct pmic_pdphy *pmic_pdphy = irq_data->pmic_pdphy;
+ struct device *dev = pmic_pdphy->dev;
+
+ switch (irq_data->virq) {
+ case PMIC_PDPHY_SIG_TX_IRQ:
+ dev_err(dev, "isr: tx_sig\n");
+ break;
+ case PMIC_PDPHY_SIG_RX_IRQ:
+ schedule_work(&pmic_pdphy->reset_work);
+ break;
+ case PMIC_PDPHY_MSG_TX_IRQ:
+ tcpm_pd_transmit_complete(pmic_pdphy->tcpm_port,
+ TCPC_TX_SUCCESS);
+ break;
+ case PMIC_PDPHY_MSG_RX_IRQ:
+ qcom_pmic_tcpm_pdphy_pd_receive(pmic_pdphy);
+ break;
+ case PMIC_PDPHY_MSG_TX_FAIL_IRQ:
+ tcpm_pd_transmit_complete(pmic_pdphy->tcpm_port,
+ TCPC_TX_FAILED);
+ break;
+ case PMIC_PDPHY_MSG_TX_DISCARD_IRQ:
+ tcpm_pd_transmit_complete(pmic_pdphy->tcpm_port,
+ TCPC_TX_DISCARDED);
+ break;
+ }
+
+ return IRQ_HANDLED;
+}
+
+int qcom_pmic_tcpm_pdphy_set_pd_rx(struct pmic_pdphy *pmic_pdphy, bool on)
+{
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, !on);
+
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ dev_dbg(pmic_pdphy->dev, "set_pd_rx: %s\n", on ? "on" : "off");
+
+ return ret;
+}
+
+int qcom_pmic_tcpm_pdphy_set_roles(struct pmic_pdphy *pmic_pdphy,
+ bool data_role_host, bool power_role_src)
+{
+ struct device *dev = pmic_pdphy->dev;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_pdphy->lock, flags);
+
+ ret = regmap_update_bits(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
+ MSG_CONFIG_PORT_DATA_ROLE |
+ MSG_CONFIG_PORT_POWER_ROLE,
+ data_role_host << 3 | power_role_src << 2);
+
+ spin_unlock_irqrestore(&pmic_pdphy->lock, flags);
+
+ dev_dbg(dev, "pdphy_set_roles: data_role_host=%d power_role_src=%d\n",
+ data_role_host, power_role_src);
+
+ return ret;
+}
+
+static int qcom_pmic_tcpm_pdphy_enable(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ int ret;
+
+ ret = regulator_enable(pmic_pdphy->vdd_pdphy);
+ if (ret)
+ return ret;
+
+ /* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */
+ ret = regmap_update_bits(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
+ MSG_CONFIG_SPEC_REV_MASK, PD_REV20);
+ if (ret)
+ goto done;
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);
+ if (ret)
+ goto done;
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_EN_CONTROL_REG,
+ CONTROL_ENABLE);
+ if (ret)
+ goto done;
+
+ qcom_pmic_tcpm_pdphy_reset_off(pmic_pdphy);
+done:
+ if (ret)
+ dev_err(dev, "pdphy_enable fail %d\n", ret);
+
+ return ret;
+}
+
+static int qcom_pmic_tcpm_pdphy_disable(struct pmic_pdphy *pmic_pdphy)
+{
+ struct device *dev = pmic_pdphy->dev;
+ int ret;
+
+ qcom_pmic_tcpm_pdphy_reset_on(pmic_pdphy);
+
+ ret = regmap_write(pmic_pdphy->regmap,
+ pmic_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);
+
+ regulator_disable(pmic_pdphy->vdd_pdphy);
+
+ return ret;
+}
+
+static int pmic_pdphy_reset(struct pmic_pdphy *pmic_pdphy)
+{
+ int ret;
+
+ ret = qcom_pmic_tcpm_pdphy_disable(pmic_pdphy);
+ if (ret)
+ goto done;
+
+ usleep_range(400, 500);
+ ret = qcom_pmic_tcpm_pdphy_enable(pmic_pdphy);
+done:
+ return ret;
+}
+
+int qcom_pmic_tcpm_pdphy_init(struct pmic_pdphy *pmic_pdphy,
+ struct tcpm_port *tcpm_port)
+{
+ int i;
+ int ret;
+
+ pmic_pdphy->tcpm_port = tcpm_port;
+
+ ret = pmic_pdphy_reset(pmic_pdphy);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < pmic_pdphy->nr_irqs; i++)
+ enable_irq(pmic_pdphy->irq_data[i].irq);
+
+ return 0;
+}
+
+void qcom_pmic_tcpm_pdphy_put(struct pmic_pdphy *pmic_pdphy)
+{
+ put_device(pmic_pdphy->dev);
+}
+
+static int qcom_pmic_tcpm_pdphy_probe(struct platform_device *pdev)
+{
+ struct pmic_pdphy *pmic_pdphy;
+ struct device *dev = &pdev->dev;
+ const struct pmic_pdphy_resources *res;
+ struct pmic_pdphy_irq_data *irq_data;
+ int i, ret, irq;
+ u32 reg;
+
+ ret = device_property_read_u32(dev, "reg", ®);
+ if (ret < 0) {
+ dev_err(dev, "missing base address\n");
+ return ret;
+ }
+
+ res = of_device_get_match_data(dev);
+ if (!res)
+ return -ENODEV;
+
+ if (!res->nr_irqs || res->nr_irqs > PMIC_PDPHY_MAX_IRQS)
+ return -EINVAL;
+
+ pmic_pdphy = devm_kzalloc(dev, sizeof(*pmic_pdphy), GFP_KERNEL);
+ if (!pmic_pdphy)
+ return -ENOMEM;
+
+ irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs,
+ GFP_KERNEL);
+ if (!irq_data)
+ return -ENOMEM;
+
+ pmic_pdphy->dev = dev;
+ pmic_pdphy->base = reg;
+ pmic_pdphy->nr_irqs = res->nr_irqs;
+ pmic_pdphy->irq_data = irq_data;
+ spin_lock_init(&pmic_pdphy->lock);
+ INIT_WORK(&pmic_pdphy->reset_work, qcom_pmic_tcpm_pdphy_sig_reset_work);
+
+ pmic_pdphy->regmap = dev_get_regmap(dev->parent, NULL);
+ if (!pmic_pdphy->regmap) {
+ dev_err(dev, "Failed to get regmap\n");
+ return -ENODEV;
+ }
+
+ pmic_pdphy->vdd_pdphy = devm_regulator_get(dev, "vdd-pdphy");
+ if (IS_ERR(pmic_pdphy->vdd_pdphy))
+ return PTR_ERR(pmic_pdphy->vdd_pdphy);
+
+ platform_set_drvdata(pdev, pmic_pdphy);
+ for (i = 0; i < res->nr_irqs; i++, irq_data++) {
+ irq = platform_get_irq_byname(pdev, res->irq_params[i].irq_name);
+ if (irq < 0)
+ return irq;
+
+ irq_data->pmic_pdphy = pmic_pdphy;
+ irq_data->irq = irq;
+ irq_data->virq = res->irq_params[i].virq;
+
+ ret = devm_request_threaded_irq(dev, irq, NULL,
+ qcom_pmic_tcpm_pdphy_isr,
+ IRQF_ONESHOT | IRQF_NO_AUTOEN,
+ res->irq_params[i].irq_name,
+ irq_data);
+ if (ret)
+ return ret;
+ }
+ return 0;
+}
+
+static int qcom_pmic_tcpm_pdphy_remove(struct platform_device *pdev)
+{
+ struct pmic_pdphy *pmic_pdphy = platform_get_drvdata(pdev);
+
+ qcom_pmic_tcpm_pdphy_reset_on(pmic_pdphy);
+
+ return 0;
+}
+
+static struct pmic_pdphy_resources pm8150b_pdphy_res = {
+ .irq_params = {
+ {
+ .virq = PMIC_PDPHY_SIG_TX_IRQ,
+ .irq_name = "pmic-pdphy-sig-tx",
+ },
+ {
+ .virq = PMIC_PDPHY_SIG_RX_IRQ,
+ .irq_name = "pmic-pdphy-sig-rx",
+ },
+ {
+ .virq = PMIC_PDPHY_MSG_TX_IRQ,
+ .irq_name = "pmic-pdphy-msg-tx",
+ },
+ {
+ .virq = PMIC_PDPHY_MSG_RX_IRQ,
+ .irq_name = "pmic-pdphy-msg-rx",
+ },
+ {
+ .virq = PMIC_PDPHY_MSG_TX_FAIL_IRQ,
+ .irq_name = "pmic-pdphy-msg-tx-failed",
+ },
+ {
+ .virq = PMIC_PDPHY_MSG_TX_DISCARD_IRQ,
+ .irq_name = "pmic-pdphy-msg-tx-discarded",
+ },
+ {
+ .virq = PMIC_PDPHY_MSG_RX_DISCARD_IRQ,
+ .irq_name = "pmic-pdphy-msg-rx-discarded",
+ },
+ },
+ .nr_irqs = 7,
+};
+
+static const struct of_device_id qcom_pmic_tcpm_pdphy_table[] = {
+ { .compatible = "qcom,pm8150b-pdphy", .data = &pm8150b_pdphy_res },
+ { },
+};
+MODULE_DEVICE_TABLE(of, qcom_pmic_tcpm_pdphy_table);
+
+struct platform_driver qcom_pmic_tcpm_pdphy_platform_driver = {
+ .driver = {
+ .name = "qcom,pmic-usb-pdphy",
+ .of_match_table = qcom_pmic_tcpm_pdphy_table,
+ },
+ .probe = qcom_pmic_tcpm_pdphy_probe,
+ .remove = qcom_pmic_tcpm_pdphy_remove,
+};
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h
new file mode 100644
index 0000000000000..9f712a88024b7
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.h
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+#ifndef __QCOM_PMIC_PDPHY_H__
+#define __QCOM_PMIC_PDPHY_H__
+
+#define USB_PDPHY_MAX_DATA_OBJ_LEN 28
+#define USB_PDPHY_MSG_HDR_LEN 2
+
+/* PD PHY register offsets and bit fields */
+#define USB_PDPHY_MSG_CONFIG_REG 0x40
+#define MSG_CONFIG_PORT_DATA_ROLE BIT(3)
+#define MSG_CONFIG_PORT_POWER_ROLE BIT(2)
+#define MSG_CONFIG_SPEC_REV_MASK (BIT(1) | BIT(0))
+
+#define USB_PDPHY_EN_CONTROL_REG 0x46
+#define CONTROL_ENABLE BIT(0)
+
+#define USB_PDPHY_RX_STATUS_REG 0x4A
+#define RX_FRAME_TYPE (BIT(0) | BIT(1) | BIT(2))
+
+#define USB_PDPHY_FRAME_FILTER_REG 0x4C
+#define FRAME_FILTER_EN_HARD_RESET BIT(5)
+#define FRAME_FILTER_EN_SOP BIT(0)
+
+#define USB_PDPHY_TX_SIZE_REG 0x42
+#define TX_SIZE_MASK 0xF
+
+#define USB_PDPHY_TX_CONTROL_REG 0x44
+#define TX_CONTROL_RETRY_COUNT(n) (((n) & 0x3) << 5)
+#define TX_CONTROL_FRAME_TYPE(n) (((n) & 0x7) << 2)
+#define TX_CONTROL_FRAME_TYPE_CABLE_RESET (0x1 << 2)
+#define TX_CONTROL_SEND_SIGNAL BIT(1)
+#define TX_CONTROL_SEND_MSG BIT(0)
+
+#define USB_PDPHY_RX_SIZE_REG 0x48
+
+#define USB_PDPHY_RX_ACKNOWLEDGE_REG 0x4B
+#define RX_BUFFER_TOKEN BIT(0)
+
+#define USB_PDPHY_BIST_MODE_REG 0x4E
+#define BIST_MODE_MASK 0xF
+#define BIST_ENABLE BIT(7)
+#define PD_MSG_BIST 0x3
+#define PD_BIST_TEST_DATA_MODE 0x8
+
+#define USB_PDPHY_TX_BUFFER_HDR_REG 0x60
+#define USB_PDPHY_TX_BUFFER_DATA_REG 0x62
+
+#define USB_PDPHY_RX_BUFFER_REG 0x80
+
+/* VDD regulator */
+#define VDD_PDPHY_VOL_MIN 2800000 /* uV */
+#define VDD_PDPHY_VOL_MAX 3300000 /* uV */
+#define VDD_PDPHY_HPM_LOAD 3000 /* uA */
+
+/* Message Spec Rev field */
+#define PD_MSG_HDR_REV(hdr) (((hdr) >> 6) & 3)
+
+/* timers */
+#define RECEIVER_RESPONSE_TIME 15 /* tReceiverResponse */
+#define HARD_RESET_COMPLETE_TIME 5 /* tHardResetComplete */
+
+struct pmic_pdphy;
+extern struct platform_driver qcom_pmic_tcpm_pdphy_platform_driver;
+
+int qcom_pmic_tcpm_pdphy_init(struct pmic_pdphy *pmic_pdphy,
+ struct tcpm_port *tcpm_port);
+
+void qcom_pmic_tcpm_pdphy_put(struct pmic_pdphy *pmic_pdphy);
+
+int qcom_pmic_tcpm_pdphy_set_roles(struct pmic_pdphy *pmic_pdphy,
+ bool power_role_src,
+ bool data_role_host);
+
+int qcom_pmic_tcpm_pdphy_set_pd_rx(struct pmic_pdphy *pmic_pdphy, bool on);
+
+int qcom_pmic_tcpm_pdphy_pd_transmit(struct pmic_pdphy *pmic_pdphy,
+ enum tcpm_transmit_type type,
+ const struct pd_message *msg,
+ unsigned int negotiated_rev);
+
+#endif /* __QCOM_PMIC_PDPHY_H__ */
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
new file mode 100644
index 0000000000000..f72656a0fbc79
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
@@ -0,0 +1,638 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/typec_mux.h>
+#include <linux/workqueue.h>
+#include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h>
+#include "qcom_pmic_tcpm_typec.h"
+
+#define PMIC_TYPEC_MAX_IRQS 0x08
+
+struct pmic_typec_irq_params {
+ int virq;
+ char *irq_name;
+};
+
+struct pmic_typec_resources {
+ unsigned int nr_irqs;
+ struct pmic_typec_irq_params irq_params[PMIC_TYPEC_MAX_IRQS];
+};
+
+struct pmic_typec_irq_data {
+ int virq;
+ int irq;
+ struct pmic_typec *pmic_typec;
+};
+
+struct pmic_typec {
+ struct device *dev;
+ struct tcpm_port *tcpm_port;
+ struct regmap *regmap;
+ u32 base;
+ unsigned int nr_irqs;
+ struct pmic_typec_irq_data *irq_data;
+
+ struct regulator *vdd_vbus;
+
+ int cc;
+ bool debouncing_cc;
+ struct delayed_work cc_debounce_dwork;
+
+ spinlock_t lock; /* Register atomicity */
+};
+
+static const char * const typec_cc_status_name[] = {
+ [TYPEC_CC_OPEN] = "Open",
+ [TYPEC_CC_RA] = "Ra",
+ [TYPEC_CC_RD] = "Rd",
+ [TYPEC_CC_RP_DEF] = "Rp-def",
+ [TYPEC_CC_RP_1_5] = "Rp-1.5",
+ [TYPEC_CC_RP_3_0] = "Rp-3.0",
+};
+
+static const char *rp_unknown = "unknown";
+
+static const char *cc_to_name(enum typec_cc_status cc)
+{
+ if (cc > TYPEC_CC_RP_3_0)
+ return rp_unknown;
+
+ return typec_cc_status_name[cc];
+}
+
+static const char * const rp_sel_name[] = {
+ [TYPEC_SRC_RP_SEL_80UA] = "Rp-def-80uA",
+ [TYPEC_SRC_RP_SEL_180UA] = "Rp-1.5-180uA",
+ [TYPEC_SRC_RP_SEL_330UA] = "Rp-3.0-330uA",
+};
+
+static const char *rp_sel_to_name(int rp_sel)
+{
+ if (rp_sel > TYPEC_SRC_RP_SEL_330UA)
+ return rp_unknown;
+
+ return rp_sel_name[rp_sel];
+}
+
+#define misc_to_cc(msic) !!(misc & CC_ORIENTATION) ? "cc1" : "cc2"
+#define misc_to_vconn(msic) !!(misc & CC_ORIENTATION) ? "cc2" : "cc1"
+
+static void qcom_pmic_tcpm_typec_cc_debounce(struct work_struct *work)
+{
+ struct pmic_typec *pmic_typec =
+ container_of(work, struct pmic_typec, cc_debounce_dwork.work);
+ unsigned long flags;
+
+ spin_lock_irqsave(&pmic_typec->lock, flags);
+ pmic_typec->debouncing_cc = false;
+ spin_unlock_irqrestore(&pmic_typec->lock, flags);
+
+ dev_dbg(pmic_typec->dev, "Debounce cc complete\n");
+}
+
+static irqreturn_t pmic_typec_isr(int irq, void *dev_id)
+{
+ struct pmic_typec_irq_data *irq_data = dev_id;
+ struct pmic_typec *pmic_typec = irq_data->pmic_typec;
+ u32 misc_stat;
+ bool vbus_change = false;
+ bool cc_change = false;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_typec->lock, flags);
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG,
+ &misc_stat);
+ if (ret)
+ goto done;
+
+ switch (irq_data->virq) {
+ case PMIC_TYPEC_VBUS_IRQ:
+ /* Incoming vbus assert/de-assert detect */
+ vbus_change = true;
+ break;
+ case PMIC_TYPEC_CC_STATE_IRQ:
+ if (!pmic_typec->debouncing_cc)
+ cc_change = true;
+ break;
+ case PMIC_TYPEC_ATTACH_DETACH_IRQ:
+ if (!pmic_typec->debouncing_cc)
+ cc_change = true;
+ break;
+ }
+
+done:
+ spin_unlock_irqrestore(&pmic_typec->lock, flags);
+
+ if (vbus_change)
+ tcpm_vbus_change(pmic_typec->tcpm_port);
+
+ if (cc_change)
+ tcpm_cc_change(pmic_typec->tcpm_port);
+
+ return IRQ_HANDLED;
+}
+
+int qcom_pmic_tcpm_typec_get_vbus(struct pmic_typec *pmic_typec)
+{
+ struct device *dev = pmic_typec->dev;
+ unsigned int misc;
+ int ret;
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG,
+ &misc);
+ if (ret)
+ misc = 0;
+
+ dev_dbg(dev, "get_vbus: 0x%08x detect %d\n", misc, !!(misc & TYPEC_VBUS_DETECT));
+
+ return !!(misc & TYPEC_VBUS_DETECT);
+}
+
+int qcom_pmic_tcpm_typec_set_vbus(struct pmic_typec *pmic_typec, bool on)
+{
+ u32 sm_stat;
+ u32 val;
+ int ret;
+
+ if (on) {
+ ret = regulator_enable(pmic_typec->vdd_vbus);
+ if (ret)
+ return ret;
+
+ val = TYPEC_SM_VBUS_VSAFE5V;
+ } else {
+ ret = regulator_disable(pmic_typec->vdd_vbus);
+ if (ret)
+ return ret;
+
+ val = TYPEC_SM_VBUS_VSAFE0V;
+ }
+
+ /* Poll waiting for transition to required vSafe5V or vSafe0V */
+ ret = regmap_read_poll_timeout(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_SM_STATUS_REG,
+ sm_stat, sm_stat & val,
+ 100, 250000);
+ if (ret)
+ dev_err(pmic_typec->dev, "vbus vsafe%dv fail\n", on ? 5 : 0);
+
+ return ret;
+}
+
+int qcom_pmic_tcpm_typec_get_cc(struct pmic_typec *pmic_typec,
+ enum typec_cc_status *cc1,
+ enum typec_cc_status *cc2)
+{
+ struct device *dev = pmic_typec->dev;
+ unsigned int misc, val;
+ bool attached, debounced;
+ int ret = 0;
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG, &misc);
+ if (ret)
+ goto done;
+
+ attached = !!(misc & CC_ATTACHED);
+ debounced = !!(misc & TYPEC_DEBOUNCE_DONE);
+
+ if (pmic_typec->debouncing_cc) {
+ ret = -EBUSY;
+ goto done;
+ }
+
+ *cc1 = TYPEC_CC_OPEN;
+ *cc2 = TYPEC_CC_OPEN;
+
+ if (!(attached))
+ goto done;
+
+ if (misc & SNK_SRC_MODE) {
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_SRC_STATUS_REG,
+ &val);
+ if (ret)
+ goto done;
+ switch (val & DETECTED_SRC_TYPE_MASK) {
+ case SRC_RD_OPEN:
+ val = TYPEC_CC_RD;
+ break;
+ case SRC_RD_RA_VCONN:
+ val = TYPEC_CC_RD;
+ *cc1 = TYPEC_CC_RA;
+ *cc2 = TYPEC_CC_RA;
+ break;
+ default:
+ dev_warn(dev, "unexpected src status %.2x\n", val);
+ val = TYPEC_CC_RD;
+ break;
+ }
+ } else {
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_SNK_STATUS_REG,
+ &val);
+ if (ret)
+ goto done;
+ switch (val & DETECTED_SNK_TYPE_MASK) {
+ case SNK_RP_STD:
+ val = TYPEC_CC_RP_DEF;
+ break;
+ case SNK_RP_1P5:
+ val = TYPEC_CC_RP_1_5;
+ break;
+ case SNK_RP_3P0:
+ val = TYPEC_CC_RP_3_0;
+ break;
+ default:
+ dev_warn(dev, "unexpected snk status %.2x\n", val);
+ val = TYPEC_CC_RP_DEF;
+ break;
+ }
+ val = TYPEC_CC_RP_DEF;
+ }
+
+ if (misc & CC_ORIENTATION)
+ *cc2 = val;
+ else
+ *cc1 = val;
+
+done:
+ dev_dbg(dev, "get_cc: misc 0x%08x cc1 0x%08x %s cc2 0x%08x %s attached %d cc=%s\n",
+ misc, *cc1, cc_to_name(*cc1), *cc2, cc_to_name(*cc2), !!(misc & CC_ATTACHED),
+ misc_to_cc(misc));
+
+ return ret;
+}
+
+static void qcom_pmic_set_cc_debounce(struct pmic_typec *pmic_typec)
+{
+ pmic_typec->debouncing_cc = true;
+ schedule_delayed_work(&pmic_typec->cc_debounce_dwork,
+ msecs_to_jiffies(2));
+}
+
+int qcom_pmic_tcpm_typec_set_cc(struct pmic_typec *pmic_typec,
+ enum typec_cc_status cc)
+{
+ struct device *dev = pmic_typec->dev;
+ unsigned int mode, currsrc;
+ unsigned int orientation, misc;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_typec->lock, flags);
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG,
+ &misc);
+ if (ret)
+ goto done;
+
+ orientation = !!(misc & CC_ORIENTATION);
+
+ mode = EN_SRC_ONLY;
+
+ switch (cc) {
+ case TYPEC_CC_OPEN:
+ currsrc = TYPEC_SRC_RP_SEL_80UA;
+ break;
+ case TYPEC_CC_RP_DEF:
+ currsrc = TYPEC_SRC_RP_SEL_80UA;
+ break;
+ case TYPEC_CC_RP_1_5:
+ currsrc = TYPEC_SRC_RP_SEL_180UA;
+ break;
+ case TYPEC_CC_RP_3_0:
+ currsrc = TYPEC_SRC_RP_SEL_330UA;
+ break;
+ case TYPEC_CC_RD:
+ currsrc = TYPEC_SRC_RP_SEL_80UA;
+ mode = EN_SNK_ONLY;
+ break;
+ default:
+ dev_warn(dev, "unexpected set_cc %d\n", cc);
+ ret = -EINVAL;
+ goto done;
+ }
+
+ if (mode == EN_SRC_ONLY) {
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_CURRSRC_CFG_REG,
+ currsrc);
+ if (ret)
+ goto done;
+ }
+
+ pmic_typec->cc = cc;
+ qcom_pmic_set_cc_debounce(pmic_typec);
+ ret = 0;
+
+done:
+ spin_unlock_irqrestore(&pmic_typec->lock, flags);
+
+ dev_dbg(dev, "set_cc: currsrc=%x %s mode %s debounce %d attached %d cc=%s\n",
+ currsrc, rp_sel_to_name(currsrc),
+ mode == EN_SRC_ONLY ? "EN_SRC_ONLY" : "EN_SNK_ONLY",
+ pmic_typec->debouncing_cc, !!(misc & CC_ATTACHED),
+ misc_to_cc(misc));
+
+ return ret;
+}
+
+int qcom_pmic_tcpm_typec_set_vconn(struct pmic_typec *pmic_typec, bool on)
+{
+ struct device *dev = pmic_typec->dev;
+ unsigned int orientation, misc, mask, value;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&pmic_typec->lock, flags);
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG, &misc);
+ if (ret)
+ goto done;
+
+ /* Set VCONN on the inversion of the active CC channel */
+ orientation = (misc & CC_ORIENTATION) ? 0 : VCONN_EN_ORIENTATION;
+ if (on) {
+ mask = VCONN_EN_ORIENTATION | VCONN_EN_VALUE;
+ value = orientation | VCONN_EN_VALUE | VCONN_EN_SRC;
+ } else {
+ mask = VCONN_EN_VALUE;
+ value = 0;
+ }
+
+ ret = regmap_update_bits(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_VCONN_CONTROL_REG,
+ mask, value);
+done:
+ spin_unlock_irqrestore(&pmic_typec->lock, flags);
+
+ dev_dbg(dev, "set_vconn: orientation %d control 0x%08x state %s cc %s vconn %s\n",
+ orientation, value, on ? "on" : "off", misc_to_vconn(misc), misc_to_cc(misc));
+
+ return ret;
+}
+
+int qcom_pmic_tcpm_typec_start_toggling(struct pmic_typec *pmic_typec,
+ enum typec_port_type port_type,
+ enum typec_cc_status cc)
+{
+ struct device *dev = pmic_typec->dev;
+ unsigned int misc;
+ u8 mode = 0;
+ unsigned long flags;
+ int ret;
+
+ switch (port_type) {
+ case TYPEC_PORT_SRC:
+ mode = EN_SRC_ONLY;
+ break;
+ case TYPEC_PORT_SNK:
+ mode = EN_SNK_ONLY;
+ break;
+ case TYPEC_PORT_DRP:
+ mode = EN_TRY_SNK;
+ break;
+ }
+
+ spin_lock_irqsave(&pmic_typec->lock, flags);
+
+ ret = regmap_read(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MISC_STATUS_REG, &misc);
+ if (ret)
+ goto done;
+
+ dev_dbg(dev, "start_toggling: misc 0x%08x attached %d port_type %d current cc %d new %d\n",
+ misc, !!(misc & CC_ATTACHED), port_type, pmic_typec->cc, cc);
+
+ qcom_pmic_set_cc_debounce(pmic_typec);
+
+ /* force it to toggle at least once */
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MODE_CFG_REG,
+ TYPEC_DISABLE_CMD);
+ if (ret)
+ goto done;
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MODE_CFG_REG,
+ mode);
+done:
+ spin_unlock_irqrestore(&pmic_typec->lock, flags);
+
+ return ret;
+}
+
+#define TYPEC_INTR_EN_CFG_1_MASK \
+ (TYPEC_LEGACY_CABLE_INT_EN | \
+ TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN | \
+ TYPEC_TRYSOURCE_DETECT_INT_EN | \
+ TYPEC_TRYSINK_DETECT_INT_EN | \
+ TYPEC_CCOUT_DETACH_INT_EN | \
+ TYPEC_CCOUT_ATTACH_INT_EN | \
+ TYPEC_VBUS_DEASSERT_INT_EN | \
+ TYPEC_VBUS_ASSERT_INT_EN)
+
+#define TYPEC_INTR_EN_CFG_2_MASK \
+ (TYPEC_STATE_MACHINE_CHANGE_INT_EN | TYPEC_VBUS_ERROR_INT_EN | \
+ TYPEC_DEBOUNCE_DONE_INT_EN)
+
+int qcom_pmic_tcpm_typec_init(struct pmic_typec *pmic_typec,
+ struct tcpm_port *tcpm_port)
+{
+ int i;
+ int mask;
+ int ret;
+
+ /* Configure interrupt sources */
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_INTERRUPT_EN_CFG_1_REG,
+ TYPEC_INTR_EN_CFG_1_MASK);
+ if (ret)
+ goto done;
+
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_INTERRUPT_EN_CFG_2_REG,
+ TYPEC_INTR_EN_CFG_2_MASK);
+ if (ret)
+ goto done;
+
+ /* start in TRY_SNK mode */
+ ret = regmap_write(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_MODE_CFG_REG, EN_TRY_SNK);
+ if (ret)
+ goto done;
+
+ /* Configure VCONN for software control */
+ ret = regmap_update_bits(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_VCONN_CONTROL_REG,
+ VCONN_EN_SRC | VCONN_EN_VALUE, VCONN_EN_SRC);
+ if (ret)
+ goto done;
+
+ /* Set CC threshold to 1.6 Volts | tPDdebounce = 10-20ms */
+ mask = SEL_SRC_UPPER_REF | USE_TPD_FOR_EXITING_ATTACHSRC;
+ ret = regmap_update_bits(pmic_typec->regmap,
+ pmic_typec->base + TYPEC_EXIT_STATE_CFG_REG,
+ mask, mask);
+ if (ret)
+ goto done;
+
+ pmic_typec->tcpm_port = tcpm_port;
+
+ for (i = 0; i < pmic_typec->nr_irqs; i++)
+ enable_irq(pmic_typec->irq_data[i].irq);
+
+done:
+ return ret;
+}
+
+void qcom_pmic_tcpm_typec_put(struct pmic_typec *pmic_typec)
+{
+ put_device(pmic_typec->dev);
+}
+
+static int qcom_pmic_tcpm_typec_probe(struct platform_device *pdev)
+{
+ struct pmic_typec *pmic_typec;
+ struct device *dev = &pdev->dev;
+ const struct pmic_typec_resources *res;
+ struct pmic_typec_irq_data *irq_data;
+ int i, ret, irq;
+ u32 reg;
+
+ ret = device_property_read_u32(dev, "reg", ®);
+ if (ret < 0) {
+ dev_err(dev, "missing base address\n");
+ return ret;
+ }
+
+ res = of_device_get_match_data(dev);
+ if (!res)
+ return -ENODEV;
+
+ if (!res->nr_irqs || res->nr_irqs > PMIC_TYPEC_MAX_IRQS)
+ return -EINVAL;
+
+ pmic_typec = devm_kzalloc(dev, sizeof(*pmic_typec), GFP_KERNEL);
+ if (!pmic_typec)
+ return -ENOMEM;
+
+ irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs,
+ GFP_KERNEL);
+ if (!irq_data)
+ return -ENOMEM;
+
+ pmic_typec->vdd_vbus = devm_regulator_get(dev, "vdd-vbus");
+ if (IS_ERR(pmic_typec->vdd_vbus))
+ return PTR_ERR(pmic_typec->vdd_vbus);
+
+ pmic_typec->dev = dev;
+ pmic_typec->base = reg;
+ pmic_typec->nr_irqs = res->nr_irqs;
+ pmic_typec->irq_data = irq_data;
+ spin_lock_init(&pmic_typec->lock);
+ INIT_DELAYED_WORK(&pmic_typec->cc_debounce_dwork,
+ qcom_pmic_tcpm_typec_cc_debounce);
+
+ pmic_typec->regmap = dev_get_regmap(dev->parent, NULL);
+ if (!pmic_typec->regmap) {
+ dev_err(dev, "Failed to get regmap\n");
+ return -ENODEV;
+ }
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return irq;
+
+ platform_set_drvdata(pdev, pmic_typec);
+
+ for (i = 0; i < res->nr_irqs; i++, irq_data++) {
+ irq = platform_get_irq_byname(pdev,
+ res->irq_params[i].irq_name);
+ if (irq < 0)
+ return irq;
+
+ irq_data->pmic_typec = pmic_typec;
+ irq_data->irq = irq;
+ irq_data->virq = res->irq_params[i].virq;
+ ret = devm_request_threaded_irq(dev, irq, NULL, pmic_typec_isr,
+ IRQF_ONESHOT | IRQF_NO_AUTOEN,
+ res->irq_params[i].irq_name,
+ irq_data);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static struct pmic_typec_resources pm8150b_typec_res = {
+ .irq_params = {
+ {
+ .irq_name = "pmic-typec-vpd-detect",
+ .virq = PMIC_TYPEC_VPD_IRQ,
+ },
+
+ {
+ .irq_name = "pmic-typec-cc-state-change",
+ .virq = PMIC_TYPEC_CC_STATE_IRQ,
+ },
+ {
+ .irq_name = "pmic-typec-vconn-oc",
+ .virq = PMIC_TYPEC_VCONN_OC_IRQ,
+ },
+
+ {
+ .irq_name = "pmic-typec-vbus-change",
+ .virq = PMIC_TYPEC_VBUS_IRQ,
+ },
+
+ {
+ .irq_name = "pmic-typec-attach-detach",
+ .virq = PMIC_TYPEC_ATTACH_DETACH_IRQ,
+ },
+ {
+ .irq_name = "pmic-typec-legacy-cable-detect",
+ .virq = PMIC_TYPEC_LEGACY_CABLE_IRQ,
+ },
+
+ {
+ .irq_name = "pmic-typec-try-snk-src-detect",
+ .virq = PMIC_TYPEC_TRY_SNK_SRC_IRQ,
+ },
+ },
+ .nr_irqs = 7,
+};
+
+static const struct of_device_id qcom_pmic_tcpm_typec_table[] = {
+ { .compatible = "qcom,pm8150b-typec", .data = &pm8150b_typec_res },
+ { },
+};
+MODULE_DEVICE_TABLE(of, qcom_pmic_tcpm_typec_table);
+
+struct platform_driver qcom_pmic_tcpm_typec_platform_driver = {
+ .driver = {
+ .name = "qcom,pmic-typec",
+ .of_match_table = qcom_pmic_tcpm_typec_table,
+ },
+ .probe = qcom_pmic_tcpm_typec_probe,
+};
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.h
new file mode 100644
index 0000000000000..d0e683e4bff46
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.h
@@ -0,0 +1,163 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021, Linaro Ltd. All rights reserved.
+ */
+#ifndef __QCOM_PMIC_TYPEC_H__
+#define __QCOM_PMIC_TYPEC_H__
+
+#include <linux/usb/tcpm.h>
+
+#define TYPEC_SNK_STATUS_REG 0x06
+#define DETECTED_SNK_TYPE_MASK GENMASK(6, 0)
+#define SNK_DAM_MASK GENMASK(6, 4)
+#define SNK_DAM_500MA BIT(6)
+#define SNK_DAM_1500MA BIT(5)
+#define SNK_DAM_3000MA BIT(4)
+#define SNK_RP_STD BIT(3)
+#define SNK_RP_1P5 BIT(2)
+#define SNK_RP_3P0 BIT(1)
+#define SNK_RP_SHORT BIT(0)
+
+#define TYPEC_SRC_STATUS_REG 0x08
+#define DETECTED_SRC_TYPE_MASK GENMASK(4, 0)
+#define SRC_HIGH_BATT BIT(5)
+#define SRC_DEBUG_ACCESS BIT(4)
+#define SRC_RD_OPEN BIT(3)
+#define SRC_RD_RA_VCONN BIT(2)
+#define SRC_RA_OPEN BIT(1)
+#define AUDIO_ACCESS_RA_RA BIT(0)
+
+#define TYPEC_STATE_MACHINE_STATUS_REG 0x09
+#define TYPEC_ATTACH_DETACH_STATE BIT(5)
+
+#define TYPEC_SM_STATUS_REG 0x0A
+#define TYPEC_SM_VBUS_VSAFE5V BIT(5)
+#define TYPEC_SM_VBUS_VSAFE0V BIT(6)
+#define TYPEC_SM_USBIN_LT_LV BIT(7)
+
+#define TYPEC_MISC_STATUS_REG 0x0B
+#define TYPEC_WATER_DETECTION_STATUS BIT(7)
+#define SNK_SRC_MODE BIT(6)
+#define TYPEC_VBUS_DETECT BIT(5)
+#define TYPEC_VBUS_ERROR_STATUS BIT(4)
+#define TYPEC_DEBOUNCE_DONE BIT(3)
+#define CC_ORIENTATION BIT(1)
+#define CC_ATTACHED BIT(0)
+
+#define LEGACY_CABLE_STATUS_REG 0x0D
+#define TYPEC_LEGACY_CABLE_STATUS BIT(1)
+#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS BIT(0)
+
+#define TYPEC_U_USB_STATUS_REG 0x0F
+#define U_USB_GROUND_NOVBUS BIT(6)
+#define U_USB_GROUND BIT(4)
+#define U_USB_FMB1 BIT(3)
+#define U_USB_FLOAT1 BIT(2)
+#define U_USB_FMB2 BIT(1)
+#define U_USB_FLOAT2 BIT(0)
+
+#define TYPEC_MODE_CFG_REG 0x44
+#define TYPEC_TRY_MODE_MASK GENMASK(4, 3)
+#define EN_TRY_SNK BIT(4)
+#define EN_TRY_SRC BIT(3)
+#define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0)
+#define EN_SRC_ONLY BIT(2)
+#define EN_SNK_ONLY BIT(1)
+#define TYPEC_DISABLE_CMD BIT(0)
+
+#define TYPEC_VCONN_CONTROL_REG 0x46
+#define VCONN_EN_ORIENTATION BIT(2)
+#define VCONN_EN_VALUE BIT(1)
+#define VCONN_EN_SRC BIT(0)
+
+#define TYPEC_CCOUT_CONTROL_REG 0x48
+#define TYPEC_CCOUT_BUFFER_EN BIT(2)
+#define TYPEC_CCOUT_VALUE BIT(1)
+#define TYPEC_CCOUT_SRC BIT(0)
+
+#define DEBUG_ACCESS_SRC_CFG_REG 0x4C
+#define EN_UNORIENTED_DEBUG_ACCESS_SRC BIT(0)
+
+#define TYPE_C_CRUDE_SENSOR_CFG_REG 0x4e
+#define EN_SRC_CRUDE_SENSOR BIT(1)
+#define EN_SNK_CRUDE_SENSOR BIT(0)
+
+#define TYPEC_EXIT_STATE_CFG_REG 0x50
+#define BYPASS_VSAFE0V_DURING_ROLE_SWAP BIT(3)
+#define SEL_SRC_UPPER_REF BIT(2)
+#define USE_TPD_FOR_EXITING_ATTACHSRC BIT(1)
+#define EXIT_SNK_BASED_ON_CC BIT(0)
+
+#define TYPEC_CURRSRC_CFG_REG 0x52
+#define TYPEC_SRC_RP_SEL_330UA BIT(1)
+#define TYPEC_SRC_RP_SEL_180UA BIT(0)
+#define TYPEC_SRC_RP_SEL_80UA 0
+#define TYPEC_SRC_RP_SEL_MASK GENMASK(1, 0)
+
+#define TYPEC_INTERRUPT_EN_CFG_1_REG 0x5E
+#define TYPEC_LEGACY_CABLE_INT_EN BIT(7)
+#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN BIT(6)
+#define TYPEC_TRYSOURCE_DETECT_INT_EN BIT(5)
+#define TYPEC_TRYSINK_DETECT_INT_EN BIT(4)
+#define TYPEC_CCOUT_DETACH_INT_EN BIT(3)
+#define TYPEC_CCOUT_ATTACH_INT_EN BIT(2)
+#define TYPEC_VBUS_DEASSERT_INT_EN BIT(1)
+#define TYPEC_VBUS_ASSERT_INT_EN BIT(0)
+
+#define TYPEC_INTERRUPT_EN_CFG_2_REG 0x60
+#define TYPEC_SRC_BATT_HPWR_INT_EN BIT(6)
+#define MICRO_USB_STATE_CHANGE_INT_EN BIT(5)
+#define TYPEC_STATE_MACHINE_CHANGE_INT_EN BIT(4)
+#define TYPEC_DEBUG_ACCESS_DETECT_INT_EN BIT(3)
+#define TYPEC_WATER_DETECTION_INT_EN BIT(2)
+#define TYPEC_VBUS_ERROR_INT_EN BIT(1)
+#define TYPEC_DEBOUNCE_DONE_INT_EN BIT(0)
+
+#define TYPEC_DEBOUNCE_OPTION_REG 0x62
+#define REDUCE_TCCDEBOUNCE_TO_2MS BIT(2)
+
+#define TYPE_C_SBU_CFG_REG 0x6A
+#define SEL_SBU1_ISRC_VAL 0x04
+#define SEL_SBU2_ISRC_VAL 0x01
+
+#define TYPEC_U_USB_CFG_REG 0x70
+#define EN_MICRO_USB_FACTORY_MODE BIT(1)
+#define EN_MICRO_USB_MODE BIT(0)
+
+#define TYPEC_PMI632_U_USB_WATER_PROTECTION_CFG_REG 0x72
+
+#define TYPEC_U_USB_WATER_PROTECTION_CFG_REG 0x73
+#define EN_MICRO_USB_WATER_PROTECTION BIT(4)
+#define MICRO_USB_DETECTION_ON_TIME_CFG_MASK GENMASK(3, 2)
+#define MICRO_USB_DETECTION_PERIOD_CFG_MASK GENMASK(1, 0)
+
+#define TYPEC_PMI632_MICRO_USB_MODE_REG 0x73
+#define MICRO_USB_MODE_ONLY BIT(0)
+
+struct pmic_typec;
+extern struct platform_driver qcom_pmic_tcpm_typec_platform_driver;
+
+int qcom_pmic_tcpm_typec_init(struct pmic_typec *pmic_typec,
+ struct tcpm_port *tcpm_port);
+
+void qcom_pmic_tcpm_typec_put(struct pmic_typec *pmic_typec);
+
+int qcom_pmic_tcpm_typec_get_cc(struct pmic_typec *pmic_typec,
+ enum typec_cc_status *cc1,
+ enum typec_cc_status *cc2);
+
+int qcom_pmic_tcpm_typec_set_cc(struct pmic_typec *pmic_typec,
+ enum typec_cc_status cc);
+
+int qcom_pmic_tcpm_typec_get_vbus(struct pmic_typec *pmic_typec);
+
+int qcom_pmic_tcpm_typec_set_vconn(struct pmic_typec *pmic_typec, bool on);
+
+int qcom_pmic_tcpm_typec_start_toggling(struct pmic_typec *pmic_typec,
+ enum typec_port_type port_type,
+ enum typec_cc_status cc);
+
+int qcom_pmic_tcpm_typec_set_vbus(struct pmic_typec *pmic_typec, bool on);
+
+#endif /* __QCOM_PMIC_TYPE_C_H__ */
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema
2021-10-28 16:49 ` [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema Bryan O'Donoghue
@ 2021-10-28 19:08 ` Rob Herring
2021-10-28 20:38 ` Rob Herring
1 sibling, 0 replies; 17+ messages in thread
From: Rob Herring @ 2021-10-28 19:08 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: heikki.krogerus, linux, bjorn.andersson, devicetree, robh+dt,
wcheng, gregkh, linux-arm-msm, rdunlap, linux-usb
On Thu, 28 Oct 2021 17:49:36 +0100, Bryan O'Donoghue wrote:
> Add a YAML binding for the type-c silicon interface inside Qualcomm's
> pm8150b hardware block.
>
> The type-c driver operates with a pdphy driver inside of a high level
> single TCPM device.
>
> Based on original work by Wesley.
>
> Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> .../bindings/usb/qcom,pmic-typec.yaml | 116 ++++++++++++++++++
> 1 file changed, 116 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/usb/qcom,pmic-typec.example.dt.yaml:0:0: /example-0/pm8150b/typec@1500: failed to match any schema with compatible: ['qcom,pm8150b-typec']
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1547612
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema
2021-10-28 16:49 ` [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema Bryan O'Donoghue
@ 2021-10-28 19:08 ` Rob Herring
2021-10-28 20:39 ` Rob Herring
1 sibling, 0 replies; 17+ messages in thread
From: Rob Herring @ 2021-10-28 19:08 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: rdunlap, linux-arm-msm, devicetree, linux-usb, heikki.krogerus,
linux, gregkh, robh+dt, wcheng, bjorn.andersson
On Thu, 28 Oct 2021 17:49:38 +0100, Bryan O'Donoghue wrote:
> Add a YAML binding for the power-delivery PHY silicon interface inside
> Qualcomm's pm8150b hardware block.
>
> The pdphy driver operates with a type-c driver inside of a high level
> single TCPM device to provide overall TCPM functionality.
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> .../bindings/usb/qcom,pmic-pdphy.yaml | 115 ++++++++++++++++++
> 1 file changed, 115 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
./Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml:37:8: [warning] wrong indentation: expected 6 but found 7 (indentation)
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1547614
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema
2021-10-28 16:49 ` [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
@ 2021-10-28 20:38 ` Rob Herring
1 sibling, 0 replies; 17+ messages in thread
From: Rob Herring @ 2021-10-28 20:38 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
linux-usb, linux-arm-msm, devicetree, wcheng
On Thu, Oct 28, 2021 at 05:49:36PM +0100, Bryan O'Donoghue wrote:
> Add a YAML binding for the type-c silicon interface inside Qualcomm's
> pm8150b hardware block.
>
> The type-c driver operates with a pdphy driver inside of a high level
> single TCPM device.
>
> Based on original work by Wesley.
>
> Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> .../bindings/usb/qcom,pmic-typec.yaml | 116 ++++++++++++++++++
> 1 file changed, 116 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
>
> diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
> new file mode 100644
> index 0000000000000..72602daf910bb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
> @@ -0,0 +1,116 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/usb/qcom,pmic-typec.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: Qualcomm PMIC based USB type C Detection Driver
> +
> +maintainers:
> + - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> +
> +description: |
> + Qualcomm PMIC Type C Detect
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,pm8150b-usb-typec
> +
> + reg:
> + maxItems: 1
> + description: Type C base address
> +
> + interrupts:
> + items:
> + - description: Bitmask of CC attach, VBUS error, tCCDebounce done and more
> + - description: VCONN Powered Detection
> + - description: CC state change
> + - description: VCONN over-current condition
> + - description: VBUS state change
> + - description: Attach Deteach notification
> + - description: Legacy cable detect
> + - description: Try.Src Try.Snk state change
> +
> + interrupt-names:
> + items:
> + - const: pmic-typec-or-rid-detect-change
> + - const: pmic-typec-vpd-detect
> + - const: pmic-typec-cc-state-change
> + - const: pmic-typec-vconn-oc
> + - const: pmic-typec-vbus-change
> + - const: pmic-typec-attach-detach
> + - const: pmic-typec-legacy-cable-detect
> + - const: pmic-typec-try-snk-src-detect
'pmic-typec-' is redundant, drop.
> +
> + ports:
> + description: Remote endpoint connections
> + $ref: /connector/usb-connector.yaml#/properties/ports
No. Why don't you have a connector node that uses all of
usb-connector.yaml? The schemas aren't designed to pick and chose
properties out of them (usually).
> +
> + properties:
> + port@0:
> + description: Remote endpoints for the TCPM driver
What kind of h/w is a 'TCPM driver'? port 0 already has a defined
connection in usb-connector.yaml.
> +
> + required:
> + - port@0
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - interrupt-names
> + - ports
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h>
> + pm8150b {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8150b_typec: typec@1500 {
> + compatible = "qcom,pm8150b-typec";
> + reg = <0x1500>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + interrupts = <0x2 0x15 PMIC_TYPEC_OR_RID_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x15 PMIC_TYPEC_VPD_IRQ
> + IRQ_TYPE_EDGE_BOTH>,
> + <0x2 0x15 PMIC_TYPEC_CC_STATE_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x15 PMIC_TYPEC_VCONN_OC_IRQ
> + IRQ_TYPE_EDGE_BOTH>,
> + <0x2 0x15 PMIC_TYPEC_VBUS_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x15 PMIC_TYPEC_ATTACH_DETACH_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x15 PMIC_TYPEC_LEGACY_CABLE_IRQ
> + IRQ_TYPE_EDGE_BOTH>,
> + <0x2 0x15 PMIC_TYPEC_TRY_SNK_SRC_IRQ
> + IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "pmic-typec-or-rid-detect-change",
> + "pmic-typec-vpd-detect",
> + "pmic-typec-cc-state-change",
> + "pmic-typec-vconn-oc",
> + "pmic-typec-vbus-change",
> + "pmic-typec-attach-detach",
> + "pmic-typec-legacy-cable-detect",
> + "pmic-typec-try-snk-src-detect";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + pmic_typec: endpoint {
> + remote-endpoint = <&pmic_tcpm_typec>;
> + };
> + };
> + };
> + };
> + };
> +...
> --
> 2.33.0
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema
2021-10-28 16:49 ` [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
@ 2021-10-28 20:39 ` Rob Herring
1 sibling, 0 replies; 17+ messages in thread
From: Rob Herring @ 2021-10-28 20:39 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
linux-usb, linux-arm-msm, devicetree, wcheng
On Thu, Oct 28, 2021 at 05:49:38PM +0100, Bryan O'Donoghue wrote:
> Add a YAML binding for the power-delivery PHY silicon interface inside
> Qualcomm's pm8150b hardware block.
>
> The pdphy driver operates with a type-c driver inside of a high level
> single TCPM device to provide overall TCPM functionality.
Same comments for this one...
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> .../bindings/usb/qcom,pmic-pdphy.yaml | 115 ++++++++++++++++++
> 1 file changed, 115 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
>
> diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
> new file mode 100644
> index 0000000000000..9110f6203b87f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/qcom,pmic-pdphy.yaml
> @@ -0,0 +1,115 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/usb/qcom,pmic-pdphy.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: Qualcomm PMIC based USB PDPHY driver
> +
> +maintainers:
> + - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> +
> +description: |
> + Qualcomm PMIC Power Delivery PHY driver
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,pm8150b-pdphy
> +
> + reg:
> + maxItems: 1
> + description: PDPHY base address
> +
> + interrupts:
> + items:
> + - description: Sig TX - transmitted reset signal
> + - description: Sig RX - received reset signal
> + - description: TX completion
> + - description: RX completion
> + - description: TX fail
> + - description: TX discgard
> + - description: RX discgard
> + - description: Fast Role Swap event
> +
> + interrupt-names:
> + items:
> + - const: pmic-pdphy-sig-tx
> + - const: pmic-pdphy-sig-rx
> + - const: pmic-pdphy-msg-tx
> + - const: pmic-pdphy-msg-rx
> + - const: pmic-pdphy-msg-tx-failed
> + - const: pmic-pdphy-msg-tx-discarded
> + - const: pmic-pdphy-msg-rx-discarded
> + - const: pmic-pdphy-fr-swap
> +
> + ports:
> + description: Remote endpoint connections
> + $ref: /connector/usb-connector.yaml#/properties/ports
> +
> + properties:
> + port@0:
> + description: Remote endpoints for the TCPM driver
> +
> + required:
> + - port@0
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - interrupt-names
> + - ports
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h>
> +
> + pm8150b {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8150b_pdphy: pdphy@1700 {
> + compatible = "qcom,pm8150b-pdphy";
> + reg = <0x1700>;
> + interrupts = <0x2 0x17 PMIC_PDPHY_SIG_TX_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_SIG_RX_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_MSG_TX_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_MSG_RX_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_MSG_TX_FAIL_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_MSG_TX_DISCARD_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_MSG_RX_DISCARD_IRQ
> + IRQ_TYPE_EDGE_RISING>,
> + <0x2 0x17 PMIC_PDPHY_FR_SWAP_IRQ
> + IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "pmic-pdphy-sig-tx",
> + "pmic-pdphy-sig-rx",
> + "pmic-pdphy-msg-tx",
> + "pmic-pdphy-msg-rx",
> + "pmic-pdphy-msg-tx-failed",
> + "pmic-pdphy-msg-tx-discarded",
> + "pmic-pdphy-msg-rx-discarded",
> + "pmic-pdphy-fr-swap";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + pmic_pdphy: endpoint {
> + remote-endpoint = <&pmic_tcpm_pdphy>;
> + };
> + };
> + };
> + };
> + };
> +...
> --
> 2.33.0
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM YAML schema
2021-10-28 16:49 ` [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM " Bryan O'Donoghue
@ 2021-10-28 20:43 ` Rob Herring
2021-10-28 21:46 ` Bryan O'Donoghue
0 siblings, 1 reply; 17+ messages in thread
From: Rob Herring @ 2021-10-28 20:43 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
linux-usb, linux-arm-msm, devicetree, wcheng
On Thu, Oct 28, 2021 at 05:49:39PM +0100, Bryan O'Donoghue wrote:
> Add a YAML description for the pm8150b-tcpm driver. The pm8150b-tcpm
> encapsulates a type-c block and a pdphy block into one block presented to
> the tcpm Linux API.
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> .../bindings/usb/qcom,pmic-tcpm.yaml | 110 ++++++++++++++++++
> 1 file changed, 110 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
>
> diff --git a/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml b/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
> new file mode 100644
> index 0000000000000..6dd51a1dd944f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/qcom,pmic-tcpm.yaml
> @@ -0,0 +1,110 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/usb/qcom,pmic-tcpm.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: Qualcomm PMIC TCPM Driver
> +
> +maintainers:
> + - Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> +
> +description: |
> + Qualcomm PMIC Type-C Port Manager Driver
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,pm8150b-tcpm
> +
> + ports:
> + description: Remote endpoint connections
> + $ref: /connector/usb-connector.yaml#/properties/ports
> +
> + properties:
> + port@0:
> + description: Remote endpoints for the type-c device
> +
> + port@1:
> + description: Remote endpoints for the pdphy device
> +
> + port@2:
> + description: Connection to role switch node
I don't understand these ports. The graph binding should be showing data
stream connections. It should look something like a block diagram of the
h/w components.
> +
> + required:
> + - port@0
> + - port@1
> + - port@2
> +
> +required:
> + - compatible
> + - ports
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/usb/pd.h>
> + #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-typec.h>
> + #include <dt-bindings/usb/typec/tcpm/qcom,pmic-usb-pdphy.h>
> +
> + pm8150b_tcpm: pmic-tcpm {
> + compatible = "qcom,pmic-tcpm";
> +
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + status = "disabled";
Not much point in having a disabled example.
> + ports {
> +
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + pmic_tcpm_typec: endpoint {
> + remote-endpoint = <&pmic_typec>;
> + };
> + };
> + port@1 {
> + reg = <1>;
> + pmic_tcpm_pdphy: endpoint {
> + remote-endpoint = <&pmic_pdphy>;
> + };
> + };
> + port@2 {
> + ret = <2>;
> + usb3_role: endpoint@0 {
> + remote-endpoint = <&dwc3_drd_switch>;
> + };
> + };
> + };
> +
> + connector {
> + compatible = "usb-c-connector";
> +
> + power-role = "source";
> + data-role = "dual";
> + self-powered;
> +
> + source-pdos = <PDO_FIXED(5000, 3000,
> + PDO_FIXED_DUAL_ROLE |
> + PDO_FIXED_USB_COMM |
> + PDO_FIXED_DATA_SWAP)>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + pmic_tcpm_ss_mux: endpoint@0 {
> + remote-endpoint = <&qmp_ss_mux>;
> + };
> + };
> + };
> + };
> + };
> +
> +...
> --
> 2.33.0
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM YAML schema
2021-10-28 20:43 ` Rob Herring
@ 2021-10-28 21:46 ` Bryan O'Donoghue
2021-10-28 21:52 ` Bryan O'Donoghue
0 siblings, 1 reply; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 21:46 UTC (permalink / raw)
To: Rob Herring
Cc: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
linux-usb, linux-arm-msm, devicetree, wcheng
On 28/10/2021 21:43, Rob Herring wrote:
> I don't understand these ports. The graph binding should be showing data
> stream connections. It should look something like a block diagram of the
> h/w components.
Two different PHYs which live inside of the pm8150b USB
typec/pdphy/charger block.
The typec phy and power-delivery phy are not adjacent to each other
typec@1500
charger@1600
pdphy@1700
The typec and pdphy pieces are being brought together into a standard
Linux TCPM driver.
Rather than have a TCPM device that starts @1500 and spans over the
charger I've opted to have "virtual" TCPM device that has links to
typec@1500 and pdphy@1700 via remote-endpoints
That lets the end result dts look like this
pm8150b_tcpm: pmic-tcpm {
compatible = "qcom,pmic-tcpm";
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
pmic_tcpm_typec: endpoint {
remote-endpoint = <&pmic_typec>;
};
};
port@1 {
reg = <1>;
pmic_tcpm_pdphy: endpoint {
remote-endpoint = <&pmic_pdphy>;
};
};
};
};
pm8150b_typec: typec@1500 {
compatible = "qcom,pm8150b-typec";
reg = <0x1500>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
pmic_typec: endpoint {
remote-endpoint = <&pmic_tcpm_typec>;
};
};
};
};
pm8150b_pdphy: pdphy@1700 {
compatible = "qcom,pm8150b-pdphy";
reg = <0x1700>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
pmic_pdphy: endpoint {
remote-endpoint = <&pmic_tcpm_pdphy>;
};
};
};
};
at a later date we might want to add in the charger but, if we do we
don't want that to be inside of a Linux TCPM device and I thought it
would be a mess to have, since we try to keep addresses linear in DTS files
pm8150b_tcpm: pmic-tcpm@1500 {
compatible = "qcom,pmic-tcpm";
pm8150b_typec: typec@1500 {
compatible = "qcom,pm8150b-typec";
reg = <0x1500>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
pmic_typec: endpoint {
remote-endpoint = <&pmic_tcpm_typec>;
};
};
};
};
pm8150b_pdphy: pdphy@1700 {
compatible = "qcom,pm8150b-pdphy";
reg = <0x1700>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
pmic_pdphy: endpoint {
remote-endpoint = <&pmic_tcpm_pdphy>;
};
};
};
};
};
pm8150b_charger: pmic-charger@1600 {
/* Consume electrons here */
};
---
bod
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM YAML schema
2021-10-28 21:46 ` Bryan O'Donoghue
@ 2021-10-28 21:52 ` Bryan O'Donoghue
0 siblings, 0 replies; 17+ messages in thread
From: Bryan O'Donoghue @ 2021-10-28 21:52 UTC (permalink / raw)
To: Rob Herring
Cc: linux, heikki.krogerus, rdunlap, gregkh, bjorn.andersson,
linux-usb, linux-arm-msm, devicetree, wcheng
On 28/10/2021 22:46, Bryan O'Donoghue wrote:
> I thought it would be a mess to have, since we try to keep addresses
> linear in DTS files
sic: I thought the following DTS would be messy since the tcpm device
would span over all three silicon blocks and should we want to add in
charger, the charger would then end up as an out-of-order address.
>
>
> pm8150b_tcpm: pmic-tcpm@1500 {
> compatible = "qcom,pmic-tcpm";
>
>
> pm8150b_typec: typec@1500 {
> compatible = "qcom,pm8150b-typec";
> reg = <0x1500>;
> ports {
> #address-cells = <1>;
> #size-cells = <0>;
>
> port@0 {
> reg = <0>;
> pmic_typec: endpoint {
> remote-endpoint = <&pmic_tcpm_typec>;
> };
> };
> };
> };
>
> pm8150b_pdphy: pdphy@1700 {
> compatible = "qcom,pm8150b-pdphy";
> reg = <0x1700>;
> ports {
> #address-cells = <1>;
> #size-cells = <0>;
>
> port@0 {
> reg = <0>;
> pmic_pdphy: endpoint {
> remote-endpoint = <&pmic_tcpm_pdphy>;
> };
> };
> };
> };
> };
>
> pm8150b_charger: pmic-charger@1600 {
> /* Consume electrons here */
> };
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver
2021-10-28 16:49 ` [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver Bryan O'Donoghue
@ 2021-10-29 16:40 ` kernel test robot
0 siblings, 0 replies; 17+ messages in thread
From: kernel test robot @ 2021-10-29 16:40 UTC (permalink / raw)
To: Bryan O'Donoghue, linux, heikki.krogerus, rdunlap, gregkh,
bjorn.andersson, robh+dt, linux-usb, linux-arm-msm, devicetree
Cc: kbuild-all, wcheng
[-- Attachment #1: Type: text/plain, Size: 7259 bytes --]
Hi Bryan,
I love your patch! Yet something to improve:
[auto build test ERROR on usb/usb-testing]
[also build test ERROR on robh/for-next linus/master v5.15-rc7 next-20211029]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Bryan-O-Donoghue/Add-pm8150b-TPCM-driver/20211029-010406
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/fe4e9d995058581a4428c9c5c91e848eab3beef5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Bryan-O-Donoghue/Add-pm8150b-TPCM-driver/20211029-010406
git checkout fe4e9d995058581a4428c9c5c91e848eab3beef5
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c: In function 'qcom_pmic_tcpm_typec_get_cc':
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c:205:24: error: variable 'debounced' set but not used [-Werror=unused-but-set-variable]
205 | bool attached, debounced;
| ^~~~~~~~~
drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c: In function 'qcom_pmic_tcpm_typec_set_cc':
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c:296:22: error: variable 'orientation' set but not used [-Werror=unused-but-set-variable]
296 | unsigned int orientation, misc;
| ^~~~~~~~~~~
cc1: all warnings being treated as errors
--
drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c: In function 'qcom_pmic_tcpm_pdphy_disable':
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_pdphy.c:431:24: error: unused variable 'dev' [-Werror=unused-variable]
431 | struct device *dev = pmic_pdphy->dev;
| ^~~
cc1: all warnings being treated as errors
vim +/debounced +205 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
198
199 int qcom_pmic_tcpm_typec_get_cc(struct pmic_typec *pmic_typec,
200 enum typec_cc_status *cc1,
201 enum typec_cc_status *cc2)
202 {
203 struct device *dev = pmic_typec->dev;
204 unsigned int misc, val;
> 205 bool attached, debounced;
206 int ret = 0;
207
208 ret = regmap_read(pmic_typec->regmap,
209 pmic_typec->base + TYPEC_MISC_STATUS_REG, &misc);
210 if (ret)
211 goto done;
212
213 attached = !!(misc & CC_ATTACHED);
214 debounced = !!(misc & TYPEC_DEBOUNCE_DONE);
215
216 if (pmic_typec->debouncing_cc) {
217 ret = -EBUSY;
218 goto done;
219 }
220
221 *cc1 = TYPEC_CC_OPEN;
222 *cc2 = TYPEC_CC_OPEN;
223
224 if (!(attached))
225 goto done;
226
227 if (misc & SNK_SRC_MODE) {
228 ret = regmap_read(pmic_typec->regmap,
229 pmic_typec->base + TYPEC_SRC_STATUS_REG,
230 &val);
231 if (ret)
232 goto done;
233 switch (val & DETECTED_SRC_TYPE_MASK) {
234 case SRC_RD_OPEN:
235 val = TYPEC_CC_RD;
236 break;
237 case SRC_RD_RA_VCONN:
238 val = TYPEC_CC_RD;
239 *cc1 = TYPEC_CC_RA;
240 *cc2 = TYPEC_CC_RA;
241 break;
242 default:
243 dev_warn(dev, "unexpected src status %.2x\n", val);
244 val = TYPEC_CC_RD;
245 break;
246 }
247 } else {
248 ret = regmap_read(pmic_typec->regmap,
249 pmic_typec->base + TYPEC_SNK_STATUS_REG,
250 &val);
251 if (ret)
252 goto done;
253 switch (val & DETECTED_SNK_TYPE_MASK) {
254 case SNK_RP_STD:
255 val = TYPEC_CC_RP_DEF;
256 break;
257 case SNK_RP_1P5:
258 val = TYPEC_CC_RP_1_5;
259 break;
260 case SNK_RP_3P0:
261 val = TYPEC_CC_RP_3_0;
262 break;
263 default:
264 dev_warn(dev, "unexpected snk status %.2x\n", val);
265 val = TYPEC_CC_RP_DEF;
266 break;
267 }
268 val = TYPEC_CC_RP_DEF;
269 }
270
271 if (misc & CC_ORIENTATION)
272 *cc2 = val;
273 else
274 *cc1 = val;
275
276 done:
277 dev_dbg(dev, "get_cc: misc 0x%08x cc1 0x%08x %s cc2 0x%08x %s attached %d cc=%s\n",
278 misc, *cc1, cc_to_name(*cc1), *cc2, cc_to_name(*cc2), !!(misc & CC_ATTACHED),
279 misc_to_cc(misc));
280
281 return ret;
282 }
283
284 static void qcom_pmic_set_cc_debounce(struct pmic_typec *pmic_typec)
285 {
286 pmic_typec->debouncing_cc = true;
287 schedule_delayed_work(&pmic_typec->cc_debounce_dwork,
288 msecs_to_jiffies(2));
289 }
290
291 int qcom_pmic_tcpm_typec_set_cc(struct pmic_typec *pmic_typec,
292 enum typec_cc_status cc)
293 {
294 struct device *dev = pmic_typec->dev;
295 unsigned int mode, currsrc;
> 296 unsigned int orientation, misc;
297 unsigned long flags;
298 int ret;
299
300 spin_lock_irqsave(&pmic_typec->lock, flags);
301
302 ret = regmap_read(pmic_typec->regmap,
303 pmic_typec->base + TYPEC_MISC_STATUS_REG,
304 &misc);
305 if (ret)
306 goto done;
307
308 orientation = !!(misc & CC_ORIENTATION);
309
310 mode = EN_SRC_ONLY;
311
312 switch (cc) {
313 case TYPEC_CC_OPEN:
314 currsrc = TYPEC_SRC_RP_SEL_80UA;
315 break;
316 case TYPEC_CC_RP_DEF:
317 currsrc = TYPEC_SRC_RP_SEL_80UA;
318 break;
319 case TYPEC_CC_RP_1_5:
320 currsrc = TYPEC_SRC_RP_SEL_180UA;
321 break;
322 case TYPEC_CC_RP_3_0:
323 currsrc = TYPEC_SRC_RP_SEL_330UA;
324 break;
325 case TYPEC_CC_RD:
326 currsrc = TYPEC_SRC_RP_SEL_80UA;
327 mode = EN_SNK_ONLY;
328 break;
329 default:
330 dev_warn(dev, "unexpected set_cc %d\n", cc);
331 ret = -EINVAL;
332 goto done;
333 }
334
335 if (mode == EN_SRC_ONLY) {
336 ret = regmap_write(pmic_typec->regmap,
337 pmic_typec->base + TYPEC_CURRSRC_CFG_REG,
338 currsrc);
339 if (ret)
340 goto done;
341 }
342
343 pmic_typec->cc = cc;
344 qcom_pmic_set_cc_debounce(pmic_typec);
345 ret = 0;
346
347 done:
348 spin_unlock_irqrestore(&pmic_typec->lock, flags);
349
350 dev_dbg(dev, "set_cc: currsrc=%x %s mode %s debounce %d attached %d cc=%s\n",
351 currsrc, rp_sel_to_name(currsrc),
352 mode == EN_SRC_ONLY ? "EN_SRC_ONLY" : "EN_SNK_ONLY",
353 pmic_typec->debouncing_cc, !!(misc & CC_ATTACHED),
354 misc_to_cc(misc));
355
356 return ret;
357 }
358
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 61662 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver
[not found] <202110301822.cMPH2aH0-lkp@intel.com>
@ 2021-11-05 5:45 ` kernel test robot
0 siblings, 0 replies; 17+ messages in thread
From: kernel test robot @ 2021-11-05 5:45 UTC (permalink / raw)
To: Bryan O'Donoghue
Cc: llvm, kbuild-all, linux, linux-usb, linux-arm-msm, devicetree
[-- Attachment #1: Type: text/plain, Size: 13623 bytes --]
Hi Bryan,
Thanks for your patch! Perhaps something to improve:
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on robh/for-next linus/master v5.15-rc7 next-20211029]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Bryan-O-Donoghue/Add-pm8150b-TPCM-driver/20211029-010406
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: riscv-randconfig-c006-20211028 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 5db7568a6a1fcb408eb8988abdaff2a225a8eb72)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install riscv cross compiling tool for clang build
# apt-get install binutils-riscv64-linux-gnu
# https://github.com/0day-ci/linux/commit/fe4e9d995058581a4428c9c5c91e848eab3beef5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Bryan-O-Donoghue/Add-pm8150b-TPCM-driver/20211029-010406
git checkout fe4e9d995058581a4428c9c5c91e848eab3beef5
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=riscv clang-analyzer
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
clang-analyzer warnings: (new ones prefixed by >>)
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c:214:2: warning: Value stored to 'debounced' is never read [clang-analyzer-deadcode.DeadStores]
debounced = !!(misc & TYPEC_DEBOUNCE_DONE);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c:308:2: warning: Value stored to 'orientation' is never read [clang-analyzer-deadcode.DeadStores]
orientation = !!(misc & CC_ORIENTATION);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/debounced +214 drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm_typec.c
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 199 int qcom_pmic_tcpm_typec_get_cc(struct pmic_typec *pmic_typec,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 200 enum typec_cc_status *cc1,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 201 enum typec_cc_status *cc2)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 202 {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 203 struct device *dev = pmic_typec->dev;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 204 unsigned int misc, val;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 205 bool attached, debounced;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 206 int ret = 0;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 207
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 208 ret = regmap_read(pmic_typec->regmap,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 209 pmic_typec->base + TYPEC_MISC_STATUS_REG, &misc);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 210 if (ret)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 211 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 212
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 213 attached = !!(misc & CC_ATTACHED);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 @214 debounced = !!(misc & TYPEC_DEBOUNCE_DONE);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 215
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 216 if (pmic_typec->debouncing_cc) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 217 ret = -EBUSY;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 218 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 219 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 220
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 221 *cc1 = TYPEC_CC_OPEN;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 222 *cc2 = TYPEC_CC_OPEN;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 223
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 224 if (!(attached))
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 225 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 226
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 227 if (misc & SNK_SRC_MODE) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 228 ret = regmap_read(pmic_typec->regmap,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 229 pmic_typec->base + TYPEC_SRC_STATUS_REG,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 230 &val);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 231 if (ret)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 232 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 233 switch (val & DETECTED_SRC_TYPE_MASK) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 234 case SRC_RD_OPEN:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 235 val = TYPEC_CC_RD;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 236 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 237 case SRC_RD_RA_VCONN:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 238 val = TYPEC_CC_RD;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 239 *cc1 = TYPEC_CC_RA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 240 *cc2 = TYPEC_CC_RA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 241 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 242 default:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 243 dev_warn(dev, "unexpected src status %.2x\n", val);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 244 val = TYPEC_CC_RD;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 245 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 246 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 247 } else {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 248 ret = regmap_read(pmic_typec->regmap,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 249 pmic_typec->base + TYPEC_SNK_STATUS_REG,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 250 &val);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 251 if (ret)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 252 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 253 switch (val & DETECTED_SNK_TYPE_MASK) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 254 case SNK_RP_STD:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 255 val = TYPEC_CC_RP_DEF;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 256 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 257 case SNK_RP_1P5:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 258 val = TYPEC_CC_RP_1_5;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 259 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 260 case SNK_RP_3P0:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 261 val = TYPEC_CC_RP_3_0;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 262 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 263 default:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 264 dev_warn(dev, "unexpected snk status %.2x\n", val);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 265 val = TYPEC_CC_RP_DEF;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 266 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 267 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 268 val = TYPEC_CC_RP_DEF;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 269 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 270
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 271 if (misc & CC_ORIENTATION)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 272 *cc2 = val;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 273 else
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 274 *cc1 = val;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 275
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 276 done:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 277 dev_dbg(dev, "get_cc: misc 0x%08x cc1 0x%08x %s cc2 0x%08x %s attached %d cc=%s\n",
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 278 misc, *cc1, cc_to_name(*cc1), *cc2, cc_to_name(*cc2), !!(misc & CC_ATTACHED),
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 279 misc_to_cc(misc));
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 280
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 281 return ret;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 282 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 283
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 284 static void qcom_pmic_set_cc_debounce(struct pmic_typec *pmic_typec)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 285 {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 286 pmic_typec->debouncing_cc = true;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 287 schedule_delayed_work(&pmic_typec->cc_debounce_dwork,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 288 msecs_to_jiffies(2));
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 289 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 290
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 291 int qcom_pmic_tcpm_typec_set_cc(struct pmic_typec *pmic_typec,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 292 enum typec_cc_status cc)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 293 {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 294 struct device *dev = pmic_typec->dev;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 295 unsigned int mode, currsrc;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 296 unsigned int orientation, misc;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 297 unsigned long flags;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 298 int ret;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 299
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 300 spin_lock_irqsave(&pmic_typec->lock, flags);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 301
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 302 ret = regmap_read(pmic_typec->regmap,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 303 pmic_typec->base + TYPEC_MISC_STATUS_REG,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 304 &misc);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 305 if (ret)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 306 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 307
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 @308 orientation = !!(misc & CC_ORIENTATION);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 309
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 310 mode = EN_SRC_ONLY;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 311
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 312 switch (cc) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 313 case TYPEC_CC_OPEN:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 314 currsrc = TYPEC_SRC_RP_SEL_80UA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 315 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 316 case TYPEC_CC_RP_DEF:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 317 currsrc = TYPEC_SRC_RP_SEL_80UA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 318 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 319 case TYPEC_CC_RP_1_5:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 320 currsrc = TYPEC_SRC_RP_SEL_180UA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 321 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 322 case TYPEC_CC_RP_3_0:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 323 currsrc = TYPEC_SRC_RP_SEL_330UA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 324 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 325 case TYPEC_CC_RD:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 326 currsrc = TYPEC_SRC_RP_SEL_80UA;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 327 mode = EN_SNK_ONLY;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 328 break;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 329 default:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 330 dev_warn(dev, "unexpected set_cc %d\n", cc);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 331 ret = -EINVAL;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 332 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 333 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 334
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 335 if (mode == EN_SRC_ONLY) {
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 336 ret = regmap_write(pmic_typec->regmap,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 337 pmic_typec->base + TYPEC_CURRSRC_CFG_REG,
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 338 currsrc);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 339 if (ret)
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 340 goto done;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 341 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 342
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 343 pmic_typec->cc = cc;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 344 qcom_pmic_set_cc_debounce(pmic_typec);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 345 ret = 0;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 346
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 347 done:
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 348 spin_unlock_irqrestore(&pmic_typec->lock, flags);
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 349
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 350 dev_dbg(dev, "set_cc: currsrc=%x %s mode %s debounce %d attached %d cc=%s\n",
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 351 currsrc, rp_sel_to_name(currsrc),
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 352 mode == EN_SRC_ONLY ? "EN_SRC_ONLY" : "EN_SNK_ONLY",
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 353 pmic_typec->debouncing_cc, !!(misc & CC_ATTACHED),
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 354 misc_to_cc(misc));
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 355
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 356 return ret;
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 357 }
fe4e9d99505858 Bryan O'Donoghue 2021-10-28 358
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 36135 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-11-05 5:45 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 16:49 [RESEND PATCH v2 0/7] Add pm8150b TPCM driver Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 1/7] dt-bindings: usb: Add qcom,pmic-usb-typec dt-binding header Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 2/7] dt-bindings: usb: Add Qualcomm PMIC type C controller YAML schema Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
2021-10-28 20:38 ` Rob Herring
2021-10-28 16:49 ` [RESEND PATCH v2 3/7] dt-bindings: usb: Add qcom,pmic-usb-pdphy dt-binding header Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 4/7] dt-bindings: usb: Add Qualcomm PMIC PDPHY controller YAML schema Bryan O'Donoghue
2021-10-28 19:08 ` Rob Herring
2021-10-28 20:39 ` Rob Herring
2021-10-28 16:49 ` [RESEND PATCH v2 5/7] dt-bindings: usb: Add Qualcomm PMIC TCPM " Bryan O'Donoghue
2021-10-28 20:43 ` Rob Herring
2021-10-28 21:46 ` Bryan O'Donoghue
2021-10-28 21:52 ` Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 6/7] usb: typec: qcom: Remove standalone qcom pm8150b typec driver Bryan O'Donoghue
2021-10-28 16:49 ` [RESEND PATCH v2 7/7] usb: typec: qcom: Add a pm8150b TCPM driver Bryan O'Donoghue
2021-10-29 16:40 ` kernel test robot
[not found] <202110301822.cMPH2aH0-lkp@intel.com>
2021-11-05 5:45 ` kernel test robot
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).