Skip to contentSkip to conversation

arm64: dts: rockchip: Engicam PX30.Core changes

PATCH Applied Jagan Teki 2 participants 11 messages Nov 9, 2020 – Nov 30, 2020

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

cover arm64: dts: rockchip: Engicam PX30.Core changes

Series support Engicam PX30.Core SOM changes along with C.TOUCH Open Frame 10.1" board.

All respetive LCD panels are in Mainline already.

thanks,
Jagan.

Jagan Teki (7):
arm64: dts: rockchip: px30-enagicam: Enable USB Host, OTG
arm64: dts: rockchip: px30-engicam-edimm2.2: Enable LVDS panel
dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
arm64: defconfig: Enable ROCKCHIP_LVDS
arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
arm64: defconfig: Enable USB_SERIAL_CP210X

Suniel Mahesh (2):
arm64: dts: rockchip: px30-engicam: Add WiFi support
arm64: dts: rockchip: px30-engicam: Add BT support

 .../devicetree/bindings/arm/rockchip.yaml     |  6 ++
 arch/arm64/boot/dts/rockchip/Makefile         |  1 +
 .../dts/rockchip/px30-engicam-common.dtsi     | 85 +++++++++++++++++++
 .../dts/rockchip/px30-engicam-ctouch2.dtsi    | 22 +++++
 .../dts/rockchip/px30-engicam-edimm2.2.dtsi   | 59 +++++++++++++
 .../px30-engicam-px30-core-ctouch2-of10.dts   | 77 +++++++++++++++++
 .../px30-engicam-px30-core-edimm2.2.dts       | 22 +++++
 .../dts/rockchip/px30-engicam-px30-core.dtsi  |  5 ++
 arch/arm64/configs/defconfig                  |  3 +
 9 files changed, 280 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/9 arm64: dts: rockchip: px30-enagicam: Enable USB Host, OTG

Engicam EDIMM2.2 and C.Touch 2.0 Kits support USB Host and OTG ports.

Add support to enable USB on these kits while mounting px30-core SOM.

---
 .../dts/rockchip/px30-engicam-common.dtsi     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi +24 -0
index bd5bde989e8d..fbbdbb0a40af 100644
@@ -33,7 +33,31 @@ &sdmmc {
 	status = "okay";
 };
 
+&u2phy {
+	status = "okay";
+
+	u2phy_host: host-port {
+		status = "okay";
+	};
+
+	u2phy_otg: otg-port {
+		status = "okay";
+	};
+};
+
 &uart2 {
 	pinctrl-0 = <&uart2m1_xfer>;
 	status = "okay";
 };
