usb typec: mt6360: Add support for mt6360 Type-C driver
Subsystems (5)
PATCH v3 1/3 usb typec: mt6360: Add support for mt6360 Type-C driver
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error for platform_get_irq_byname.
3. Fix tcpci_register_port check from IS_ERR_OR_NULL to IS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.
--- drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c
drivers/usb/typec/tcpm/Kconfig +8 -0
@@ -27,6 +27,14 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. +config TYPEC_MT6360 + tristate "Mediatek MT6360 Type-C driver" + depends on MFD_MT6360 + help + Mediatek MT6360 is a multi-functional IC that includes + USB Type-C. It works with Type-C Port Controller Manager + to provide USB PD and USB Type-C functionalities. + endif # TYPEC_TCPCI config TYPEC_FUSB302
drivers/usb/typec/tcpm/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o typec_wcove-y := wcove.o obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o +obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +212 -0
212 lines not on this page · raw message
Signature · 7 lines
2.7.4 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 2/3 usb typec: mt6360: Rename driver/Kconfig/Makefile from mt6360 to mt636x
From: ChiYuan Huang <[email protected]>
1. Rename file form tcpci_mt6360.c to tcpci_mt636x.c
2. Rename internal function from mt6360 to mt636x, except the register definition.
3. Change Kconfig/Makefile from MT6360 to MT636X.
--- drivers/usb/typec/tcpm/Kconfig | 6 +- drivers/usb/typec/tcpm/Makefile | 2 +- drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ---------------------------------- drivers/usb/typec/tcpm/tcpci_mt636x.c | 212 ++++++++++++++++++++++++++++++++++ 4 files changed, 216 insertions(+), 216 deletions(-) delete mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c create mode 100644 drivers/usb/typec/tcpm/tcpci_mt636x.c
drivers/usb/typec/tcpm/Kconfig +3 -3
@@ -27,11 +27,11 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. -config TYPEC_MT6360 - tristate "Mediatek MT6360 Type-C driver" +config TYPEC_MT636X + tristate "Mediatek MT636x Type-C driver" depends on MFD_MT6360 help - Mediatek MT6360 is a multi-functional IC that includes + Mediatek MT636x is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
drivers/usb/typec/tcpm/Makefile +1 -1
@@ -5,4 +5,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o typec_wcove-y := wcove.o obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o -obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o +obj-$(CONFIG_TYPEC_MT636X) += tcpci_mt636x.o
drivers/usb/typec/tcpm/tcpci_mt6360.c deleted +0 -212
212 lines not on this page · raw message
drivers/usb/typec/tcpm/tcpci_mt636x.c new file +212 -0
212 lines not on this page · raw message
Signature · 7 lines
2.7.4 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 3/3 usb typec: mt6360: Add MT6360 Type-C DT binding documentation
In reply to cy_huangFrom: ChiYuan Huang <[email protected]>
Add a devicetree binding documentation for the MT6360 Type-C driver.
usb typec: mt6360: Rename DT binding doument from mt6360 to mt636x
Change binding document file name from mt6360 to mt636xfor the future compatible.
Also change internal description from mt6360 to mt636x.
--- .../bindings/usb/mediatek,mt636x-tcpc.yaml | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt636x-tcpc.yaml
Documentation/devicetree/bindings/usb/mediatek,mt636x-tcpc.yaml new file +73 -0
@@ -0,0 +1,73 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/usb/mediatek,mt636x-tcpc.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Mediatek MT636x Type-C Port Switch and Power Delivery controller DT bindings + +maintainers: + - ChiYuan Huang <[email protected]> + +description: | + Mediatek MT636x is a multi-functional device. It integrates charger, ADC, flash, RGB indicators, + regulators (BUCKs/LDOs), and TypeC Port Switch with Power Delivery controller. + This document only describes MT636x Type-C Port Switch and Power Delivery controller. + +properties: + compatible: + enum: + - mediatek,mt6360-tcpc + + interrupts-extended: + maxItems: 1 + + interrupt-names: + items: + - const: PD_IRQB + +patternProperties: + "connector": + type: object + $ref: ../connector/usb-connector.yaml# + description: + Properties for usb c connector. + +additionalProperties: false + +required: + - compatible + - interrupts-extended + - interrupt-names + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/usb/pd.h> + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + + mt6360@34 { + compatible = "mediatek,mt6360"; + reg = <0x34>; + + tcpc { + compatible = "mediatek,mt6360-tcpc"; + interrupts-extended = <&gpio26 3 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "PD_IRQB"; + + connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + power-role = "dual"; + try-power-role = "sink"; + source-pdos = <PDO_FIXED(5000, 1000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>; + sink-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>; + op-sink-microwatt = <10000000>; + }; + }; + }; + }; +...
Signature · 7 lines
2.7.4 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Heikki Krogerus
maintainerQuoted 10 lines · cy_huang
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.
Quoted 6 lines
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.
You don't place additional changelog here...
Quoted 2 lines
Signed-off-by ChiYuan Huang <[email protected]>---
You put it here, after that '---' marker:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#the-canonical-patch-format
Quoted 5 lines
drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c
thanks,
Signature · 6 lines
heikki _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Heikki Krogerus <[email protected]> 於 2020年8月27日 週四 下午10:00寫道:
Quoted 19 lines · cy_huang
Quoted 10 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.Quoted 6 lines
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.
Quoted 8 lines
You don't place additional changelog here...
Quoted 2 lines
Signed-off-by ChiYuan Huang <[email protected]>---
You put it here, after that '---' marker:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#the-canonical-patch-format
HI Hekki:
after reading the document, I have a little bit confused how to
use diffstat for the changelog.
Is there any example that make me know to write a clear
description for the changelog?
Quoted 11 lines
Quoted 6 lines
drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.cthanks,
--
heikki
Re: [PATCH v3 2/3] usb typec: mt6360: Rename driver/Kconfig/Makefile from mt6360 to mt636x
In reply to cy_huangQuoted 8 lines · cy_huang
From: ChiYuan Huang <[email protected]>
1. Rename file form
tcpci_mt6360.ctotcpci_mt636x.c
2. Rename internal function from mt6360 to mt636x, except the register definition.
3. Change Kconfig/Makefile from MT6360 to MT636X.Signed-off-by ChiYuan Huang <[email protected]>
Quoted 8 lines
--- drivers/usb/typec/tcpm/Kconfig | 6 +- drivers/usb/typec/tcpm/Makefile | 2 +- drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ---------------------------------- drivers/usb/typec/tcpm/tcpci_mt636x.c | 212 ++++++++++++++++++++++++++++++++++ 4 files changed, 216 insertions(+), 216 deletions(-) delete mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c create mode 100644 drivers/usb/typec/tcpm/tcpci_mt636x.c
Maybe Heikki is ok with this change, but I am not, for the reasons mentioned before. So I won't approve this patch. Note that, either case, it should be merged with the first patch.
Guenter
Re: [PATCH v3 2/3] usb typec: mt6360: Rename driver/Kconfig/Makefile from mt6360 to mt636x
Guenter Roeck <[email protected]> 於 2020年8月28日 週五 上午12:41寫道:
Quoted 19 lines · cy_huang
Quoted 8 lines
From: ChiYuan Huang <[email protected]>
1. Rename file form
tcpci_mt6360.ctotcpci_mt636x.c
2. Rename internal function from mt6360 to mt636x, except the register definition.
3. Change Kconfig/Makefile from MT6360 to MT636X.Signed-off-by ChiYuan Huang <[email protected]>Quoted 8 lines
--- drivers/usb/typec/tcpm/Kconfig | 6 +- drivers/usb/typec/tcpm/Makefile | 2 +- drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ---------------------------------- drivers/usb/typec/tcpm/tcpci_mt636x.c | 212 ++++++++++++++++++++++++++++++++++ 4 files changed, 216 insertions(+), 216 deletions(-) delete mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c create mode 100644 drivers/usb/typec/tcpm/tcpci_mt636x.c
Quoted 3 lines
Maybe Heikki is ok with this change, but I am not, for the reasons mentioned before. So I won't approve this patch. Note that, either case, it should be merged with the first patch.
Yes, I agree with you opinion. use 636x, the range is too large from 0 to 9, it may not all be compatible.
Even though it's also possible that the part number don't have the same function.
So I'm going to remove the rename patch.
Do I need to add a patch named "revert"? Or just remove it. I'm not sure which way is better.
It seems you all want the code change to be squashed into the first code. And the second one is the DT binding. Right?
Quoted 2 lines
Guenter
Heikki Krogerus
maintainerQuoted 25 lines · ChiYuan Huang
Heikki Krogerus <[email protected]> 於 2020年8月27日 週四 下午10:00寫道:
Quoted 24 lines · cy_huang
Quoted 10 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.Quoted 6 lines
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.You don't place additional changelog here...
Quoted 2 lines
Signed-off-by ChiYuan Huang <[email protected]>---
Quoted 8 lines
Quoted 3 lines
You put it here, after that '---' marker:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#the-canonical-patch-formatHI Hekki:
after reading the document, I have a little bit confused how to
use diffstat for the changelog.
Is there any example that make me know to write a clear
description for the changelog?
Picking the latest patch from linux-usb ml. with version history:
https://lore.kernel.org/linux-usb/[email protected]/
See how the last tag line "Signed-off-by: Chunfeng Yun..." is followed by marker "---", which then is followed by the version history (the version history is then also ended with the marker "---", a step that I don't think is mandatory, but commonly used and often recommended).
That way that patch version history does not contaminate the actual commit message.
thanks,
Signature · 1 line
heikki
Heikki Krogerus <[email protected]> 於 2020年8月28日 週五 下午5:39寫道:
Quoted 44 lines · ChiYuan Huang
Quoted 25 lines
Heikki Krogerus <[email protected]> 於 2020年8月27日 週四 下午10:00寫道:
Quoted 24 lines · cy_huang
Quoted 10 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.Quoted 6 lines
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.You don't place additional changelog here...
Quoted 2 lines
Signed-off-by ChiYuan Huang <[email protected]>---
Quoted 8 lines
Quoted 3 lines
You put it here, after that '---' marker:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#the-canonical-patch-formatHI Hekki:
after reading the document, I have a little bit confused how to
use diffstat for the changelog.
Is there any example that make me know to write a clear
description for the changelog?Picking the latest patch from linux-usb ml. with version history:
https://lore.kernel.org/linux-usb/[email protected]/See how the last tag line "Signed-off-by: Chunfeng Yun..." is followed by marker "---", which then is followed by the version history (the version history is then also ended with the marker "---", a step that I don't think is mandatory, but commonly used and often recommended).
Quoted 6 lines
That way that patch version history does not contaminate the actual commit message.
thanks,
Ah, I already send the patch v4, I only add the changelog after the sign-off --- label, but forget to add --- after changelog ended
Please let me resend the patch v4 to add --- label after the change log eded.
Quoted 2 lines
--
heikki
Heikki Krogerus
maintainerQuoted 49 lines · ChiYuan Huang
Heikki Krogerus <[email protected]> 於 2020年8月28日 週五 下午5:39寫道:
Quoted 48 lines · ChiYuan Huang
Quoted 25 lines
Heikki Krogerus <[email protected]> 於 2020年8月27日 週四 下午10:00寫道:
Quoted 24 lines · cy_huang
Quoted 10 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.Quoted 6 lines
v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.You don't place additional changelog here...
Quoted 2 lines
Signed-off-by ChiYuan Huang <[email protected]>---
Quoted 8 lines
Quoted 3 lines
You put it here, after that '---' marker:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#the-canonical-patch-formatHI Hekki:
after reading the document, I have a little bit confused how to
use diffstat for the changelog.
Is there any example that make me know to write a clear
description for the changelog?Picking the latest patch from linux-usb ml. with version history:
https://lore.kernel.org/linux-usb/[email protected]/See how the last tag line "Signed-off-by: Chunfeng Yun..." is followed by marker "---", which then is followed by the version history (the version history is then also ended with the marker "---", a step that I don't think is mandatory, but commonly used and often recommended).
That way that patch version history does not contaminate the actual commit message.
Quoted 6 lines
Quoted 2 lines
thanks,
Ah, I already send the patch v4, I only add the changelog after the sign-off --- label, but forget to add --- after changelog ended
Please let me resend the patch v4 to add --- label after the change log eded.
You do not need to do that. Like I said, it is not mandatory.
thanks,
Signature · 6 lines
heikki _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Chunfeng Yun
maintainerQuoted 116 lines · cy_huang
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.Signed-off-by ChiYuan Huang <[email protected]>--- drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.cdrivers/usb/typec/tcpm/Kconfig +8
-0@@ -27,6 +27,14 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. +config TYPEC_MT6360 + tristate "Mediatek MT6360 Type-C driver" + depends on MFD_MT6360 + help + Mediatek MT6360 is a multi-functional IC that includes + USB Type-C. It works with Type-C Port Controller Manager + to provide USB PD and USB Type-C functionalities. + endif # TYPEC_TCPCI config TYPEC_FUSB302drivers/usb/typec/tcpm/Makefile +1
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o typec_wcove-y := wcove.o obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o +obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.odrivers/usb/typec/tcpm/tcpci_mt6360.c new file +57
-0@@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020 MediaTek Inc. +* +* Author: ChiYuan Huang <[email protected]> +*/ + +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/usb/tcpm.h> + +#include "tcpci.h" + +#define MT6360_REG_VCONNCTRL1 0x8C +#define MT6360_REG_MODECTRL2 0x8F +#define MT6360_REG_SWRESET 0xA0 +#define MT6360_REG_DEBCTRL1 0xA1 +#define MT6360_REG_DRPCTRL1 0xA2 +#define MT6360_REG_DRPCTRL2 0xA3 +#define MT6360_REG_I2CTORST 0xBF +#define MT6360_REG_RXCTRL2 0xCF +#define MT6360_REG_CTDCTRL2 0xEC + +/* MT6360_REG_VCONNCTRL1 */ +#define MT6360_VCONNCL_ENABLE BIT(0) +/* MT6360_REG_RXCTRL2 */ +#define MT6360_OPEN40M_ENABLE BIT(7) +/* MT6360_REG_CTDCTRL2 */ +#define MT6360_RPONESHOT_ENABLE BIT(6) + +struct mt6360_tcpc_info { +struct tcpci_data tdata; +struct tcpci *tcpci; +struct device *dev; +int irq; +}; + +static inline int mt6360_tcpc_read16 (struct regmap *regmap, +unsigned int reg,u16 *val) +{ +return regmap_raw_read (regmap, reg, val,sizeof (u16)); +} + +static inline int mt6360_tcpc_write16 (struct regmap *regmap, +unsigned int reg,u16 val) +{ +return regmap_raw_write (regmap, reg, &val,sizeof (u16)); +} + +static int mt6360_tcpc_init (struct tcpci *tcpci,struct tcpci_data *tdata) +{ +struct regmap *regmap = tdata->regmap; +int ret;
drivers/usb/typec/tcpm/tcpci_mt6360.c line 67
Quoted 10 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +10
-0+ + ret =regmap_write (regmap,MT6360_REG_SWRESET ,0x01 ); +if (ret) +return ret; + +/* after reset command, wait 1~2ms to wait IC action */ +usleep_range (1000 ,2000 ); + +/* write all alert to masked */ + ret =mt6360_tcpc_write16 (regmap,TCPC_ALERT_MASK ,0 );
Wonder why access some register by 2bytes, and others 4bytes? can we access them all by 4bytes?
Quoted 60 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +60
-0+if (ret) +return ret; + +/* config I2C timeout reset enable , and timeout to 200ms */ + ret =regmap_write (regmap,MT6360_REG_I2CTORST ,0x8F ); +if (ret) +return ret; + +/* config CC Detect Debounce : 26.7*val us */ + ret =regmap_write (regmap,MT6360_REG_DEBCTRL1 ,0x10 ); +if (ret) +return ret; + +/* DRP Toggle Cycle : 51.2 + 6.4*val ms */ + ret =regmap_write (regmap,MT6360_REG_DRPCTRL1 ,4 ); +if (ret) +return ret; + +/* DRP Duyt Ctrl : dcSRC: /1024 */ + ret =mt6360_tcpc_write16 (regmap,MT6360_REG_DRPCTRL2 ,330 ); +if (ret) +return ret; + +/* Enable VCONN Current Limit function */ + ret =regmap_update_bits (regmap,MT6360_REG_VCONNCTRL1 ,MT6360_VCONNCL_ENABLE , +MT6360_VCONNCL_ENABLE ); +if (ret) +return ret; + +/* Enable cc open 40ms when pmic send vsysuv signal */ + ret =regmap_update_bits (regmap,MT6360_REG_RXCTRL2 ,MT6360_OPEN40M_ENABLE , +MT6360_OPEN40M_ENABLE ); +if (ret) +return ret; + +/* Enable Rpdet oneshot detection */ + ret =regmap_update_bits (regmap,MT6360_REG_CTDCTRL2 ,MT6360_RPONESHOT_ENABLE , +MT6360_RPONESHOT_ENABLE ); +if (ret) +return ret; + +/* Set shipping mode off, AUTOIDLE on */ +return regmap_write (regmap,MT6360_REG_MODECTRL2 ,0x7A ); +} + +static irqreturn_t mt6360_irq (int irq,void *dev_id) +{ +struct mt6360_tcpc_info *mti = dev_id; + +return tcpci_irq (mti->tcpci); +} + +static int mt6360_tcpc_probe (struct platform_device *pdev) +{ +struct mt6360_tcpc_info *mti; +int ret; + + mti =devm_kzalloc (&pdev->dev,sizeof (*mti),GFP_KERNEL ); +if (!mti) +return -ENOMEM ;
drivers/usb/typec/tcpm/tcpci_mt6360.c line 137
Quoted 10 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +10
-0+ + mti->dev = &pdev->dev; + + mti->tdata.regmap =dev_get_regmap (pdev->dev.parent,NULL ); +if (!mti->tdata.regmap) { +dev_err (&pdev->dev,"Failed to get parent regmap\n" ); +return -ENODEV ; + } + + mti->irq =platform_get_irq_byname (pdev,"PD_IRQB" );
Use lowercase letters for irq name?
Quoted 65 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +65
-0+if (mti->irq <0 ) +return mti->irq; + + mti->tdata.init = mt6360_tcpc_init; + mti->tcpci =tcpci_register_port (&pdev->dev, &mti->tdata); +if (IS_ERR (mti->tcpci)) { +dev_err (&pdev->dev,"Failed to register tcpci port\n" ); +return PTR_ERR (mti->tcpci); + } + + ret =devm_request_threaded_irq (mti->dev, mti->irq,NULL , mt6360_irq,IRQF_ONESHOT , +dev_name (&pdev->dev), mti); +if (ret) { +dev_err (mti->dev,"Failed to register irq\n" ); +tcpci_unregister_port (mti->tcpci); +return ret; + } + +device_init_wakeup (&pdev->dev, true); +platform_set_drvdata (pdev, mti); + +return 0 ; +} + +static int mt6360_tcpc_remove (struct platform_device *pdev) +{ +struct mt6360_tcpc_info *mti =platform_get_drvdata (pdev); + +disable_irq (mti->irq); +tcpci_unregister_port (mti->tcpci); +return 0 ; +} + +static int __maybe_unused mt6360_tcpc_suspend (struct device *dev) +{ +struct mt6360_tcpc_info *mti =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (mti->irq); + +return 0 ; +} + +static int __maybe_unused mt6360_tcpc_resume (struct device *dev) +{ +struct mt6360_tcpc_info *mti =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (mti->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mt6360_tcpc_pm_ops, mt6360_tcpc_suspend, mt6360_tcpc_resume); + +static const struct of_device_id __maybe_unused mt6360_tcpc_of_id[] = { + { .compatible ="mediatek,mt6360-tcpc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, mt6360_tcpc_of_id); + +static struct platform_driver mt6360_tcpc_driver = { + .driver = { + .name ="mt6360-tcpc" , + .pm = &mt6360_tcpc_pm_ops,
drivers/usb/typec/tcpm/tcpci_mt6360.c line 212
Quoted 10 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +10
-0+ .of_match_table = mt6360_tcpc_of_id, + }, + .probe = mt6360_tcpc_probe, + .remove = mt6360_tcpc_remove, +}; +module_platform_driver (mt6360_tcpc_driver); + +MODULE_AUTHOR ("ChiYuan Huang <[email protected]>" ); +MODULE_DESCRIPTION ("MT6360 USB Type-C Port Controller Interface Driver" ); +MODULE_LICENSE ("GPL v2" );
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Chunfeng Yun <[email protected]> 於 2020年8月28日 週五 下午8:11寫道:
Quoted 122 lines · cy_huang
Quoted 120 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.Signed-off-by ChiYuan Huang <[email protected]>--- drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.cdrivers/usb/typec/tcpm/Kconfig +8
-0@@ -27,6 +27,14 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. +config TYPEC_MT6360 + tristate "Mediatek MT6360 Type-C driver" + depends on MFD_MT6360 + help + Mediatek MT6360 is a multi-functional IC that includes + USB Type-C. It works with Type-C Port Controller Manager + to provide USB PD and USB Type-C functionalities. + endif # TYPEC_TCPCI config TYPEC_FUSB302drivers/usb/typec/tcpm/Makefile +1
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o typec_wcove-y := wcove.o obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o +obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.odrivers/usb/typec/tcpm/tcpci_mt6360.c new file +61
-0@@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020 MediaTek Inc. +* +* Author: ChiYuan Huang <[email protected]> +*/ + +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/usb/tcpm.h> + +#include "tcpci.h" + +#define MT6360_REG_VCONNCTRL1 0x8C +#define MT6360_REG_MODECTRL2 0x8F +#define MT6360_REG_SWRESET 0xA0 +#define MT6360_REG_DEBCTRL1 0xA1 +#define MT6360_REG_DRPCTRL1 0xA2 +#define MT6360_REG_DRPCTRL2 0xA3 +#define MT6360_REG_I2CTORST 0xBF +#define MT6360_REG_RXCTRL2 0xCF +#define MT6360_REG_CTDCTRL2 0xEC + +/* MT6360_REG_VCONNCTRL1 */ +#define MT6360_VCONNCL_ENABLE BIT(0) +/* MT6360_REG_RXCTRL2 */ +#define MT6360_OPEN40M_ENABLE BIT(7) +/* MT6360_REG_CTDCTRL2 */ +#define MT6360_RPONESHOT_ENABLE BIT(6) + +struct mt6360_tcpc_info { +struct tcpci_data tdata; +struct tcpci *tcpci; +struct device *dev; +int irq; +}; + +static inline int mt6360_tcpc_read16 (struct regmap *regmap, +unsigned int reg,u16 *val) +{ +return regmap_raw_read (regmap, reg, val,sizeof (u16)); +} + +static inline int mt6360_tcpc_write16 (struct regmap *regmap, +unsigned int reg,u16 val) +{ +return regmap_raw_write (regmap, reg, &val,sizeof (u16)); +} + +static int mt6360_tcpc_init (struct tcpci *tcpci,struct tcpci_data *tdata) +{ +struct regmap *regmap = tdata->regmap; +int ret; + + ret =regmap_write (regmap,MT6360_REG_SWRESET ,0x01 ); +if (ret) +return ret;
Quoted 8 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c line 67
Quoted 6 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +6
-0+ +/* after reset command, wait 1~2ms to wait IC action */ +usleep_range (1000 ,2000 ); + +/* write all alert to masked */ + ret =mt6360_tcpc_write16 (regmap,TCPC_ALERT_MASK ,0 );Wonder why access some register by 2bytes, and others 4bytes? can we access them all by 4bytes?
Actually, the access bus is still I2C.
Each register is still one byte only.
Register address like as TCPC_ALERT_MASK are continuous two byte used as IRQ MASK.
That's why it's used wirte16 function to access.
Actually, you also can divided into two bytes write into one byte access by two times.
For I2C bus efficiency, it seems bad.
Quoted 65 lines
Quoted 65 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +63
-0+if (ret) +return ret; + +/* config I2C timeout reset enable , and timeout to 200ms */ + ret =regmap_write (regmap,MT6360_REG_I2CTORST ,0x8F ); +if (ret) +return ret; + +/* config CC Detect Debounce : 26.7*val us */ + ret =regmap_write (regmap,MT6360_REG_DEBCTRL1 ,0x10 ); +if (ret) +return ret; + +/* DRP Toggle Cycle : 51.2 + 6.4*val ms */ + ret =regmap_write (regmap,MT6360_REG_DRPCTRL1 ,4 ); +if (ret) +return ret; + +/* DRP Duyt Ctrl : dcSRC: /1024 */ + ret =mt6360_tcpc_write16 (regmap,MT6360_REG_DRPCTRL2 ,330 ); +if (ret) +return ret; + +/* Enable VCONN Current Limit function */ + ret =regmap_update_bits (regmap,MT6360_REG_VCONNCTRL1 ,MT6360_VCONNCL_ENABLE , +MT6360_VCONNCL_ENABLE ); +if (ret) +return ret; + +/* Enable cc open 40ms when pmic send vsysuv signal */ + ret =regmap_update_bits (regmap,MT6360_REG_RXCTRL2 ,MT6360_OPEN40M_ENABLE , +MT6360_OPEN40M_ENABLE ); +if (ret) +return ret; + +/* Enable Rpdet oneshot detection */ + ret =regmap_update_bits (regmap,MT6360_REG_CTDCTRL2 ,MT6360_RPONESHOT_ENABLE , +MT6360_RPONESHOT_ENABLE ); +if (ret) +return ret; + +/* Set shipping mode off, AUTOIDLE on */ +return regmap_write (regmap,MT6360_REG_MODECTRL2 ,0x7A ); +} + +static irqreturn_t mt6360_irq (int irq,void *dev_id) +{ +struct mt6360_tcpc_info *mti = dev_id; + +return tcpci_irq (mti->tcpci); +} + +static int mt6360_tcpc_probe (struct platform_device *pdev) +{ +struct mt6360_tcpc_info *mti; +int ret; + + mti =devm_kzalloc (&pdev->dev,sizeof (*mti),GFP_KERNEL ); +if (!mti) +return -ENOMEM ; + + mti->dev = &pdev->dev; +
Quoted 8 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c line 137
Quoted 7 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +7
-0+ mti->tdata.regmap =dev_get_regmap (pdev->dev.parent,NULL ); +if (!mti->tdata.regmap) { +dev_err (&pdev->dev,"Failed to get parent regmap\n" ); +return -ENODEV ; + } + + mti->irq =platform_get_irq_byname (pdev,"PD_IRQB" );Use lowercase letters for irq name?
PD_IRQB is defined in MT6360 pinout. The datasheet is also labeled as PD_IRQB. My thinking is to keep the pinout name like as the datasheet defined. B means bar to be identified the pin is active low.
Quoted 77 lines
Quoted 76 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +75
-0+if (mti->irq <0 ) +return mti->irq; + + mti->tdata.init = mt6360_tcpc_init; + mti->tcpci =tcpci_register_port (&pdev->dev, &mti->tdata); +if (IS_ERR (mti->tcpci)) { +dev_err (&pdev->dev,"Failed to register tcpci port\n" ); +return PTR_ERR (mti->tcpci); + } + + ret =devm_request_threaded_irq (mti->dev, mti->irq,NULL , mt6360_irq,IRQF_ONESHOT , +dev_name (&pdev->dev), mti); +if (ret) { +dev_err (mti->dev,"Failed to register irq\n" ); +tcpci_unregister_port (mti->tcpci); +return ret; + } + +device_init_wakeup (&pdev->dev, true); +platform_set_drvdata (pdev, mti); + +return 0 ; +} + +static int mt6360_tcpc_remove (struct platform_device *pdev) +{ +struct mt6360_tcpc_info *mti =platform_get_drvdata (pdev); + +disable_irq (mti->irq); +tcpci_unregister_port (mti->tcpci); +return 0 ; +} + +static int __maybe_unused mt6360_tcpc_suspend (struct device *dev) +{ +struct mt6360_tcpc_info *mti =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (mti->irq); + +return 0 ; +} + +static int __maybe_unused mt6360_tcpc_resume (struct device *dev) +{ +struct mt6360_tcpc_info *mti =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (mti->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mt6360_tcpc_pm_ops, mt6360_tcpc_suspend, mt6360_tcpc_resume); + +static const struct of_device_id __maybe_unused mt6360_tcpc_of_id[] = { + { .compatible ="mediatek,mt6360-tcpc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, mt6360_tcpc_of_id); + +static struct platform_driver mt6360_tcpc_driver = { + .driver = { + .name ="mt6360-tcpc" , + .pm = &mt6360_tcpc_pm_ops, + .of_match_table = mt6360_tcpc_of_id, + }, + .probe = mt6360_tcpc_probe, + .remove = mt6360_tcpc_remove, +}; +module_platform_driver (mt6360_tcpc_driver); + +MODULE_AUTHOR ("ChiYuan Huang <[email protected]>" ); +MODULE_DESCRIPTION ("MT6360 USB Type-C Port Controller Interface Driver" ); +MODULE_LICENSE ("GPL v2" );
Quoted 138 lines · ChiYuan Huang
Chunfeng Yun <[email protected]> 於 2020年8月28日 週五 下午8:11寫道:
Quoted 122 lines · cy_huang
Quoted 120 lines
From: ChiYuan Huang <[email protected]>
Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities.
v1 to v2
1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove.v2 to v3
1. Change comment style for the head of source code.
2. No need to print error forplatform_get_irq_byname.
3. Fixtcpci_register_portcheck fromIS_ERR_OR_NULLtoIS_ERR.
4. Rename driver/Kconfig/Makefile form mt6360 to mt636x.
5. Rename DT binding documents from mt6360 to mt636x.Signed-off-by ChiYuan Huang <[email protected]>--- drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.cdrivers/usb/typec/tcpm/Kconfig +8
-0@@ -27,6 +27,14 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. +config TYPEC_MT6360 + tristate "Mediatek MT6360 Type-C driver" + depends on MFD_MT6360 + help + Mediatek MT6360 is a multi-functional IC that includes + USB Type-C. It works with Type-C Port Controller Manager + to provide USB PD and USB Type-C functionalities. + endif # TYPEC_TCPCI config TYPEC_FUSB302drivers/usb/typec/tcpm/Makefile +1
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o typec_wcove-y := wcove.o obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o +obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.odrivers/usb/typec/tcpm/tcpci_mt6360.c new file +61
-0@@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020 MediaTek Inc. +* +* Author: ChiYuan Huang <[email protected]> +*/ + +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/usb/tcpm.h> + +#include "tcpci.h" + +#define MT6360_REG_VCONNCTRL1 0x8C +#define MT6360_REG_MODECTRL2 0x8F +#define MT6360_REG_SWRESET 0xA0 +#define MT6360_REG_DEBCTRL1 0xA1 +#define MT6360_REG_DRPCTRL1 0xA2 +#define MT6360_REG_DRPCTRL2 0xA3 +#define MT6360_REG_I2CTORST 0xBF +#define MT6360_REG_RXCTRL2 0xCF +#define MT6360_REG_CTDCTRL2 0xEC + +/* MT6360_REG_VCONNCTRL1 */ +#define MT6360_VCONNCL_ENABLE BIT(0) +/* MT6360_REG_RXCTRL2 */ +#define MT6360_OPEN40M_ENABLE BIT(7) +/* MT6360_REG_CTDCTRL2 */ +#define MT6360_RPONESHOT_ENABLE BIT(6) + +struct mt6360_tcpc_info { +struct tcpci_data tdata; +struct tcpci *tcpci; +struct device *dev; +int irq; +}; + +static inline int mt6360_tcpc_read16 (struct regmap *regmap, +unsigned int reg,u16 *val) +{ +return regmap_raw_read (regmap, reg, val,sizeof (u16)); +} + +static inline int mt6360_tcpc_write16 (struct regmap *regmap, +unsigned int reg,u16 val) +{ +return regmap_raw_write (regmap, reg, &val,sizeof (u16)); +} + +static int mt6360_tcpc_init (struct tcpci *tcpci,struct tcpci_data *tdata) +{ +struct regmap *regmap = tdata->regmap; +int ret; + + ret =regmap_write (regmap,MT6360_REG_SWRESET ,0x01 ); +if (ret) +return ret;Quoted 8 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c line 67
Quoted 6 lines
drivers/usb/typec/tcpm/tcpci_mt6360.c new file +6
-0+ +/* after reset command, wait 1~2ms to wait IC action */ +usleep_range (1000 ,2000 ); + +/* write all alert to masked */ + ret =mt6360_tcpc_write16 (regmap,TCPC_ALERT_MASK ,0 );Wonder why access some register by 2bytes, and others 4bytes? can we access them all by 4bytes?
Actually, the access bus is still I2C.
Each register is still one byte only.
Register address like asTCPC_ALERT_MASKare continuous two byte used as IRQ MASK.
That's why it's used wirte16 function to access.
Quoted 3 lines
Actually, you also can divided into two bytes write into one byte access by two times.
For I2C bus efficiency, it seems bad.
For MT6360_REG_DRPCTRL2, it might also be racy, since the two i2c addresses are really one register containing a 10-bit value. I would probably not matter here (afaics the value is changed from the default 327 to 330), but in general it seems safer to write such a value with a single 16-bit i2c write.
Guenter