[PATCH v2 0/3] Add support for Firefly Core-PX30-JD4 SoM & baseboard

[PATCH v2 0/3] Add support for Firefly Core-PX30-JD4 SoM & baseboard

[Christopher Obbard]

This adds support for the PX30-based Core-PX30-JD4 system-on-module from
Firefly and includes support for the SoM in combination with the
Firefly MB-JD4-PX30 baseboard.

---
Changes in v2:
- Split into two separate files: dtsi for the SoM and dts for the carrier.
- Change devicetree compatible to match SoM/carrier split.
- Change device names to better match vendor's name.
- Properly model baseboard & SoM regulators.
- Properly model baseboard recovery key.
- Remove DSI panel (& related nodes) since "sitronix,st7703" compatible
  is undocumented & hardware is unavailable.
- Remove unused audio-related nodes.
- Remove unused UART nodes.
- Remove unused PMIC pinctrl nodes.
- Add node for baseboard LEDs.
- Link to v1: https://lore.kernel.org/r/20240716-rockchip-px30-firefly-v1-0-60cdad3023a3@collabora.com

---
Christopher Obbard (3):
      dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard
      arm64: dts: rockchip: add Firefly Core-PX30-JD4 SoM
      arm64: dts: rockchip: add Firefly JD4 baseboard with Core-PX30-JD4 SoM

 .../devicetree/bindings/arm/rockchip.yaml          |   6 +
 arch/arm64/boot/dts/rockchip/Makefile              |   1 +
 .../boot/dts/rockchip/px30-firefly-jd4-core.dtsi   | 322 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts  | 178 ++++++++++++
 4 files changed, 507 insertions(+)
---
base-commit: 51835949dda3783d4639cfa74ce13a3c9829de00
change-id: 20240716-rockchip-px30-firefly-59efc93d6784

Best regards,
-- 
Christopher Obbard <chris.obbard@collabora.com>

[PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Christopher Obbard]

Add binding for the Firefly Core-PX30-JD4 SoM when used in conjunction
with the MB-JD4-RK3328 & PX30 baseboard.

Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 1ef09fbfdfaf5..33ca8028bc151 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -148,6 +148,12 @@ properties:
           - const: engicam,px30-core
           - const: rockchip,px30
 
+      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard
+        items:
+          - const: firefly,px30-mb-jd4
+          - const: firefly,px30-core-jd4
+          - const: rockchip,px30
+
       - description: Firefly Firefly-RK3288
         items:
           - enum:

-- 
2.45.2

[PATCH v2 2/3] arm64: dts: rockchip: add Firefly Core-PX30-JD4 SoM

[Christopher Obbard]

The Firefly Core-PX30-JD4 SoM is a 69.6x49.6mm (260 pin SODIMM connector)
system-on-module from Firefly, featuring the Rockchip PX30.

It provides the following feature set:
 * on-module DDR3 (1GB/2GB)
 * on-module eMMC 5.1 (8GB/16GB/32GB/64GB/128GB)
 * on-module NPU (optional)
 * SD card (on a baseboard) via edge connector
 * 100mbps Ethernet (on a baseboard) via edge connector
 * MIPI-DSI (on a baseboard) via edge connector
 * Audio (on a baseboard) via edge connector
   - 1x SPDIF
   - 1x 8-channel I2S/TDM
   - 1x 2-channel I2S/TDM
   - 1x 8-channel PDM
 * USB (on a baseboard) via edge connector
   - 1x USB 2.0 OTG
   - 1x USB 2.0 host
 * Various GPIO (on a baseboard) via edge connector

Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 .../boot/dts/rockchip/px30-firefly-jd4-core.dtsi   | 322 +++++++++++++++++++++
 1 file changed, 322 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