+
+&usb20_otg {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 2/9 arm64: dts: rockchip: px30-engicam-edimm2.2: Enable LVDS panel

In reply to Jagan Teki

Engicam PX30.Core EDIMM2.2 developement Kit has on board 10" LVDS panel from yes-optoelectronics.

This patch adds panel enablement nodes on respective dts(i) files.

---
 .../dts/rockchip/px30-engicam-common.dtsi     |  4 ++
 .../dts/rockchip/px30-engicam-edimm2.2.dtsi   | 59 +++++++++++++++++++
 .../dts/rockchip/px30-engicam-px30-core.dtsi  |  5 ++
 3 files changed, 68 insertions(+)
arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi +4 -0
index fbbdbb0a40af..8fdd7ff2fdf9 100644
@@ -25,6 +25,10 @@ &gmac {
 	status = "okay";
 };
 
+&pwm0 {
+	status = "okay";
+};
+
 &sdmmc {
 	cap-sd-highspeed;
 	card-detect-delay = <800>;
arch/arm64/boot/dts/rockchip/px30-engicam-edimm2.2.dtsi +59 -0

62 lines not on this page · raw message

arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi +5 -0
index db22f776c68f..cdacd3483600 100644
@@ -192,6 +192,11 @@ regulator-state-mem {
 				};
 			};
 
+			vcc3v3_lcd: SWITCH_REG1 {
+				regulator-boot-on;
+				regulator-name = "vcc3v3_lcd";
+			};
+
 			vcc5v0_host: SWITCH_REG2 {
 				regulator-name = "vcc5v0_host";
 				regulator-always-on;
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 3/9 dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF

In reply to Jagan Teki

PX30.Core is an EDIMM SOM based on Rockchip PX30 from Engicam.

C.TOUCH 2.0 is a general purpose carrier board with capacitive touch interface support.

10.1" OF is a capacitive touch 10.1" Open Frame panel solutions.

PX30.Core needs to mount on top of C.TOUCH 2.0 carrier with pluged 10.1" OF for creating complete PX30.Core C.TOUCH 2.0 10.1" Open Frame.

Add bindings for it.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +6 -0
index 37fd456170d2..ef4544ad6f82 100644
@@ -76,6 +76,12 @@ properties:
           - const: engicam,px30-core
           - const: rockchip,px30
 
+      - description: Engicam PX30.Core C.TOUCH 2.0 10.1" Open Frame
+        items:
+          - const: engicam,px30-core-ctouch2-of10
+          - const: engicam,px30-core
+          - const: rockchip,px30
+
       - description: Engicam PX30.Core EDIMM2.2 Starter Kit
         items:
           - const: engicam,px30-core-edimm2.2
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 4/9 arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF

In reply to Jagan Teki

dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF

PX30.Core is an EDIMM SOM based on Rockchip PX30 from Engicam.

C.TOUCH 2.0 is a general purpose carrier board with capacitive touch interface support.

10.1" OF is a capacitive touch 10.1" Open Frame panel solutions.

PX30.Core needs to mount on top of C.TOUCH 2.0 carrier with pluged 10.1" OF for creating complete PX30.Core C.TOUCH 2.0 10.1" Open Frame.

Add support for it.

---
 arch/arm64/boot/dts/rockchip/Makefile         |  1 +
 .../px30-engicam-px30-core-ctouch2-of10.dts   | 77 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index 5a53979b7057..1ab55a124a87 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts new file +77 -0

77 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#5 lore raw

PATCH 5/9 arm64: dts: rockchip: px30-engicam: Add WiFi support

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

Engicam PX30 carrier boards like EDIMM2.2 and C.TOUCH2.0 have an onboard Sterling-LWD Wifi/BT chip based on BCM43430 connected on the SDIO bus.

The SDIO power sequnce is connacted with exteernal 32KHz oscillator and it require 3V3 regulator input.

This patch adds WiFi enablement nodes for these respective boards.

---
 .../dts/rockchip/px30-engicam-common.dtsi     | 45 +++++++++++++++++++
 .../dts/rockchip/px30-engicam-ctouch2.dtsi    | 12 +++++
 .../px30-engicam-px30-core-edimm2.2.dts       | 12 +++++
 3 files changed, 69 insertions(+)
arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi +45 -0
index 8fdd7ff2fdf9..92681ccf50f1 100644
@@ -14,6 +14,51 @@ vcc5v0_sys: vcc5v0-sys {
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 	};
+
+	xin32k: xin32k {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
+		clock-output-names = "xin32k";
+	};
+
+	vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_rf_aux_mod";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	sdio_pwrseq: sdio-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&xin32k>;
+		clock-names = "ext_clock";
+		post-power-on-delay-ms = <80>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_enable_h>;
+	};
+};
+
+&sdio {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	bus-width = <4>;
+	clock-frequency = <50000000>;
+	cap-sdio-irq;
+	cap-sd-highspeed;
+	keep-power-in-suspend;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	sd-uhs-sdr104;
+	status = "okay";
+
+	brcmf: wifi@1 {
+		compatible = "brcm,bcm4329-fmac";
+		reg = <1>;
+	};
 };
 
 &gmac {
arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi +12 -0
index 58425b1e559f..d5708779c285 100644
@@ -6,3 +6,15 @@
  */
 
 #include "px30-engicam-common.dtsi"
+
+&pinctrl {
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&sdio_pwrseq {
+	reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+};
arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts +12 -0
index e54d1e480daa..913444548b59 100644
@@ -19,3 +19,15 @@ chosen {
 		stdout-path = "serial2:115200n8";
 	};
 };
+
+&pinctrl {
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins = <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&sdio_pwrseq {
+	reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;
+};
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH 6/9 arm64: dts: rockchip: px30-engicam: Add BT support

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

Engicam PX30 carrier boards like EDIMM2.2 and C.TOUCH2.0 have an onboard Sterling-LWD Wifi/BT chip based on BCM43430 connected on the UART bus.

UART bus on the design routed via USB to UART CP20x bridge. This bridge powered from 3V3 regualtor gpio.

This patch adds BT enablement nodes for these respective boards.

---
 .../arm64/boot/dts/rockchip/px30-engicam-common.dtsi | 12 ++++++++++++
 .../boot/dts/rockchip/px30-engicam-ctouch2.dtsi      | 10 ++++++++++
 .../dts/rockchip/px30-engicam-px30-core-edimm2.2.dts | 10 ++++++++++
 3 files changed, 32 insertions(+)
arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi +12 -0
index 92681ccf50f1..eb2be7893863 100644
@@ -40,6 +40,18 @@ sdio_pwrseq: sdio-pwrseq {
 		pinctrl-names = "default";
 		pinctrl-0 = <&wifi_enable_h>;
 	};
+
+	vcc3v3_btreg: vcc3v3-btreg {
+		compatible = "regulator-gpio";
+		enable-active-high;
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_enable_h>;
+		regulator-name = "btreg-gpio-supply";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		states = <3300000 0x0>;
+	};
 };
 
 &sdio {
arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi +10 -0
index d5708779c285..bf10a3d29fca 100644
@@ -8,6 +8,12 @@
 #include "px30-engicam-common.dtsi"
 
 &pinctrl {
+	bt {
+		bt_enable_h: bt-enable-h {
+			rockchip,pins = <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -18,3 +24,7 @@ wifi_enable_h: wifi-enable-h {
 &sdio_pwrseq {
 	reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
 };
+
+&vcc3v3_btreg {
+	enable-gpio = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;
+};
arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts +10 -0
index 913444548b59..d759478e1c84 100644
@@ -21,6 +21,12 @@ chosen {
 };
 
 &pinctrl {
+	bt {
+		bt_enable_h: bt-enable-h {
+			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins = <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -31,3 +37,7 @@ wifi_enable_h: wifi-enable-h {
 &sdio_pwrseq {
 	reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;
 };
+
+&vcc3v3_btreg {
+	enable-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
+};
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH 7/9 arm64: defconfig: Enable ROCKCHIP_LVDS

In reply to Jagan Teki

Now, some of the rockchip hardware platforms do enable lvds in mainline tree.

So, enable Rockchip LVDS driver via default defconfig.

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index a17d84ad517a..947e14d6ecae 100644
@@ -646,6 +646,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
 CONFIG_DRM_RCAR_DU=m
 CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_SUN4I=m
Signature · 1 line
2.25.1
author
#8 lore raw

PATCH 8/9 arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY

In reply to Jagan Teki

In order to work LDVS, DSI in mainline tree for Rockchip based hardware platforms, the associated PHY driver has to enable in default defconfig.

Enable rockchip DSI phy driver.

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index 947e14d6ecae..8d205f0a3a0a 100644
@@ -1018,6 +1018,7 @@ CONFIG_PHY_RCAR_GEN3_USB3=m
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PHY_UNIPHIER_USB2=y
Signature · 1 line
2.25.1
author
#9 lore raw

PATCH 9/9 arm64: defconfig: Enable USB_SERIAL_CP210X

In reply to Jagan Teki

Some hardware platforms required CP20x USB to Serial converter in order to work onboard functionalities like Bluetooth.

An example of such a platform is from Engicam's PX30 (ARM64).

Mark it as module in defconfig.

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index 8d205f0a3a0a..14bed4a41bf0 100644
@@ -758,6 +758,7 @@ CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_HSIC_USB3503=y
 CONFIG_NOP_USB_XCEIV=y
Signature · 1 line
2.25.1
maintainer Applied
#10 lore raw
In reply to Jagan Teki
Quoted 9 lines · Jagan Teki

Series support Engicam PX30.Core SOM changes along with C.TOUCH Open Frame 10.1" board.

All respetive LCD panels are in Mainline already.

thanks,
Jagan.

[...]

Applied, thanks!

[1/9] arm64: dts: rockchip: px30-enagicam: Enable USB Host, OTG

      commit: 4548ea027c900f1e0f07a292b8e10dc3d2725f44
[2/9] arm64: dts: rockchip: px30-engicam-edimm2.2: Enable LVDS panel
      commit: 87761edeb2cd90b8251f269eb52c4b48152aace8
[3/9] dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
      commit: 23708d46101b5d5538c88b84b764d0ed9d8957ca
[4/9] arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
      commit: 0e418423be1c824b2cda37fd00528f62231cd219
[5/9] arm64: dts: rockchip: px30-engicam: Add WiFi support
      commit: 93a4e7d12468b0ab46796f3ed8dc5838dc7f63bc
[6/9] arm64: dts: rockchip: px30-engicam: Add BT support
      commit: 1cc1e851d15b4ebd4c6c5f741cfdb58b988a4445
[7/9] arm64: defconfig: Enable ROCKCHIP_LVDS
      commit: dbb378a59cb2bdb01454098513d9b61355fbe377
[8/9] arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
      commit: ec68a66395d9ccedc9b2b2f6452edfd7cb0fdfd5
[9/9] arm64: defconfig: Enable USB_SERIAL_CP210X
      commit: cf35bff64f79b4ca8785766d67b608b76404d43f

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip