ARM: sun8i: a83t: Enable USB OTG
Subsystems (4)
Chen-Yu Tsai
maintainerv4 cover ARM: sun8i: a83t: Enable USB OTG
From: Chen-Yu Tsai <[email protected]>
Hi everyone,
This is v4 of my A83T USB power supply / OTG series. Hopefully this is the last revision even though it's kind of late in the -rc cycle for the patches to make the next release. Fingers crossed.
Changes since v3:
- Dropped patch for disabling current limit
- Dropped mfd patch as it is already merged
Changes since v2:
- Added Rob's ack for dt bindings patch
- Rebased onto v5.1-rc1
Changes since v1:
- Added Lee's ack for mfd patch
- Make axp803_usb_power_supply_resources[] const
This series has since been tested. Both host mode and gadget mode work well. However this SoC seems to have a glitch in hardware. After host mode is used by plugging in a host mode cable, the hardware will not revert back to gadget mode if a standard USB cable is plugged in. Host mode continues to work however. This will likely have to be addressed with some workaround in either the musb driver or our USB PHY driver.
The patches have no cross-tree dependencies, so each part can go through their respective trees (power-supply / arm-soc).
I also have some follow-up patches to enable the USB power supply on AXP803 / A64. It's the boiler-plate mfd cell and device node addition.
Original cover letter follows:
This series enables USB OTG on the A83T boards. The AXP813/AXP818 PMICs used with the A83T have the same behavior as the AXP221 and AXP223, where if the N_VBUSEN pin is driven high, the VBUS sensing interrupts stop working. In the past Hans made a polling workaround in the USB PHY driver. In this series polling is added to the power supply driver.
The power supply driver work was started by Quentin, and shared with me when I expressed interest in getting USB OTG to work some time ago. Neither of us got around to finishing it, until now that is.
Patch 1 adds a new compatible string for the AXP813 VBUS power supply part.
Patch 2 is a bit of cleanup work for the driver.
Patch 3 allows disabling VBUS input current limiting on the AXP20x / AXP22x PMICs. While not strictly related to this series, I found it easier to just send everything together. This patch depends on the previous one.
Patch 4 adds the VBUS status polling feature. This is enabled on AXP221 and all later PMICs.
Patch 5 factors out code to read out the configured input current limit for the AXP20x and AXP22x PMICs. As the AXP813 uses different values, factoring out the code based on model will make the main function more readable.
Patch 6 adds support for the AXP813 VBUS power supply. checkpatch.pl reports a few warnings for this patch:
WARNING: Possible switch case/default not preceded by break or fallthrough comment
#100: FILE: drivers/power/supply/axp20x_usb_power.c:306:
+ case 1500000:
WARNING: Possible switch case/default not preceded by break or fallthrough comment
#101: FILE: drivers/power/supply/axp20x_usb_power.c:307:
+ case 2000000:
WARNING: Possible switch case/default not preceded by break or fallthrough comment
#102: FILE: drivers/power/supply/axp20x_usb_power.c:308:
+ case 2500000:
However they seem to be a false positive. The preceding line of the reported lines is a return statement, which is definitely not a fallthrough.
Patch 7 adds an mfd cell for the newly supported VBUS power supply.
Patch 8 adds a device node for the VBUS power supply to the common axp81x dtsi file.
Patch 9 enables USB OTG on the Cubietruck Plus and Bananapi M3.
Please have a look, and also test it on boards you have, and don't limit it to just the A83T ones. As mentioned above, the polling feature affects all boards that have an AXP221 or newer PMIC.
I haven't removed the polling workaround from the USB PHY driver yet. That would be the next step after this series is merged, and preferrably a release has passed.
Regards
ChenYu
Chen-Yu Tsai (4):
dt-bindings: power: supply: axp20x_usb_power: add axp813 compatible
power: supply: axp20x_usb_power: Fix typo in VBUS current limit macros
power: supply: axp20x_usb_power: use polling to detect vbus status
change
ARM: dts: sun8i: a83t: Enable USB OTG controller on some boards
Quentin Schulz (3):
power: supply: axp20x_usb_power: add function to get max current
power: supply: axp20x_usb_power: add support for AXP813
ARM: dtsi: axp81x: add USB power supply node
.../power/supply/axp20x_usb_power.txt | 1 + arch/arm/boot/dts/axp81x.dtsi | 4 + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 12 ++ .../boot/dts/sun8i-a83t-cubietruck-plus.dts | 12 ++ drivers/power/supply/axp20x_usb_power.c | 179 +++++++++++++++--- 5 files changed, 181 insertions(+), 27 deletions(-)
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 1/7 dt-bindings: power: supply: axp20x_usb_power: add axp813 compatible
From: Chen-Yu Tsai <[email protected]>
This adds the "x-powers,axp813-usb-power-supply" to the list of compatibles for AXP20X VBUS power supply driver.
---
Changes since v2:
- Collected Rob's Reviewed-by
--- .../devicetree/bindings/power/supply/axp20x_usb_power.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt +1 -0
@@ -4,6 +4,7 @@ Required Properties: -compatible: One of: "x-powers,axp202-usb-power-supply" "x-powers,axp221-usb-power-supply" "x-powers,axp223-usb-power-supply" + "x-powers,axp813-usb-power-supply" The AXP223 PMIC shares most of its behaviour with the AXP221 but has slight variations such as the former being able to set the VBUS power supply max
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 2/7 power: supply: axp20x_usb_power: Fix typo in VBUS current limit macros
In reply to Chen-Yu TsaiFrom: Chen-Yu Tsai <[email protected]>
The VBUS current limit value macros have VBUS typed as VBUC, while the bitmask macro is named correctly. Fix it.
--- drivers/power/supply/axp20x_usb_power.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/power/supply/axp20x_usb_power.c +8 -8
@@ -36,10 +36,10 @@#define AXP20X_VBUS_VHOLD_MASK GENMASK(5, 3)#define AXP20X_VBUS_VHOLD_OFFSET 3#define AXP20X_VBUS_CLIMIT_MASK 3 -#define AXP20X_VBUC_CLIMIT_900mA 0 -#define AXP20X_VBUC_CLIMIT_500mA 1 -#define AXP20X_VBUC_CLIMIT_100mA 2 -#define AXP20X_VBUC_CLIMIT_NONE 3 +#define AXP20X_VBUS_CLIMIT_900mA 0 +#define AXP20X_VBUS_CLIMIT_500mA 1 +#define AXP20X_VBUS_CLIMIT_100mA 2 +#define AXP20X_VBUS_CLIMIT_NONE 3#define AXP20X_ADC_EN1_VBUS_CURR BIT(2)#define AXP20X_ADC_EN1_VBUS_VOLT BIT(3)
@@ -107,19 +107,19 @@ static int axp20x_usb_power_get_property(struct power_supply *psy,return ret;switch (v &AXP20X_VBUS_CLIMIT_MASK ) { -case AXP20X_VBUC_CLIMIT_100mA: +case AXP20X_VBUS_CLIMIT_100mA:if (power->axp20x_id ==AXP221_ID ) val->intval =-1 ;/* No 100mA limit */ else val->intval =100000 ;break ; -case AXP20X_VBUC_CLIMIT_500mA: +case AXP20X_VBUS_CLIMIT_500mA: val->intval =500000 ;break ; -case AXP20X_VBUC_CLIMIT_900mA: +case AXP20X_VBUS_CLIMIT_900mA: val->intval =900000 ;break ; -case AXP20X_VBUC_CLIMIT_NONE : +case AXP20X_VBUS_CLIMIT_NONE : val->intval =-1 ;break ; }
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 3/7 power: supply: axp20x_usb_power: use polling to detect vbus status change
In reply to Chen-Yu TsaiFrom: Chen-Yu Tsai <[email protected]>
On AXP221 and later AXP PMICs that have the N_VBUSEN pin, when this pin is high, either due to the PMIC driving it high or as an input, the VBUS detection related interrupt mechanisms are disabled.
Previously this was worked around in the phy-sun4i-usb driver, which needed to sense VBUS changes and report them to the musb driver in a timely matter. However this workaround was only for the A31 and A33 type USB PHYs. To support newer platforms we would have to enable it for almost all the post-A31 SoCs.
However, since this is actually the result of the PMIC's behavior, the workaround would be better if done in the PMIC driver, in this case the VBUS power supply driver.
Add the same workqueue-based polling to the VBUS power supply driver. The polling interval is chosen to be the debounce interval from the USB PHY driver, as this short interval is needed in some cases, but the power supply driver would not know when.
--- drivers/power/supply/axp20x_usb_power.c | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/power/supply/axp20x_usb_power.c +53 -0
@@ -24,6 +24,7 @@#include <linux/regmap.h> #include <linux/slab.h> #include <linux/iio/consumer.h> +#include <linux/workqueue.h> #define DRVNAME "axp20x-usb-power-supply"
@@ -46,6 +47,12 @@#define AXP20X_VBUS_MON_VBUS_VALID BIT(3) +/* +* Note do not raise the debounce time, we must report Vusb high within +* 100ms otherwise we get Vbus errors in musb. +*/ +#define DEBOUNCE_TIME msecs_to_jiffies(50) +struct axp20x_usb_power {struct device_node *np;struct regmap *regmap;
@@ -53,6 +60,8 @@ struct axp20x_usb_power {enum axp20x_variants axp20x_id;struct iio_channel *vbus_v;struct iio_channel *vbus_i; +struct delayed_work vbus_detect; +unsigned int old_status; };static irqreturn_t axp20x_usb_power_irq (int irq,void *devid)
@@ -64,6 +73,35 @@ static irqreturn_t axp20x_usb_power_irq(int irq, void *devid)return IRQ_HANDLED ; } +static void axp20x_usb_power_poll_vbus (struct work_struct *work) +{ +struct axp20x_usb_power *power = + container_of(work, struct axp20x_usb_power, vbus_detect.work); +unsigned int val; +int ret; + + ret =regmap_read (power->regmap,AXP20X_PWR_INPUT_STATUS , &val); +if (ret) + goto out; + + val &= (AXP20X_PWR_STATUS_VBUS_PRESENT |AXP20X_PWR_STATUS_VBUS_USED ); +if (val != power->old_status) +power_supply_changed (power->supply); + + power->old_status = val; + +out: +mod_delayed_work (system_wq, &power->vbus_detect,DEBOUNCE_TIME ); +} + +static bool axp20x_usb_vbus_needs_polling (struct axp20x_usb_power *power) +{ +if (power->axp20x_id >=AXP221_ID ) +return true; + +return false; +} +static int axp20x_usb_power_get_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val) {
@@ -357,6 +395,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)if (!power)return -ENOMEM ; +platform_set_drvdata (pdev, power); power->axp20x_id = (enum axp20x_variants )of_device_get_match_data ( &pdev->dev);
@@ -415,6 +454,19 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) irq_names[i], ret); } +INIT_DELAYED_WORK (&power->vbus_detect, axp20x_usb_power_poll_vbus); +if (axp20x_usb_vbus_needs_polling (power)) +queue_delayed_work (system_wq, &power->vbus_detect,0 ); + +return 0 ; +} + +static int axp20x_usb_power_remove (struct platform_device *pdev) +{ +struct axp20x_usb_power *power =platform_get_drvdata (pdev); + +cancel_delayed_work_sync (&power->vbus_detect); +return 0 ; }
@@ -434,6 +486,7 @@ MODULE_DEVICE_TABLE(of, axp20x_usb_power_match);static struct platform_driver axp20x_usb_power_driver = { .probe = axp20x_usb_power_probe, + .remove = axp20x_usb_power_remove, .driver = { .name =DRVNAME , .of_match_table = axp20x_usb_power_match,
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 4/7 power: supply: axp20x_usb_power: add function to get max current
In reply to Chen-Yu TsaiFrom: Quentin Schulz <[email protected]>
To prepare for a new PMIC, factor out the code responsible of returning the maximum current to axp20x_get_current_max.
--- drivers/power/supply/axp20x_usb_power.c | 52 ++++++++++++++----------- 1 file changed, 30 insertions(+), 22 deletions(-)
drivers/power/supply/axp20x_usb_power.c +30 -22
@@ -102,6 +102,35 @@ static bool axp20x_usb_vbus_needs_polling(struct axp20x_usb_power *power)return false; } +static int axp20x_get_current_max (struct axp20x_usb_power *power,int *val) +{ +unsigned int v; +int ret =regmap_read (power->regmap,AXP20X_VBUS_IPSOUT_MGMT , &v); + +if (ret) +return ret; + +switch (v &AXP20X_VBUS_CLIMIT_MASK ) { +case AXP20X_VBUS_CLIMIT_100mA: +if (power->axp20x_id ==AXP221_ID ) + *val =-1 ;/* No 100mA limit */ +else + *val =100000 ; +break ; +case AXP20X_VBUS_CLIMIT_500mA: + *val =500000 ; +break ; +case AXP20X_VBUS_CLIMIT_900mA: + *val =900000 ; +break ; +case AXP20X_VBUS_CLIMIT_NONE : + *val =-1 ; +break ; + } + +return 0 ; +} +static int axp20x_usb_power_get_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val) {
@@ -140,28 +169,7 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, val->intval = ret *1700 ;/* 1 step = 1.7 mV */ return 0 ;case POWER_SUPPLY_PROP_CURRENT_MAX : - ret =regmap_read (power->regmap,AXP20X_VBUS_IPSOUT_MGMT , &v); -if (ret) -return ret; - -switch (v &AXP20X_VBUS_CLIMIT_MASK ) { -case AXP20X_VBUS_CLIMIT_100mA: -if (power->axp20x_id ==AXP221_ID ) - val->intval =-1 ;/* No 100mA limit */ -else - val->intval =100000 ; -break ; -case AXP20X_VBUS_CLIMIT_500mA: - val->intval =500000 ; -break ; -case AXP20X_VBUS_CLIMIT_900mA: - val->intval =900000 ; -break ; -case AXP20X_VBUS_CLIMIT_NONE : - val->intval =-1 ; -break ; - } -return 0 ; +return axp20x_get_current_max (power, &val->intval);case POWER_SUPPLY_PROP_CURRENT_NOW :if (IS_ENABLED (CONFIG_AXP20X_ADC )) { ret = iio_read_channel_processed(power->vbus_i,
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 5/7 power: supply: axp20x_usb_power: add support for AXP813
In reply to Chen-Yu TsaiFrom: Quentin Schulz <[email protected]>
This adds support for AXP813 PMIC. It is almost the same as AXP22X but has a different current limit.
--- drivers/power/supply/axp20x_usb_power.c | 66 ++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
drivers/power/supply/axp20x_usb_power.c +65 -1
@@ -42,6 +42,11 @@#define AXP20X_VBUS_CLIMIT_100mA 2#define AXP20X_VBUS_CLIMIT_NONE 3 +#define AXP813_VBUS_CLIMIT_900mA 0 +#define AXP813_VBUS_CLIMIT_1500mA 1 +#define AXP813_VBUS_CLIMIT_2000mA 2 +#define AXP813_VBUS_CLIMIT_2500mA 3 +#define AXP20X_ADC_EN1_VBUS_CURR BIT(2)#define AXP20X_ADC_EN1_VBUS_VOLT BIT(3)
@@ -131,6 +136,31 @@ static int axp20x_get_current_max(struct axp20x_usb_power *power, int *val)return 0 ; } +static int axp813_get_current_max (struct axp20x_usb_power *power,int *val) +{ +unsigned int v; +int ret =regmap_read (power->regmap,AXP20X_VBUS_IPSOUT_MGMT , &v); + +if (ret) +return ret; + +switch (v &AXP20X_VBUS_CLIMIT_MASK ) { +case AXP813_VBUS_CLIMIT_900mA: + *val =900000 ; +break ; +case AXP813_VBUS_CLIMIT_1500mA: + *val =1500000 ; +break ; +case AXP813_VBUS_CLIMIT_2000mA: + *val =2000000 ; +break ; +case AXP813_VBUS_CLIMIT_2500mA: + *val =2500000 ; +break ; + } +return 0 ; +} +static int axp20x_usb_power_get_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val) {
@@ -169,6 +199,8 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, val->intval = ret *1700 ;/* 1 step = 1.7 mV */ return 0 ;case POWER_SUPPLY_PROP_CURRENT_MAX : +if (power->axp20x_id ==AXP813_ID ) +return axp813_get_current_max (power, &val->intval);return axp20x_get_current_max (power, &val->intval);case POWER_SUPPLY_PROP_CURRENT_NOW :if (IS_ENABLED (CONFIG_AXP20X_ADC )) {
@@ -260,6 +292,31 @@ static int axp20x_usb_power_set_voltage_min(struct axp20x_usb_power *power,return -EINVAL ; } +static int axp813_usb_power_set_current_max (struct axp20x_usb_power *power, +int intval) +{ +int val; + +switch (intval) { +case 900000 : +return regmap_update_bits (power->regmap, +AXP20X_VBUS_IPSOUT_MGMT , +AXP20X_VBUS_CLIMIT_MASK , + AXP813_VBUS_CLIMIT_900mA); +case 1500000 : +case 2000000 : +case 2500000 : + val = (intval -1000000 ) /500000 ; +return regmap_update_bits (power->regmap, +AXP20X_VBUS_IPSOUT_MGMT , +AXP20X_VBUS_CLIMIT_MASK , val); +default : +return -EINVAL ; + } + +return -EINVAL ; +} +static int axp20x_usb_power_set_current_max (struct axp20x_usb_power *power,int intval) {
@@ -294,6 +351,9 @@ static int axp20x_usb_power_set_property(struct power_supply *psy,return axp20x_usb_power_set_voltage_min (power, val->intval);case POWER_SUPPLY_PROP_CURRENT_MAX : +if (power->axp20x_id ==AXP813_ID ) +return axp813_usb_power_set_current_max (power, + val->intval);return axp20x_usb_power_set_current_max (power, val->intval);default :
@@ -429,7 +489,8 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) usb_power_desc = &axp20x_usb_power_desc; irq_names = axp20x_irq_names; }else if (power->axp20x_id ==AXP221_ID || - power->axp20x_id ==AXP223_ID ) { + power->axp20x_id ==AXP223_ID || + power->axp20x_id ==AXP813_ID ) { usb_power_desc = &axp22x_usb_power_desc; irq_names = axp22x_irq_names; }else {
@@ -488,6 +549,9 @@ static const struct of_device_id axp20x_usb_power_match[] = { }, { .compatible = "x-powers,axp223-usb-power-supply", .data = (void *)AXP223_ID, + }, { + .compatible = "x-powers,axp813-usb-power-supply", + .data = (void *)AXP813_ID, }, { /* sentinel */ } };MODULE_DEVICE_TABLE (of, axp20x_usb_power_match);
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 6/7 ARM: dtsi: axp81x: add USB power supply node
In reply to Chen-Yu TsaiFrom: Quentin Schulz <[email protected]>
The AXP813/818 has a VBUS power input. Add a device node for it, now that we support it.
--- arch/arm/boot/dts/axp81x.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/axp81x.dtsi +4 -0
@@ -171,4 +171,8 @@ status = "disabled"; }; }; + + usb_power_supply: usb-power-supply { + compatible = "x-powers,axp813-usb-power-supply"; + }; };
Signature · 1 line
2.20.1
Chen-Yu Tsai
maintainerPATCH v4 7/7 ARM: dts: sun8i: a83t: Enable USB OTG controller on some boards
In reply to Chen-Yu TsaiFrom: Chen-Yu Tsai <[email protected]>
The Bananapi M3 and Cubietruck Plus both have USB OTG ports wired to the SoC and PMIC in the same way, with the N_VBUSEN pin on the PMIC controlling VBUS output, the PMIC's VBUS input for sensing VBUS, and PH11 on the SoC for sensing the ID pin.
Enable OTG on both boards.
--- arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 12 ++++++++++++ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 12 ++++++++++++ 2 files changed, 24 insertions(+)
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts +12 -0
@@ -389,7 +389,19 @@ }; }; +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usb_power_supply { + status = "okay"; +}; + &usbphy { + usb0_id_det-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ + usb0_vbus_power-supply = <&usb_power_supply>; + usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay"; };
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts +12 -0
@@ -420,7 +420,19 @@ }; }; +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usb_power_supply { + status = "okay"; +}; + &usbphy { + usb0_id_det-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ + usb0_vbus_power-supply = <&usb_power_supply>; + usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
Signature · 1 line
2.20.1
Sebastian Reichel
maintainerHi,
Quoted 3 lines · Chen-Yu Tsai
This is v4 of my A83T USB power supply / OTG series. Hopefully this is the last revision even though it's kind of late in the -rc cycle for the patches to make the next release. Fingers crossed.
Patches 1-5 (i.e. all except DTS) queued to power-supply subsystem.
-- Sebastian
Quoted 8 lines · Sebastian Reichel
Hi,
Quoted 3 lines · Chen-Yu Tsai
This is v4 of my A83T USB power supply / OTG series. Hopefully this is the last revision even though it's kind of late in the -rc cycle for the patches to make the next release. Fingers crossed.
Patches 1-5 (i.e. all except DTS) queued to power-supply subsystem.
Applied 6 and 7, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com