Skip to contentSkip to conversation

ARM: suniv: USB and two new boards support

PATCH Applied Andre Przywara 2 participants 9 messages Mar 19, 2023 – Mar 23, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 cover ARM: suniv: USB and two new boards support

Hi,

This patchset introduces support for F1C100s' USB, and the SourceParts PopStick and Lctech Pi boards.

These are the remaining (DT) patches, all driver and devicetree binding patches for USB related devices, which were part of former versions of this series, have now been merged (into v6.3-rc1).
What's left are just the DT bits: for the SoC .dtsi and LicheePi Nano board .dts files. On top go patches that add support for two new boards.

There were no actual changes to the patches, they are merely resend, with the vendor and DT board name binding patches combined for the two boards. All prerequisites are in the tree, so the tooling checks pass.

Cheers,
Andre

Changelog v5 ... v6:
- Drop all driver and USB DT binding patches (already merged separately)
- based on v6.3-rc2

Changelog v4 ... v5:
- Rebase on top to v6.2-rc1

Changelog v3 ... v4:
- Dropped the PHY patches, they go via a different tree and need a different base
- rebased on top of linux-sunxi/sunxi/for-next (provides H616 USB)
- musb DT binding: use enum
- musb cleanup: use musb_hdrc_config config pointer directly
- musb cleanup: use const where possible
- drop partitions from Popstick DTS file
- clarify Popstick has a USB type-A *plug*
- add tags

Changelog v2 ... v3:
- remove redundant "Device Tree Bindings" suffix in DT binding doc title
- add BSD license to binding doc file (as per checkpatch)
- fix some commit message title prefixes
- use proper plural spelling for usb0_id_det-gpios
- popstick.dts: Reorder otg_sram node reference alphabetically
- popstick.dts: Add regulator- prefix to 3.3V regulator node name
- popstick.dts: Fix status, compatible and reg property order
- popstick.dts: Drop unneeded mmc0 and spi0 aliases
- add patch to clean up sunxi MUSB driver
- add Acks and Reviewed-by's

Changelog v1 ... v2:
- USB PHY binding: clarify the relation with other phy-sun4i-usb bindings
- Add Popstick binding and .dts patches

Andre Przywara (1):
ARM: dts: suniv: Add Lctech Pi F1C200s devicetree

Icenowy Zheng (5):
ARM: dts: suniv: add USB-related device nodes
ARM: dts: suniv: licheepi-nano: enable USB
dt-bindings: vendor-prefixes: add Source Parts and Lctech names
dt-binding: arm: sunxi: add two board compatible strings
ARM: dts: suniv: add device tree for PopStick v1.1

 .../devicetree/bindings/arm/sunxi.yaml        | 13 +++
 .../devicetree/bindings/vendor-prefixes.yaml  |  4 +
 arch/arm/boot/dts/Makefile                    |  4 +-
 .../boot/dts/suniv-f1c100s-licheepi-nano.dts  | 16 ++++
 arch/arm/boot/dts/suniv-f1c100s.dtsi          | 32 ++++++++
 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts | 76 +++++++++++++++++
 .../boot/dts/suniv-f1c200s-popstick-v1.1.dts  | 81 +++++++++++++++++++
 7 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts
Signature · 1 line
2.35.7
#1 lore raw

PATCH v6 1/6 ARM: dts: suniv: add USB-related device nodes

From: 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 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
arch/arm/boot/dts/suniv-f1c100s.dtsi +26 -0
index 9455d27e516ee..111f8bbc2a805 100644
@@ -133,6 +133,32 @@ mmc1: mmc@1c10000 {
 			#size-cells = <0>;
 		};
 
+		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";
+		};
+
 		ccu: clock@1c20000 {
 			compatible = "allwinner,suniv-f1c100s-ccu";
 			reg = <0x01c20000 0x400>;
Signature · 1 line
2.35.7
#2 lore raw

PATCH v6 2/6 ARM: dts: suniv: licheepi-nano: enable USB

In reply to Andre Przywara

From: 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.

---
 .../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
index 04e59b8381cb8..43896723a994c 100644
@@ -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";
@@ -50,8 +52,22 @@ flash@0 {
 	};
 };
 
+&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-gpios = <&pio 4 2 GPIO_ACTIVE_HIGH>; /* PE2 */
+	status = "okay";
+};
Signature · 1 line
2.35.7
#3 lore raw

PATCH v6 3/6 dt-bindings: vendor-prefixes: add Source Parts and Lctech names

In reply to Andre Przywara

From: Icenowy Zheng <[email protected]>

Source Parts Inc. [1] is a company that makes a series of SBCs, SoMs, etc under a brand called Popcorn Computer [2].
Shenzen LC Technology [3] makes various boards and related products around IoT and AI technology. They used the "Cherry Pi" brand name before.

Add both companies' names to the vendor prefixes list.

[1] https://source.parts/
[2] https://popcorncomputer.com/
[3] http://www.chinalctech.com