new file mode 100644
index 0000000000000..88d3d77cc0dbe
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
@@ -0,0 +1,322 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "px30.dtsi"
+
+/ {
+	compatible = "firefly,px30-core-jd4", "rockchip,px30";
+
+	emmc_pwrseq: emmc-pwrseq {
+		compatible = "mmc-pwrseq-emmc";
+		pinctrl-0 = <&emmc_reset>;
+		pinctrl-names = "default";
+		reset-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_baseboard>;
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	non-removable;
+	mmc-pwrseq = <&emmc_pwrseq>;
+	vmmc-supply = <&vcc_3v0>;
+	vqmmc-supply = <&vccio_flash>;
+	status = "okay";
+};
+
+&gpu {
+	mali-supply = <&vdd_log>;
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+
+	rk809: pmic@20 {
+		compatible = "rockchip,rk809";
+		reg = <0x20>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int>;
+		rockchip,system-power-controller;
+		wakeup-source;
+		#clock-cells = <0>;
+		clock-output-names = "xin32k";
+
+		vcc1-supply = <&vcc5v0_sys>;
+		vcc2-supply = <&vcc5v0_sys>;
+		vcc3-supply = <&vcc5v0_sys>;
+		vcc4-supply = <&vcc5v0_sys>;
+		vcc5-supply = <&vcc3v3_sys>;
+		vcc6-supply = <&vcc3v3_sys>;
+		vcc7-supply = <&vcc3v3_sys>;
+		vcc8-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc5v0_sys>;
+
+		regulators {
+			vdd_log: DCDC_REG1 {
+				regulator-name = "vdd_log";
+				regulator-min-microvolt = <950000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <950000>;
+				};
+			};
+
+			vdd_arm: DCDC_REG2 {
+				regulator-name = "vdd_arm";
+				regulator-min-microvolt = <950000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <950000>;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_3v0: vcc_rmii: DCDC_REG4 {
+				regulator-name = "vcc_3v0";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3000000>;
+				};
+			};
+
+			vcc3v3_sys: DCDC_REG5 {
+				regulator-name = "vcc3v3_sys";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc_1v0: LDO_REG1 {
+				regulator-name = "vcc_1v0";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc_1v8: vccio_flash: vccio_sdio: LDO_REG2 {
+				regulator-name = "vcc_1v8";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vdd_1v0: LDO_REG3 {
+				regulator-name = "vdd_1v0";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc3v0_pmu: LDO_REG4 {
+				regulator-name = "vcc3v0_pmu";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3000000>;
+				};
+			};
+
+			vccio_sd: LDO_REG5 {
+				regulator-name = "vccio_sd";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc_sd: LDO_REG6 {
+				regulator-name = "vcc_sd";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc2v8_dvp: LDO_REG7 {
+				regulator-name = "vcc2v8_dvp";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <2800000>;
+				};
+			};
+
+			vcc1v8_dvp: LDO_REG8 {
+				regulator-name = "vcc1v8_dvp";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc1v5_dvp: LDO_REG9 {
+				regulator-name = "vcc1v5_dvp";
+				regulator-min-microvolt = <1500000>;
+				regulator-max-microvolt = <1500000>;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <1500000>;
+				};
+			};
+
+			vcc3v3_lcd: SWITCH_REG1 {
+				regulator-name = "vcc3v3_lcd";
+				regulator-boot-on;
+			};
+
+			vcc5v0_host: SWITCH_REG2 {
+				regulator-name = "vcc5v0_host";
+				regulator-always-on;
+				regulator-boot-on;
+			};
+		};
+	};
+};
+
+&io_domains {
+	status = "okay";
+
+	vccio1-supply = <&vccio_sdio>;
+	vccio2-supply = <&vccio_sd>;
+	vccio3-supply = <&vcc_3v0>;
+	vccio4-supply = <&vcc3v0_pmu>;
+	vccio5-supply = <&vcc_3v0>;
+	vccio6-supply = <&vccio_flash>;
+};
+
+&pinctrl {
+	emmc {
+		emmc_reset: emmc-reset {
+			rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pmic {
+		pmic_int: pmic_int {
+			rockchip,pins =
+				<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};
+
+&pmu_io_domains {
+	status = "okay";
+
+	pmuio1-supply = <&vcc3v0_pmu>;
+	pmuio2-supply = <&vcc3v0_pmu>;
+};
+
+&saradc {
+	vref-supply = <&vcc_1v8>;
+	status = "okay";
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <1>;
+	rockchip,hw-tshut-polarity = <1>;
+	status = "okay";
+};

-- 
2.45.2

[PATCH v2 3/3] arm64: dts: rockchip: add Firefly JD4 baseboard with Core-PX30-JD4 SoM

[Christopher Obbard]

The Firefly MB-PX30-JD4 is a baseboard for the Core-PX30-JD4 SoM.

Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 arch/arm64/boot/dts/rockchip/Makefile             |   1 +
 arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts | 178 ++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index fda1b980eb4bc..24e1e5b606876 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -3,6 +3,7 @@ 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) += px30-firefly-jd4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
diff --git a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts
new file mode 100644
index 0000000000000..bb79a7eb9f028
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd
+ */
+
+/dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include "px30-firefly-jd4-core.dtsi"
+
+/ {
+	model = "Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard";
+	compatible = "firefly,px30-mb-jd4", "firefly,px30-core-jd4", "rockchip,px30";
+
+	aliases {
+		ethernet0 = &gmac;
+		mmc0 = &sdmmc;
+		mmc1 = &sdio;
+		mmc2 = &emmc;
+	};
+
+	chosen {
+		stdout-path = "serial2:115200n8";
+	};
+
+	dc_12v: dc-12v-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "dc_12v";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	adc-keys {
+		compatible = "adc-keys";
+		io-channels = <&saradc 2>;
+		io-channel-names = "buttons";
+		keyup-threshold-microvolt = <1500000>;
+		poll-interval = <100>;
+
+		button-recovery {
+			label = "Recovery";
+			linux,code = <KEY_VENDOR>;
+			press-threshold-microvolt = <18000>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&blue_led>, <&green_led>;
+
+		blue-led {
+			color = <LED_COLOR_ID_BLUE>;
+			default-state = "on";
+			function = LED_FUNCTION_HEARTBEAT;
+			gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
+			label = "px30-mb-jd4:blue:work";
+			linux,default-trigger = "heartbeat";
+		};
+
+		green-led {
+			color = <LED_COLOR_ID_GREEN>;
+			default-state = "on";
+			function = LED_FUNCTION_POWER;
+			gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>;
+			label = "px30-mb-jd4:blue:diy";
+			linux,default-trigger = "default-on";
+		};
+	};
+
+	sdio_pwrseq: sdio-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_enable_h>;
+
+		/*
+		 * On the module itself this is one of these (depending
+		 * on the actual card populated):
+		 * - SDIO_RESET_L_WL_REG_ON
+		 * - PDN (power down when low)
+		 */
+		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
+	};
+
+	vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_baseboard";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc_12v>;
+	};
+};
+
+&gmac {
+	clock_in_out = "output";
+	phy-supply = <&vcc_rmii>;
+	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 50000 50000>;
+	status = "okay";
+};
+
+&pinctrl {
+	leds {
+		blue_led: blue-led {
+			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		green_led: green-led {
+			rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins =
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	card-detect-delay = <800>;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	vmmc-supply = <&vcc_sd>;
+	vqmmc-supply = <&vccio_sd>;
+	status = "okay";
+};
+
+&sdio {
+	bus-width = <4>;
+	cap-sd-highspeed;
+	keep-power-in-suspend;
+	non-removable;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	sd-uhs-sdr104;
+	status = "okay";
+};
+
+&u2phy {
+	status = "okay";
+
+	u2phy_host: host-port {
+		status = "okay";
+	};
+
+	u2phy_otg: otg-port {
+		status = "okay";
+	};
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2m1_xfer>;
+	status = "okay";
+};
+
+&usb20_otg {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};

-- 
2.45.2

Re: [PATCH v2 0/3] Add support for Firefly Core-PX30-JD4 SoM & baseboard

[Dragan Simic]

Hello Christopher,

On 2024-07-17 18:46, Christopher Obbard wrote:
> This adds support for the PX30-based Core-PX30-JD4 system-on-module 
> from
> Firefly and includes support for the SoM in combination with the
> Firefly MB-JD4-PX30 baseboard.
> 
> ---
> Changes in v2:
> - Split into two separate files: dtsi for the SoM and dts for the 
> carrier.
> - Change devicetree compatible to match SoM/carrier split.
> - Change device names to better match vendor's name.
> - Properly model baseboard & SoM regulators.
> - Properly model baseboard recovery key.
> - Remove DSI panel (& related nodes) since "sitronix,st7703" compatible
>   is undocumented & hardware is unavailable.
> - Remove unused audio-related nodes.
> - Remove unused UART nodes.
> - Remove unused PMIC pinctrl nodes.
> - Add node for baseboard LEDs.
> - Link to v1:
> https://lore.kernel.org/r/20240716-rockchip-px30-firefly-v1-0-60cdad3023a3@collabora.com

Thanks for the v2.

> ---
> Christopher Obbard (3):
>       dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with 
> baseboard
>       arm64: dts: rockchip: add Firefly Core-PX30-JD4 SoM
>       arm64: dts: rockchip: add Firefly JD4 baseboard with 
> Core-PX30-JD4 SoM
> 
>  .../devicetree/bindings/arm/rockchip.yaml          |   6 +
>  arch/arm64/boot/dts/rockchip/Makefile              |   1 +
>  .../boot/dts/rockchip/px30-firefly-jd4-core.dtsi   | 322 
> +++++++++++++++++++++
>  arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts  | 178 ++++++++++++
>  4 files changed, 507 insertions(+)

It would be better to name the new dts(i) files like this:

- px30-firefly-jd4-core.dtsi
- px30-firefly-jd4-core-mb.dts

This would follow the <SoC>-<brand>-<SoM>-<carrier>.dts pattern, which
is somewhat common and sorts nicely in directory listings when there's
more than one carrier board for the same SoM.

> ---
> base-commit: 51835949dda3783d4639cfa74ce13a3c9829de00
> change-id: 20240716-rockchip-px30-firefly-59efc93d6784
> 
> Best regards,

Re: [PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Dragan Simic]

Hello Christopher,

On 2024-07-17 18:46, Christopher Obbard wrote:
> Add binding for the Firefly Core-PX30-JD4 SoM when used in conjunction
> with the MB-JD4-RK3328 & PX30 baseboard.
> 
> Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> ---
>  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml
> b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 1ef09fbfdfaf5..33ca8028bc151 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -148,6 +148,12 @@ properties:
>            - const: engicam,px30-core
>            - const: rockchip,px30
> 
> +      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard
> +        items:
> +          - const: firefly,px30-mb-jd4
> +          - const: firefly,px30-core-jd4

Similarly to how I suggested the new dts(i) files to be named, [1]
the model names should be named like this:

           - const: firefly,px30-jd4-core
           - const: firefly,px30-jd4-core-mb

This would also follow the "inheritance graph" pattern, so to speak.

[1] 
https://lore.kernel.org/linux-rockchip/38d7b7e9ab71bf1b0817e666f4233b9e@manjaro.org/

> +          - const: rockchip,px30
> +
>        - description: Firefly Firefly-RK3288
>          items:
>            - enum:

Re: [PATCH v2 3/3] arm64: dts: rockchip: add Firefly JD4 baseboard with Core-PX30-JD4 SoM

[Dragan Simic]

Hello Christopher,

On 2024-07-17 18:47, Christopher Obbard wrote:
> The Firefly MB-PX30-JD4 is a baseboard for the Core-PX30-JD4 SoM.
> 
> Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> ---
>  arch/arm64/boot/dts/rockchip/Makefile             |   1 +
>  arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts | 178 
> ++++++++++++++++++++++
>  2 files changed, 179 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/Makefile
> b/arch/arm64/boot/dts/rockchip/Makefile
> index fda1b980eb4bc..24e1e5b606876 100644
> --- a/arch/arm64/boot/dts/rockchip/Makefile
> +++ b/arch/arm64/boot/dts/rockchip/Makefile
> @@ -3,6 +3,7 @@ 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) += px30-firefly-jd4.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
> diff --git a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts
> b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts
> new file mode 100644
> index 0000000000000..bb79a7eb9f028
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4.dts
> @@ -0,0 +1,178 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd
> + */
> +
> +/dts-v1/;
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/leds/common.h>
> +#include "px30-firefly-jd4-core.dtsi"
> +
> +/ {
> +	model = "Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard";

Technically, it's s/with/on/

> +	compatible = "firefly,px30-mb-jd4", "firefly,px30-core-jd4", 
> "rockchip,px30";
> +
> +	aliases {
> +		ethernet0 = &gmac;
> +		mmc0 = &sdmmc;
> +		mmc1 = &sdio;
> +		mmc2 = &emmc;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial2:115200n8";
> +	};
> +
> +	dc_12v: dc-12v-regulator {
> +		compatible = "regulator-fixed";
> +		regulator-name = "dc_12v";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <12000000>;
> +		regulator-max-microvolt = <12000000>;
> +	};
> +
> +	adc-keys {
> +		compatible = "adc-keys";
> +		io-channels = <&saradc 2>;
> +		io-channel-names = "buttons";
> +		keyup-threshold-microvolt = <1500000>;
> +		poll-interval = <100>;
> +
> +		button-recovery {
> +			label = "Recovery";
> +			linux,code = <KEY_VENDOR>;
> +			press-threshold-microvolt = <18000>;
> +		};
> +	};
> +
> +	leds {
> +		compatible = "gpio-leds";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&blue_led>, <&green_led>;
> +
> +		blue-led {
> +			color = <LED_COLOR_ID_BLUE>;
> +			default-state = "on";
> +			function = LED_FUNCTION_HEARTBEAT;
> +			gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
> +			label = "px30-mb-jd4:blue:work";
> +			linux,default-trigger = "heartbeat";
> +		};
> +
> +		green-led {
> +			color = <LED_COLOR_ID_GREEN>;
> +			default-state = "on";
> +			function = LED_FUNCTION_POWER;
> +			gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>;
> +			label = "px30-mb-jd4:blue:diy";
> +			linux,default-trigger = "default-on";
> +		};
> +	};
> +
> +	sdio_pwrseq: sdio-pwrseq {
> +		compatible = "mmc-pwrseq-simple";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&wifi_enable_h>;
> +
> +		/*
> +		 * On the module itself this is one of these (depending
> +		 * on the actual card populated):
> +		 * - SDIO_RESET_L_WL_REG_ON
> +		 * - PDN (power down when low)
> +		 */
> +		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
> +	};
> +
> +	vcc5v0_baseboard: vcc5v0-baseboard-regulator {
> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc5v0_baseboard";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +		vin-supply = <&dc_12v>;
> +	};
> +};
> +
> +&gmac {
> +	clock_in_out = "output";
> +	phy-supply = <&vcc_rmii>;
> +	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
> +	snps,reset-active-low;
> +	snps,reset-delays-us = <0 50000 50000>;
> +	status = "okay";
> +};
> +
> +&pinctrl {
> +	leds {
> +		blue_led: blue-led {
> +			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +
> +		green_led: green-led {
> +			rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +
> +	sdio-pwrseq {
> +		wifi_enable_h: wifi-enable-h {
> +			rockchip,pins =
> +				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +};
> +
> +&sdmmc {
> +	bus-width = <4>;
> +	cap-mmc-highspeed;
> +	cap-sd-highspeed;
> +	card-detect-delay = <800>;
> +	sd-uhs-sdr12;
> +	sd-uhs-sdr25;
> +	sd-uhs-sdr50;
> +	sd-uhs-sdr104;
> +	vmmc-supply = <&vcc_sd>;
> +	vqmmc-supply = <&vccio_sd>;
> +	status = "okay";
> +};
> +
> +&sdio {
> +	bus-width = <4>;
> +	cap-sd-highspeed;
> +	keep-power-in-suspend;
> +	non-removable;
> +	mmc-pwrseq = <&sdio_pwrseq>;
> +	sd-uhs-sdr104;
> +	status = "okay";
> +};
> +
> +&u2phy {
> +	status = "okay";
> +
> +	u2phy_host: host-port {
> +		status = "okay";
> +	};
> +
> +	u2phy_otg: otg-port {
> +		status = "okay";
> +	};
> +};
> +
> +&uart2 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart2m1_xfer>;
> +	status = "okay";
> +};
> +
> +&usb20_otg {
> +	status = "okay";
> +};
> +
> +&usb_host0_ehci {
> +	status = "okay";
> +};
> +
> +&usb_host0_ohci {
> +	status = "okay";
> +};

Re: [PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Christopher Obbard]

Hi Dragan,

Thanks for the review.

On Thu, 2024-07-18 at 06:36 +0200, Dragan Simic wrote:
> Hello Christopher,
> 
> On 2024-07-17 18:46, Christopher Obbard wrote:
> > Add binding for the Firefly Core-PX30-JD4 SoM when used in conjunction
> > with the MB-JD4-RK3328 & PX30 baseboard.
> > 
> > Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> > ---
> >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > index 1ef09fbfdfaf5..33ca8028bc151 100644
> > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > @@ -148,6 +148,12 @@ properties:
> >            - const: engicam,px30-core
> >            - const: rockchip,px30
> > 
> > +      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard
> > +        items:
> > +          - const: firefly,px30-mb-jd4
> > +          - const: firefly,px30-core-jd4
> 
> Similarly to how I suggested the new dts(i) files to be named, [1]
> the model names should be named like this:
> 
>            - const: firefly,px30-jd4-core
>            - const: firefly,px30-jd4-core-mb

I suppose the order should be the other way around to match other entries, e.g
firefly,px30-jd4-core-mb first?

Chris

> 
> This would also follow the "inheritance graph" pattern, so to speak.
> 
> [1] 
> https://lore.kernel.org/linux-rockchip/38d7b7e9ab71bf1b0817e666f4233b9e@manjaro.org/
> 
> > +          - const: rockchip,px30
> > +
> >        - description: Firefly Firefly-RK3288
> >          items:
> >            - enum:

Re: [PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1629 bytes --]

On Thu, Jul 18, 2024 at 09:31:45AM +0100, Christopher Obbard wrote:
> Hi Dragan,
> 
> Thanks for the review.
> 
> On Thu, 2024-07-18 at 06:36 +0200, Dragan Simic wrote:
> > Hello Christopher,
> > 
> > On 2024-07-17 18:46, Christopher Obbard wrote:
> > > Add binding for the Firefly Core-PX30-JD4 SoM when used in conjunction
> > > with the MB-JD4-RK3328 & PX30 baseboard.
> > > 
> > > Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> > > ---
> > >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > > 
> > > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > index 1ef09fbfdfaf5..33ca8028bc151 100644
> > > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > @@ -148,6 +148,12 @@ properties:
> > >            - const: engicam,px30-core
> > >            - const: rockchip,px30
> > > 
> > > +      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard
> > > +        items:
> > > +          - const: firefly,px30-mb-jd4
> > > +          - const: firefly,px30-core-jd4
> > 
> > Similarly to how I suggested the new dts(i) files to be named, [1]
> > the model names should be named like this:
> > 
> >            - const: firefly,px30-jd4-core
> >            - const: firefly,px30-jd4-core-mb
> 
> I suppose the order should be the other way around to match other entries, e.g
> firefly,px30-jd4-core-mb first?

Yes. Mainboard first, then som, then soc.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Dragan Simic]

On 2024-07-18 10:34, Conor Dooley wrote:
> On Thu, Jul 18, 2024 at 09:31:45AM +0100, Christopher Obbard wrote:
>> Thanks for the review.
>> 
>> On Thu, 2024-07-18 at 06:36 +0200, Dragan Simic wrote:
>> > Hello Christopher,
>> >
>> > On 2024-07-17 18:46, Christopher Obbard wrote:
>> > > Add binding for the Firefly Core-PX30-JD4 SoM when used in conjunction
>> > > with the MB-JD4-RK3328 & PX30 baseboard.
>> > >
>> > > Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
>> > > ---
>> > >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
>> > >  1 file changed, 6 insertions(+)
>> > >
>> > > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml
>> > > b/Documentation/devicetree/bindings/arm/rockchip.yaml
>> > > index 1ef09fbfdfaf5..33ca8028bc151 100644
>> > > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
>> > > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
>> > > @@ -148,6 +148,12 @@ properties:
>> > >            - const: engicam,px30-core
>> > >            - const: rockchip,px30
>> > >
>> > > +      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30 baseboard
>> > > +        items:
>> > > +          - const: firefly,px30-mb-jd4
>> > > +          - const: firefly,px30-core-jd4
>> >
>> > Similarly to how I suggested the new dts(i) files to be named, [1]
>> > the model names should be named like this:
>> >
>> >            - const: firefly,px30-jd4-core
>> >            - const: firefly,px30-jd4-core-mb
>> 
>> I suppose the order should be the other way around to match other 
>> entries, e.g
>> firefly,px30-jd4-core-mb first?
> 
> Yes. Mainboard first, then som, then soc.

Ah yes, sorry, I somehow managed to get the order wrong.  Basically,
it goes from more specific to less specific.

Re: [PATCH v2 1/3] dt-bindings: arm: rockchip: Add Firefly Core-PX30-JD4 with baseboard

[Christopher Obbard]

Hi Dragan,

On Thu, 2024-07-18 at 10:43 +0200, Dragan Simic wrote:
> On 2024-07-18 10:34, Conor Dooley wrote:
> > On Thu, Jul 18, 2024 at 09:31:45AM +0100, Christopher Obbard wrote:
> > > Thanks for the review.
> > > 
> > > On Thu, 2024-07-18 at 06:36 +0200, Dragan Simic wrote:
> > > > Hello Christopher,
> > > > 
> > > > On 2024-07-17 18:46, Christopher Obbard wrote:
> > > > > Add binding for the Firefly Core-PX30-JD4 SoM when used in
> > > > > conjunction
> > > > > with the MB-JD4-RK3328 & PX30 baseboard.
> > > > > 
> > > > > Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
> > > > > ---
> > > > >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++
> > > > >  1 file changed, 6 insertions(+)
> > > > > 
> > > > > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > > > b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > > > index 1ef09fbfdfaf5..33ca8028bc151 100644
> > > > > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > > > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > > > @@ -148,6 +148,12 @@ properties:
> > > > >            - const: engicam,px30-core
> > > > >            - const: rockchip,px30
> > > > > 
> > > > > +      - description: Firefly Core-PX30-JD4 with MB-JD4-PX30
> > > > > baseboard
> > > > > +        items:
> > > > > +          - const: firefly,px30-mb-jd4
> > > > > +          - const: firefly,px30-core-jd4
> > > > 
> > > > Similarly to how I suggested the new dts(i) files to be named, [1]
> > > > the model names should be named like this:
> > > > 
> > > >            - const: firefly,px30-jd4-core
> > > >            - const: firefly,px30-jd4-core-mb
> > > 
> > > I suppose the order should be the other way around to match other 
> > > entries, e.g
> > > firefly,px30-jd4-core-mb first?
> > 
> > Yes. Mainboard first, then som, then soc.
> 
> Ah yes, sorry, I somehow managed to get the order wrong.  Basically,
> it goes from more specific to less specific.

Right, I thought so and was just double-checking ;-).