arm64: dts: rockchip: px30: Linux-5.14-rc3 Sync
Subsystems (3)
cover arm64: dts: rockchip: px30: Linux-5.14-rc3 Sync
Series sync Linux-5.14-rc3 devicetree files for px30 SoC.
Any inputs?
Jagan.
Jagan Teki (4):
arm64: dts: rockchip: px30: Sync Linux PX30.Core files
arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi
arm64: dts: rockchip: px30: Sync Linux-5.14-rc3 dts(i)
engicam: px30: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
arch/arm/dts/Makefile | 5 +-
arch/arm/dts/px30-engicam-common.dtsi | 90 +++++++
arch/arm/dts/px30-engicam-ctouch2.dtsi | 22 ++
arch/arm/dts/px30-engicam-edimm2.2.dtsi | 59 +++++
.../px30-engicam-px30-core-ctouch2-of10.dts | 77 ++++++
...dts => px30-engicam-px30-core-ctouch2.dts} | 4 +-
.../dts/px30-engicam-px30-core-edimm2.2.dts | 43 ++++
arch/arm/dts/px30-engicam-px30-core.dtsi | 241 ++++++++++++++++++
arch/arm/dts/px30-evb.dts | 91 +++++--
arch/arm/dts/px30-px30-core-edimm2.2.dts | 21 --
arch/arm/dts/px30-u-boot.dtsi | 10 +-
arch/arm/dts/px30.dtsi | 183 ++++++++-----
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 +-
arch/arm/mach-rockchip/px30/Kconfig | 8 +
board/engicam/px30_core/MAINTAINERS | 6 +
configs/px30-core-ctouch2-of10-px30_defconfig | 107 ++++++++
configs/px30-core-ctouch2-px30_defconfig | 4 +-
configs/px30-core-edimm2.2-px30_defconfig | 4 +-
18 files changed, 861 insertions(+), 124 deletions(-)
create mode 100644 arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts
rename arch/arm/dts/{px30-px30-core-ctouch2.dts => px30-engicam-px30-core-ctouch2.dts} (80%)
create mode 100644 arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts
create mode 100644 arch/arm/dts/px30-engicam-px30-core.dtsi
delete mode 100644 arch/arm/dts/px30-px30-core-edimm2.2.dts
create mode 100644 configs/px30-core-ctouch2-of10-px30_defconfigSignature · 1 line
2.25.1
PATCH 1/4 arm64: dts: rockchip: px30: Sync Linux PX30.Core files
Engicam PX30.Core SoM and it's associated Carrier board device tree files are different than the one it present in U-Boot.
Let's Sync the same from Linux-5.14-rc3 with removal of unneeded nodes to satisfy the build.
---
arch/arm/dts/Makefile | 4 +-
...dts => px30-engicam-px30-core-ctouch2.dts} | 4 +-
...ts => px30-engicam-px30-core-edimm2.2.dts} | 4 +-
arch/arm/dts/px30-engicam-px30-core.dtsi | 241 ++++++++++++++++++
configs/px30-core-ctouch2-px30_defconfig | 4 +-
configs/px30-core-edimm2.2-px30_defconfig | 4 +-
6 files changed, 251 insertions(+), 10 deletions(-)
rename arch/arm/dts/{px30-px30-core-ctouch2.dts => px30-engicam-px30-core-ctouch2.dts} (80%)
rename arch/arm/dts/{px30-px30-core-edimm2.2.dts => px30-engicam-px30-core-edimm2.2.dts} (79%)
create mode 100644 arch/arm/dts/px30-engicam-px30-core.dtsiarch/arm/dts/Makefile +2 -2
@@ -71,8 +71,8 @@ dtb-$(CONFIG_MACH_S700) += \ dtb-$(CONFIG_ROCKCHIP_PX30) += \ px30-evb.dtb \ px30-firefly.dtb \ - px30-px30-core-ctouch2.dtb \ - px30-px30-core-edimm2.2.dtb \ + px30-engicam-px30-core-ctouch2.dtb \ + px30-engicam-px30-core-edimm2.2.dtb \ rk3326-odroid-go2.dtb dtb-$(CONFIG_ROCKCHIP_RK3036) += \
arch/arm/dts/px30-engicam-px30-core-ctouch2.dts renamed from arch/arm/dts/px30-px30-core-ctouch2.dts +2 -2
@@ -9,11 +9,11 @@ /dts-v1/; #include "px30.dtsi" #include "px30-engicam-ctouch2.dtsi" -#include "px30-px30-core.dtsi" +#include "px30-engicam-px30-core.dtsi" / { model = "Engicam PX30.Core C.TOUCH 2.0"; - compatible = "engicam,px30-core-ctouch2", "engicam,px30-px30-core", + compatible = "engicam,px30-core-ctouch2", "engicam,px30-core", "rockchip,px30"; chosen {
arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts renamed from arch/arm/dts/px30-px30-core-edimm2.2.dts +2 -2
@@ -8,11 +8,11 @@ /dts-v1/; #include "px30.dtsi" #include "px30-engicam-edimm2.2.dtsi" -#include "px30-px30-core.dtsi" +#include "px30-engicam-px30-core.dtsi" / { model = "Engicam PX30.Core EDIMM2.2 Starter Kit"; - compatible = "engicam,px30-core-edimm2.2", "engicam,px30-px30-core", + compatible = "engicam,px30-core-edimm2.2", "engicam,px30-core", "rockchip,px30"; chosen {
arch/arm/dts/px30-engicam-px30-core.dtsi new file +241 -0
241 lines not on this page · raw message
configs/px30-core-ctouch2-px30_defconfig +2 -2
@@ -5,7 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_DEFAULT_DEVICE_TREE="px30-px30-core-ctouch2" +CONFIG_DEFAULT_DEVICE_TREE="px30-engicam-px30-core-ctouch2" CONFIG_SPL_TEXT_BASE=0x00000000 CONFIG_ROCKCHIP_PX30=y CONFIG_TARGET_PX30_CORE=y
@@ -21,7 +21,7 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x600 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_DEFAULT_FDT_FILE="rockchip/px30-px30-core-ctouch2.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/px30-engicam-px30-core-ctouch2.dtb" # CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/px30-core-edimm2.2-px30_defconfig +2 -2
@@ -5,7 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_DEFAULT_DEVICE_TREE="px30-px30-core-edimm2.2" +CONFIG_DEFAULT_DEVICE_TREE="px30-engicam-px30-core-edimm2.2" CONFIG_SPL_TEXT_BASE=0x00000000 CONFIG_ROCKCHIP_PX30=y CONFIG_TARGET_PX30_CORE=y
@@ -21,7 +21,7 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x600 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_DEFAULT_FDT_FILE="rockchip/px30-px30-core-edimm2.2.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/px30-engicam-px30-core-edimm2.2.dtb" # CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y
Signature · 1 line
2.25.1
PATCH 2/4 arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi
In reply to Jagan Tekidmc node is specific to U-Boot, it is always better practice to maintain U-Boot specific nodes into -u-boot.dtsi files in order to maintain Linux dts file sync compatibility.
Move the dmc into px30-u-boot.dtsi, also add dmc node explicitly in rk3326-odroid-go2-u-boot.dtsi since it is using px30.dts.
--- arch/arm/dts/px30-u-boot.dtsi | 10 ++++++---- arch/arm/dts/px30.dtsi | 5 ----- arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 ++++++---- 3 files changed, 12 insertions(+), 13 deletions(-)
arch/arm/dts/px30-u-boot.dtsi +6 -4
@@ -13,6 +13,12 @@ u-boot,spl-boot-order = &emmc, &sdmmc; }; + dmc { + u-boot,dm-pre-reloc; + compatible = "rockchip,px30-dmc", "syscon"; + reg = <0x0 0xff2a0000 0x0 0x1000>; + }; + rng: rng@ff0b0000 { compatible = "rockchip,cryptov2-rng"; reg = <0x0 0xff0b0000 0x0 0x4000>;
@@ -20,10 +26,6 @@ }; }; -&dmc { - u-boot,dm-pre-reloc; -}; - &uart2 { clock-frequency = <24000000>; u-boot,dm-pre-reloc;
arch/arm/dts/px30.dtsi +0 -5
@@ -151,11 +151,6 @@ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; }; - dmc: dmc { - compatible = "rockchip,px30-dmc", "syscon"; - reg = <0x0 0xff2a0000 0x0 0x1000>; - }; - display_subsystem: display-subsystem { compatible = "rockchip,display-subsystem"; ports = <&vopb_out>, <&vopl_out>;
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi +6 -4
@@ -7,13 +7,15 @@ chosen { u-boot,spl-boot-order = &sdmmc; }; -}; -&cru { - u-boot,dm-pre-reloc; + dmc { + u-boot,dm-pre-reloc; + compatible = "rockchip,px30-dmc", "syscon"; + reg = <0x0 0xff2a0000 0x0 0x1000>; + }; }; -&dmc { +&cru { u-boot,dm-pre-reloc; };
Signature · 1 line
2.25.1
PATCH 3/4 arm64: dts: rockchip: px30: Sync Linux-5.14-rc3 dts(i)
In reply to Jagan TekiSync the px30 devicetree files from Linux-5.14-rc3.
--- arch/arm/dts/px30-engicam-common.dtsi | 90 +++++++++ arch/arm/dts/px30-engicam-ctouch2.dtsi | 22 +++ arch/arm/dts/px30-engicam-edimm2.2.dtsi | 59 ++++++ .../px30-engicam-px30-core-ctouch2-of10.dts | 77 ++++++++ .../dts/px30-engicam-px30-core-edimm2.2.dts | 22 +++ arch/arm/dts/px30-evb.dts | 91 +++++++-- arch/arm/dts/px30.dtsi | 178 +++++++++++------- 7 files changed, 457 insertions(+), 82 deletions(-) create mode 100644 arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts
arch/arm/dts/px30-engicam-common.dtsi +90 -0
@@ -6,6 +6,11 @@ */ / { + aliases { + mmc1 = &sdmmc; + mmc2 = &sdio; + }; + vcc5v0_sys: vcc5v0-sys { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; /* +5V */
@@ -14,6 +19,63 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; + + 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>; + }; + + 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>; + }; + + 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>; + }; + + xin32k: xin32k { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + }; +}; + +&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 {
@@ -25,6 +87,10 @@ status = "okay"; }; +&pwm0 { + status = "okay"; +}; + &sdmmc { cap-sd-highspeed; card-detect-delay = <800>;
@@ -33,7 +99,31 @@ 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"; +};
arch/arm/dts/px30-engicam-ctouch2.dtsi +22 -0
@@ -6,3 +6,25 @@ */ #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>; + }; + }; +}; + +&sdio_pwrseq { + reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; +}; + +&vcc3v3_btreg { + enable-gpio = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>; +};
arch/arm/dts/px30-engicam-edimm2.2.dtsi +59 -0
62 lines not on this page · raw message
arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts new file +77 -0
77 lines not on this page · raw message
arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts +22 -0
@@ -19,3 +19,25 @@ stdout-path = "serial2:115200n8"; }; }; + +&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>; + }; + }; +}; + +&sdio_pwrseq { + reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; +}; + +&vcc3v3_btreg { + enable-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; +};
arch/arm/dts/px30-evb.dts +72 -19
151 lines not on this page · raw message
arch/arm/dts/px30.dtsi +115 -63
450 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 4/4 engicam: px30: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
In reply to Jagan TekiPX30.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/arm/dts/Makefile | 1 + arch/arm/mach-rockchip/px30/Kconfig | 8 ++ board/engicam/px30_core/MAINTAINERS | 6 + configs/px30-core-ctouch2-of10-px30_defconfig | 107 ++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 configs/px30-core-ctouch2-of10-px30_defconfig
arch/arm/dts/Makefile +1 -0
@@ -72,6 +72,7 @@ dtb-$(CONFIG_ROCKCHIP_PX30) += \ px30-evb.dtb \ px30-firefly.dtb \ px30-engicam-px30-core-ctouch2.dtb \ + px30-engicam-px30-core-ctouch2-of10.dtb \ px30-engicam-px30-core-edimm2.2.dtb \ rk3326-odroid-go2.dtb
arch/arm/mach-rockchip/px30/Kconfig +8 -0
@@ -27,6 +27,14 @@ config TARGET_PX30_CORE * PX30.Core needs to mount on top of CTOUCH2.0 for creating complete PX30.Core C.TOUCH Carrier board. + PX30.Core CTOUCH2-OF10: + * PX30.Core is an EDIMM SOM based on Rockchip PX30 from Engicam. + * CTOUCH2.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. + config ROCKCHIP_BOOT_MODE_REG default 0xff010200
board/engicam/px30_core/MAINTAINERS +6 -0
@@ -4,6 +4,12 @@ M: Suniel Mahesh <[email protected]> S: Maintained F: configs/px30-core-ctouch2-px30_defconfig +PX30-Core-CTOUCH2.0-OF10 +M: Jagan Teki <[email protected]> +M: Suniel Mahesh <[email protected]> +S: Maintained +F: configs/px30-core-ctouch2-of10-px30_defconfig + PX30-Core-EDIMM2.2 M: Jagan Teki <[email protected]> M: Suniel Mahesh <[email protected]>
configs/px30-core-ctouch2-of10-px30_defconfig new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
2.25.1
Hi Kever,
Can you push these changes?
Jagan.
Hi Jagan,
I'm sorry, I think I have miss this patch set, I can't find it in my mailbox, and this also not delegate to me in patchwork for unknown reason.
Who is the original author, and it's possible to send this again?
Thanks,
- Kever
Quoted 7 lines · Jagan Teki
Hi Kever,
Can you push these changes?
Jagan.