---
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +4 -0
index ed64e06ecca49..fbe837c6798aa 100644
@@ -721,6 +721,8 @@ patternProperties:
     description: Lantiq Semiconductor
   "^lattice,.*":
     description: Lattice Semiconductor
+  "^lctech,.*":
+    description: Shenzen LC Technology Co., Ltd.
   "^leadtek,.*":
     description: Shenzhen Leadtek Technology Co., Ltd.
   "^leez,.*":
@@ -1243,6 +1245,8 @@ patternProperties:
     description: Solomon Systech Limited
   "^sony,.*":
     description: Sony Corporation
+  "^sourceparts,.*":
+    description: Source Parts Inc.
   "^spansion,.*":
     description: Spansion Inc.
   "^sparkfun,.*":
Signature · 1 line
2.35.7
#4 lore raw

PATCH v6 4/6 dt-binding: arm: sunxi: add two board compatible strings

In reply to Andre Przywara

From: Icenowy Zheng <[email protected]>

The SourceParts PopStick is a F1C200s-based stick-shaped SBC. The publicly released version is actually v1.1.
The Lctech Pi F1C200s is a small development board using the Allwinner F1C200s SoC.

Add the compatible string lists to the bindings documentation.

---
 Documentation/devicetree/bindings/arm/sunxi.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
Documentation/devicetree/bindings/arm/sunxi.yaml +13 -0
index 3ad1cd50e3fe0..cbdfc1c247a2b 100644
@@ -366,6 +366,12 @@ properties:
           - const: lamobo,lamobo-r1
           - const: allwinner,sun7i-a20
 
+      - description: Lctech Pi F1C200s
+        items:
+          - const: lctech,pi-f1c200s
+          - const: allwinner,suniv-f1c200s
+          - const: allwinner,suniv-f1c100s
+
       - description: Libre Computer Board ALL-H3-CC H2+
         items:
           - const: libretech,all-h3-cc-h2-plus
@@ -807,6 +813,13 @@ properties:
           - const: sinlinx,sina33
           - const: allwinner,sun8i-a33
 
+      - description: SourceParts PopStick v1.1
+        items:
+          - const: sourceparts,popstick-v1.1
+          - const: sourceparts,popstick
+          - const: allwinner,suniv-f1c200s
+          - const: allwinner,suniv-f1c100s
+
       - description: SL631 Action Camera with IMX179
         items:
           - const: allwinner,sl631-imx179
Signature · 1 line
2.35.7
#5 lore raw

PATCH v6 5/6 ARM: dts: suniv: add device tree for PopStick v1.1

In reply to Andre Przywara

From: Icenowy Zheng <[email protected]>

PopStick is a minimal Allwinner F1C200s dongle, with its USB controller wired to a USB Type-A plug, a SD slot and a SPI NAND flash on board, and an on-board CH340 USB-UART converted connected to F1C200s's UART0.

Add a device tree for it. As F1C200s is just F1C100s with a different DRAM chip co-packaged, directly use F1C100s DTSI here.

This commit covers the v1.1 version of this board, which is now shipped. v1.0 is some internal sample that have not been shipped at all.

---
 arch/arm/boot/dts/Makefile                    |  3 +-
 .../boot/dts/suniv-f1c200s-popstick-v1.1.dts  | 81 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts
arch/arm/boot/dts/Makefile +2 -1
index efe4152e5846d..3b97d7c1e3c28 100644
@@ -1406,7 +1406,8 @@ dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-optimus.dtb \
 	sun9i-a80-cubieboard4.dtb
 dtb-$(CONFIG_MACH_SUNIV) += \
-	suniv-f1c100s-licheepi-nano.dtb
+	suniv-f1c100s-licheepi-nano.dtb \
+	suniv-f1c200s-popstick-v1.1.dtb
 dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
 	tegra20-acer-a500-picasso.dtb \
 	tegra20-asus-tf101.dtb \
arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts new file +81 -0

81 lines not on this page · raw message

Signature · 1 line
2.35.7
maintainer Acked-by on v6 5/6
#6 lore raw

Re: [PATCH v6 5/6] ARM: dts: suniv: add device tree for PopStick v1.1

Dne nedelja, 19. marec 2023 ob 22:29:35 CET je Andre Przywara napisal(a):

Quoted 6 lines

From: Icenowy Zheng <[email protected]>

PopStick is a minimal Allwinner F1C200s dongle, with its USB controller wired to a USB Type-A plug, a SD slot and a SPI NAND flash on board, and an on-board CH340 USB-UART converted connected to F1C200s's UART0.

Quoted 8 lines

Add a device tree for it. As F1C200s is just F1C100s with a different DRAM chip co-packaged, directly use F1C100s DTSI here.

This commit covers the v1.1 version of this board, which is now shipped. v1.0 is some internal sample that have not been shipped at all.

Best regards,
Jernej

#7 lore raw

PATCH v6 6/6 ARM: dts: suniv: Add Lctech Pi F1C200s devicetree

In reply to Andre Przywara

The Lctech Pi F1C200s (also previously known under the Cherry Pi brand) is a small development board with the Allwinner F1C200s SoC. This is the same as the F1C100s, but with 64MB instead of 32MB co-packaged DRAM.

Alongside the obligatory micro-SD card slot, the board features a SPI-NAND flash chip, LCD and touch connectors, and unpopulated expansion header pins.
There are two USB Type-C ports on the board: One supplies the power, also connects to the USB MUSB OTG controller port. The other one is connected to an CH340 USB serial chip, which in turn is connected to UART1.

Add a devicetree file, so that the board can be used easily.

---
 arch/arm/boot/dts/Makefile                    |  1 +
 arch/arm/boot/dts/suniv-f1c100s.dtsi          |  6 ++
 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts | 76 +++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts
arch/arm/boot/dts/Makefile +1 -0
index 3b97d7c1e3c28..a627d5593e51b 100644
@@ -1407,6 +1407,7 @@ dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-cubieboard4.dtb
 dtb-$(CONFIG_MACH_SUNIV) += \
 	suniv-f1c100s-licheepi-nano.dtb \
+	suniv-f1c200s-lctech-pi.dtb \
 	suniv-f1c200s-popstick-v1.1.dtb
 dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
 	tegra20-acer-a500-picasso.dtb \
arch/arm/boot/dts/suniv-f1c100s.dtsi +6 -0
index 111f8bbc2a805..3c61d59ab5f86 100644
@@ -207,6 +207,12 @@ uart0_pe_pins: uart0-pe-pins {
 				pins = "PE0", "PE1";
 				function = "uart0";
 			};
+
+			/omit-if-no-ref/
+			uart1_pa_pins: uart1-pa-pins {
+				pins = "PA2", "PA3";
+				function = "uart1";
+			};
 		};
 
 		i2c0: i2c@1c27000 {
arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
2.35.7
maintainer Applied
#8 lore raw
In reply to Andre Przywara

Dne nedelja, 19. marec 2023 ob 22:29:30 CET je Andre Przywara napisal(a):

Quoted 63 lines

Hi,

This patchset introduces support for F1C100s' USB, and the SourceParts PopStick and Lctech Pi boards.

These are the remaining (DT) patches, all driver and devicetree binding patches for USB related devices, which were part of former versions of this series, have now been merged (into v6.3-rc1).
What's left are just the DT bits: for the SoC .dtsi and LicheePi Nano board .dts files. On top go patches that add support for two new boards.

There were no actual changes to the patches, they are merely resend, with the vendor and DT board name binding patches combined for the two boards. All prerequisites are in the tree, so the tooling checks pass.

Cheers,
Andre

Changelog v5 ... v6:
- Drop all driver and USB DT binding patches (already merged separately)
- based on v6.3-rc2

Changelog v4 ... v5:
- Rebase on top to v6.2-rc1

Changelog v3 ... v4:
- Dropped the PHY patches, they go via a different tree and need a different base
- rebased on top of linux-sunxi/sunxi/for-next (provides H616 USB)
- musb DT binding: use enum
- musb cleanup: use musb_hdrc_config config pointer directly
- musb cleanup: use const where possible
- drop partitions from Popstick DTS file
- clarify Popstick has a USB type-A *plug*
- add tags

Changelog v2 ... v3:
- remove redundant "Device Tree Bindings" suffix in DT binding doc title
- add BSD license to binding doc file (as per checkpatch)
- fix some commit message title prefixes
- use proper plural spelling for usb0_id_det-gpios
- popstick.dts: Reorder otg_sram node reference alphabetically
- popstick.dts: Add regulator- prefix to 3.3V regulator node name
- popstick.dts: Fix status, compatible and reg property order
- popstick.dts: Drop unneeded mmc0 and spi0 aliases
- add patch to clean up sunxi MUSB driver
- add Acks and Reviewed-by's

Changelog v1 ... v2:
- USB PHY binding: clarify the relation with other phy-sun4i-usb bindings
- Add Popstick binding and .dts patches

Andre Przywara (1):
ARM: dts: suniv: Add Lctech Pi F1C200s devicetree

Icenowy Zheng (5):
ARM: dts: suniv: add USB-related device nodes
ARM: dts: suniv: licheepi-nano: enable USB
dt-bindings: vendor-prefixes: add Source Parts and Lctech names
dt-binding: arm: sunxi: add two board compatible strings
ARM: dts: suniv: add device tree for PopStick v1.1

Quoted 10 lines
 .../devicetree/bindings/arm/sunxi.yaml        | 13 +++
 .../devicetree/bindings/vendor-prefixes.yaml  |  4 +
 arch/arm/boot/dts/Makefile                    |  4 +-
 .../boot/dts/suniv-f1c100s-licheepi-nano.dts  | 16 ++++
 arch/arm/boot/dts/suniv-f1c100s.dtsi          | 32 ++++++++
 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts | 76 +++++++++++++++++
 .../boot/dts/suniv-f1c200s-popstick-v1.1.dts  | 81 +++++++++++++++++++
 7 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts
 create mode 100644 arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts

Applied, thanks!

Best regards,
Jernej