Support the Allwinner F1C100s USB stack
Subsystems (5)
cover Support the Allwinner F1C100s USB stack
The Allwinner F1C100s has an MUSB-based USB peripheral. This patch series implements support for it alongside existing Allwinner support code.
This series was originally written by Icenowy Zheng for Linux v4.14. I've rebased and bugfixed that work against mainline and tested it on both the Lichee Nano and my custom hardware.
This resubmit is unchanged from the series I sent a couple weeks ago, although I've expanded the Cc: to the linux-usb list.
George Hilliard (3):
dt-bindings: Add new F1C100s compatible strings for USB
phy: sun4i-usb: add support for the USB PHY on suniv SoC
musb: sunxi: add support for the suniv MUSB controller
Icenowy Zheng (2):
ARM: suniv: add USB-related device nodes
ARM: suniv: f1c100s: enable USB on Lichee Pi Nano
.../phy/allwinner,sun4i-a10-usb-phy.yaml | 1 + .../usb/allwinner,sun4i-a10-musb.yaml | 1 + .../boot/dts/suniv-f1c100s-licheepi-nano.dts | 16 ++++++++++ arch/arm/boot/dts/suniv-f1c100s.dtsi | 29 +++++++++++++++++++ drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++ drivers/usb/musb/sunxi.c | 8 +++-- 6 files changed, 64 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.0
PATCH RESEND 1/5 dt-bindings: Add new F1C100s compatible strings for USB
This chip contains variants of the already-supported peripherals present on other Allwinner parts. Add a new compatible line for them.
--- .../devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 1 + .../devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml | 1 + 2 files changed, 2 insertions(+)
Documentation/devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml +1 -0
@@ -18,6 +18,7 @@ properties: enum: - allwinner,sun4i-a10-usb-phy - allwinner,sun7i-a20-usb-phy + - allwinner,suniv-f1c100s-usb-phy reg: items:
Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml +1 -0
@@ -17,6 +17,7 @@ properties: - const: allwinner,sun6i-a31-musb - const: allwinner,sun8i-a33-musb - const: allwinner,sun8i-h3-musb + - const: allwinner,suniv-f1c100s-musb - items: - enum: - allwinner,sun8i-a83t-musb
Signature · 1 line
2.25.0
Re: [RESEND PATCH 1/5] dt-bindings: Add new F1C100s compatible strings for USB
Quoted 5 lines · George Hilliard
This chip contains variants of the already-supported peripherals present on other Allwinner parts. Add a new compatible line for them.
Signed-off-by George Hilliard <[email protected]>
Quoted 32 lines
--- .../devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 1 + .../devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml | 1 + 2 files changed, 2 insertions(+)Documentation/devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml +1
-0@@ -18,6 +18,7 @@ properties: enum: - allwinner,sun4i-a10-usb-phy - allwinner,sun7i-a20-usb-phy + - allwinner,suniv-f1c100s-usb-phy reg: items:Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml +1
-1@@ -17,6 +17,7 @@ properties: - const: allwinner,sun6i-a31-musb - const: allwinner,sun8i-a33-musb - const: allwinner,sun8i-h3-musb + - const: allwinner,suniv-f1c100s-musb - items: - enum: - allwinner,sun8i-a83t-musb --2.25.0
PATCH RESEND 2/5 phy: sun4i-usb: add support for the USB PHY on suniv SoC
In reply to George HilliardThe suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +11 -0
@@ -98,6 +98,7 @@#define POLL_TIME msecs_to_jiffies(250)enum sun4i_usb_phy_type { + suniv_f1c100s_phy, sun4i_a10_phy, sun6i_a31_phy, sun8i_a33_phy,
@@ -859,6 +860,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return 0 ; } +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = { + .num_phys =1 , + .type = suniv_f1c100s_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; +static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .num_phys =3 , .type = sun4i_a10_phy,
@@ -973,6 +982,8 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { };static const struct of_device_id sun4i_usb_phy_of_match[] = { + { .compatible ="allwinner,suniv-f1c100s-usb-phy" , + .data = &suniv_f1c100s_cfg }, { .compatible ="allwinner,sun4i-a10-usb-phy" , .data = &sun4i_a10_cfg }, { .compatible ="allwinner,sun5i-a13-usb-phy" , .data = &sun5i_a13_cfg }, { .compatible ="allwinner,sun6i-a31-usb-phy" , .data = &sun6i_a31_cfg },
Signature · 1 line
2.25.0
Re: [RESEND PATCH 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC
Quoted 6 lines · George Hilliard
The suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
Signed-off-by Icenowy Zheng <[email protected]>
Not sure why Icenowy's SoB is here. If she was the original author, you are supposed to keep her name as the author.
Quoted 33 lines
Signed-off-by George Hilliard <[email protected]>--- drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/phy/allwinner/phy-sun4i-usb.c +9
-0@@ -98,6 +98,7 @@#define POLL_TIME msecs_to_jiffies(250)enum sun4i_usb_phy_type { + suniv_f1c100s_phy, sun4i_a10_phy, sun6i_a31_phy, sun8i_a33_phy,@@ -859,6 +860,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return 0 ; } +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = { + .num_phys =1 , + .type = suniv_f1c100s_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; +static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .num_phys =3 , .type = sun4i_a10_phy,
drivers/phy/allwinner/phy-sun4i-usb.c static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { · line 987
Quoted 6 lines
drivers/phy/allwinner/phy-sun4i-usb.c +2
-0@@ -973,6 +982,8 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { };static const struct of_device_id sun4i_usb_phy_of_match[] = { + { .compatible ="allwinner,suniv-f1c100s-usb-phy" , + .data = &suniv_f1c100s_cfg }, { .compatible ="allwinner,sun4i-a10-usb-phy" , .data = &sun4i_a10_cfg },
Please use the same style (and ignore checkpatch.pl on this one).
ChenYu
Quoted 5 lines
drivers/phy/allwinner/phy-sun4i-usb.c +0
-1{ .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg }, { .compatible = "allwinner,sun6i-a31-usb-phy", .data = &sun6i_a31_cfg }, --2.25.0
Re: [RESEND PATCH 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC
Quoted 48 lines · Chen-Yu Tsai
Quoted 6 lines · George Hilliard
The suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
Signed-off-by Icenowy Zheng <[email protected]>Not sure why Icenowy's SoB is here. If she was the original author, you are supposed to keep her name as the author.
Quoted 35 lines
Signed-off-by George Hilliard <[email protected]>--- drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/phy/allwinner/phy-sun4i-usb.c +9
-0@@ -98,6 +98,7 @@#define POLL_TIME msecs_to_jiffies(250)enum sun4i_usb_phy_type { + suniv_f1c100s_phy, sun4i_a10_phy, sun6i_a31_phy, sun8i_a33_phy,@@ -859,6 +860,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return 0 ; } +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = { + .num_phys =1 , + .type = suniv_f1c100s_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; +static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .num_phys =3 , .type = sun4i_a10_phy,@@ -973,6 +982,8 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { };
Quoted 11 lines
drivers/phy/allwinner/phy-sun4i-usb.c static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { · line 987
Quoted 4 lines
drivers/phy/allwinner/phy-sun4i-usb.c +2
-0static const struct of_device_id sun4i_usb_phy_of_match[] = { + { .compatible ="allwinner,suniv-f1c100s-usb-phy" , + .data = &suniv_f1c100s_cfg }, { .compatible ="allwinner,sun4i-a10-usb-phy" , .data = &sun4i_a10_cfg },Please use the same style (and ignore checkpatch.pl on this one).
ChenYu
Quoted 2 lines
drivers/phy/allwinner/phy-sun4i-usb.c +0
-0{ .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg }, { .compatible = "allwinner,sun6i-a31-usb-phy", .data = &sun6i_a31_cfg },
Also, please stick to the same ordering in the driver and the bindings.
FWIW, sort places "suniv" after all sun([4-9]|50)i variants.
ChenYu
Quoted 3 lines
Quoted 3 lines
--
2.25.0
Re: [RESEND PATCH 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC
In reply to Chen-Yu TsaiThanks for the review.
Quoted 4 lines · Chen-Yu Tsai
Quoted 1 line · George Hilliard
Quoted 8 lines
Quoted 5 lines
The suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
Signed-off-by Icenowy Zheng <[email protected]>Not sure why Icenowy's SoB is here. If she was the original author, you are supposed to keep her name as the author.
So, I was unclear on the convention here. This patch is based on her patch, but I've modified it and rebased those modifications back into a single change. I'm happy to change the author field - does it need a "Co-authored-by: myself" here?
Quoted 7 lines
drivers/phy/allwinner/phy-sun4i-usb.c static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { · line 987
Quoted 5 lines
static const struct
of_device_idsun4i_usb_phy_of_match[] = {drivers/phy/allwinner/phy-sun4i-usb.c +2
-0+ { .compatible = "allwinner,suniv-f1c100s-usb-phy", + .data = &suniv_f1c100s_cfg }, { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },Please use the same style (and ignore checkpatch.pl on this one).
Very happy to change this, it was bugging me!
George
Re: [RESEND PATCH 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC
Quoted 14 lines · George Hilliard
Thanks for the review.
Quoted 10 lines · Chen-Yu Tsai
Quoted 6 lines · George Hilliard
The suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
Signed-off-by Icenowy Zheng <[email protected]>
Quoted 7 lines
Quoted 2 lines
Not sure why Icenowy's SoB is here. If she was the original author, you are supposed to keep her name as the author.
So, I was unclear on the convention here. This patch is based on her patch, but I've modified it and rebased those modifications back into a single change. I'm happy to change the author field - does it need a "Co-authored-by: myself" here?
I suppose that really depends on how much you changed it. If it were just stylistic changes I'd keep the original author. Also you should list any changes you made to the patch by inserting
[<who>: changed foo and bar]
before your SoB.
As for the Co-authored-by, I haven't really seen it used so I don't really know.
ChenYu
Quoted 11 lines
Quoted 7 lines
drivers/phy/allwinner/phy-sun4i-usb.c static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { · line 987
Quoted 5 lines
static const struct
of_device_idsun4i_usb_phy_of_match[] = {drivers/phy/allwinner/phy-sun4i-usb.c +2
-0+ { .compatible = "allwinner,suniv-f1c100s-usb-phy", + .data = &suniv_f1c100s_cfg }, { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },Please use the same style (and ignore checkpatch.pl on this one).
Very happy to change this, it was bugging me!
George
Re: [RESEND PATCH 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC
Quoted 25 lines · Chen-Yu Tsai
Quoted 14 lines · George Hilliard
Thanks for the review.
Quoted 10 lines · Chen-Yu Tsai
Quoted 6 lines · George Hilliard
The suniv SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
Signed-off-by Icenowy Zheng <[email protected]>Quoted 7 lines
Quoted 2 lines
Not sure why Icenowy's SoB is here. If she was the original author, you are supposed to keep her name as the author.
So, I was unclear on the convention here. This patch is based on her patch, but I've modified it and rebased those modifications back into a single change. I'm happy to change the author field - does it need a "Co-authored-by: myself" here?
Quoted 7 lines
I suppose that really depends on how much you changed it. If it were just stylistic changes I'd keep the original author. Also you should list any changes you made to the patch by inserting
[<who>: changed foo and bar]
before your SoB.
Ok, this makes sense. Thanks. I'll send another series. The few that are stylistic, I believe I retained Icenowy as the author. Where I modified them, I put myself (so people email me, not her, with problems). I'll modify the commit messages like you describe and double check the authorship.
Quoted 2 lines
As for the Co-authored-by, I haven't really seen it used so I don't really know.
Off topic, but I wish Git supported multiple authors natively.
George
PATCH RESEND 3/5 musb: sunxi: add support for the suniv MUSB controller
In reply to George HilliardThe suniv SoC has a MUSB controller like the one in A33, but with a SRAM region to be claimed.
Add support for it.
--- drivers/usb/musb/sunxi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/musb/sunxi.c +6 -2
@@ -714,14 +714,17 @@ static int sunxi_musb_probe(struct platform_device *pdev)INIT_WORK (&glue->work, sunxi_musb_work); glue->host_nb.notifier_call = sunxi_musb_host_notifier; -if (of_device_is_compatible (np,"allwinner,sun4i-a10-musb" )) +if (of_device_is_compatible (np,"allwinner,sun4i-a10-musb" ) || +of_device_is_compatible (np,"allwinner,suniv-f1c100s-musb" )) {set_bit (SUNXI_MUSB_FL_HAS_SRAM , &glue->flags); + }if (of_device_is_compatible (np,"allwinner,sun6i-a31-musb" ))set_bit (SUNXI_MUSB_FL_HAS_RESET , &glue->flags);if (of_device_is_compatible (np,"allwinner,sun8i-a33-musb" ) || -of_device_is_compatible (np,"allwinner,sun8i-h3-musb" )) { +of_device_is_compatible (np,"allwinner,sun8i-h3-musb" ) || +of_device_is_compatible (np,"allwinner,suniv-f1c100s-musb" )) {set_bit (SUNXI_MUSB_FL_HAS_RESET , &glue->flags);set_bit (SUNXI_MUSB_FL_NO_CONFIGDATA , &glue->flags); }
@@ -814,6 +817,7 @@ static int sunxi_musb_remove(struct platform_device *pdev) }static const struct of_device_id sunxi_musb_match[] = { + { .compatible ="allwinner,suniv-f1c100s-musb" , }, { .compatible ="allwinner,sun4i-a10-musb" , }, { .compatible ="allwinner,sun6i-a31-musb" , }, { .compatible ="allwinner,sun8i-a33-musb" , },
Signature · 1 line
2.25.0
Re: [RESEND PATCH 3/5] musb: sunxi: add support for the suniv MUSB controller
Quoted 7 lines · George Hilliard
The suniv SoC has a MUSB controller like the one in A33, but with a SRAM region to be claimed.
Add support for it.
Signed-off-by Icenowy Zheng <[email protected]>
Same thing about the SoB and author.
Quoted 30 lines
Signed-off-by George Hilliard <[email protected]>--- drivers/usb/musb/sunxi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/usb/musb/sunxi.c +5
-2@@ -714,14 +714,17 @@ static int sunxi_musb_probe(struct platform_device *pdev)INIT_WORK (&glue->work, sunxi_musb_work); glue->host_nb.notifier_call = sunxi_musb_host_notifier; -if (of_device_is_compatible (np,"allwinner,sun4i-a10-musb" )) +if (of_device_is_compatible (np,"allwinner,sun4i-a10-musb" ) || +of_device_is_compatible (np,"allwinner,suniv-f1c100s-musb" )) {set_bit (SUNXI_MUSB_FL_HAS_SRAM , &glue->flags); + }if (of_device_is_compatible (np,"allwinner,sun6i-a31-musb" ))set_bit (SUNXI_MUSB_FL_HAS_RESET , &glue->flags);if (of_device_is_compatible (np,"allwinner,sun8i-a33-musb" ) || -of_device_is_compatible (np,"allwinner,sun8i-h3-musb" )) { +of_device_is_compatible (np,"allwinner,sun8i-h3-musb" ) || +of_device_is_compatible (np,"allwinner,suniv-f1c100s-musb" )) {set_bit (SUNXI_MUSB_FL_HAS_RESET , &glue->flags);set_bit (SUNXI_MUSB_FL_NO_CONFIGDATA , &glue->flags); }
drivers/usb/musb/sunxi.c static int sunxi_musb_remove(struct platform_device *pdev) · line 820
Quoted 4 lines
drivers/usb/musb/sunxi.c +1
-0@@ -814,6 +817,7 @@ static int sunxi_musb_remove(struct platform_device *pdev) }static const struct of_device_id sunxi_musb_match[] = { + { .compatible ="allwinner,suniv-f1c100s-musb" , },
And same thing about the ordering.
Once resolved,
Quoted 6 lines
drivers/usb/musb/sunxi.c +0
-1{ .compatible = "allwinner,sun4i-a10-musb", }, { .compatible = "allwinner,sun6i-a31-musb", }, { .compatible = "allwinner,sun8i-a33-musb", }, --2.25.0
PATCH RESEND 4/5 ARM: suniv: add USB-related device nodes
In reply to George HilliardFrom: Icenowy Zheng <[email protected]>
The suniv SoC has a USB OTG controller and a USB PHY like other Allwinner SoCs.
Add their device tree node.
--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
arch/arm/boot/dts/suniv-f1c100s.dtsi +29 -0
@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> + / { #address-cells = <1>; #size-cells = <1>;
@@ -140,5 +143,31 @@ uart2: serial@1c25800 { resets = <&ccu 26>; status = "disabled"; }; + + usb_otg: usb@1c13000 { + compatible = "allwinner,suniv-f1c100s-musb"; + reg = <0x01c13000 0x0400>; + clocks = <&ccu CLK_BUS_OTG>; + resets = <&ccu RST_BUS_OTG>; + interrupts = <26>; + interrupt-names = "mc"; + phys = <&usbphy 0>; + phy-names = "usb"; + extcon = <&usbphy 0>; + allwinner,sram = <&otg_sram 1>; + status = "disabled"; + }; + + usbphy: phy@1c13400 { + compatible = "allwinner,suniv-f1c100s-usb-phy"; + reg = <0x01c13400 0x10>; + reg-names = "phy_ctrl"; + clocks = <&ccu CLK_USB_PHY0>; + clock-names = "usb0_phy"; + resets = <&ccu RST_USB_PHY0>; + reset-names = "usb0_reset"; + #phy-cells = <1>; + status = "disabled"; + }; }; };
Signature · 1 line
2.25.0
PATCH RESEND 5/5 ARM: suniv: f1c100s: enable USB on Lichee Pi Nano
In reply to George HilliardFrom: Icenowy Zheng <[email protected]>
Lichee Pi Nano has a Micro-USB connector, with its D+, D- pins connected to the USB pins of the SoC and ID pin connected to PE2 GPIO.
Enable the USB functionality.
This patch depends on the previous change to the F1C100s device tree.
--- .../arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts +16 -0
@@ -6,6 +6,8 @@ /dts-v1/; #include "suniv-f1c100s.dtsi" +#include <dt-bindings/gpio/gpio.h> + / { model = "Lichee Pi Nano"; compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s";
@@ -19,8 +21,22 @@ chosen { }; }; +&otg_sram { + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pe_pins>; status = "okay"; }; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usbphy { + usb0_id_det-gpio = <&pio 4 2 GPIO_ACTIVE_HIGH>; /* PE2 */ + status = "okay"; +};
Signature · 1 line
2.25.0