* [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
@ 2019-11-04 15:22 Markus Reichl
2019-11-05 21:13 ` Rob Herring
2019-11-08 14:41 ` Heiko Stübner
0 siblings, 2 replies; 5+ messages in thread
From: Markus Reichl @ 2019-11-04 15:22 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Heiko Stuebner, Jagan Teki,
Markus Reichl, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
For rk3399-roc-pc is a mezzanine board available that carries M.2 and
POE interfaces. Use it with a separate dts.
---
v3: Use enum in binding and full name in compatible string and file name.
v2: Add new compatible string for roc-pc with mezzanine board.
--
Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
---
.../devicetree/bindings/arm/rockchip.yaml | 4 +-
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++
.../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
.../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++
5 files changed, 847 insertions(+), 757 deletions(-)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index bf86e8237363..ddf6c8f19a49 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -89,7 +89,9 @@ properties:
- description: Firefly ROC-RK3399-PC
items:
- - const: firefly,roc-rk3399-pc
+ - enum:
+ - firefly,roc-rk3399-pc
+ - firefly,roc-rk3399-pc-mezzanine
- const: rockchip,rk3399
- description: FriendlyElec NanoPi4 series boards
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index a959434ad46e..800f9454b2ca 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -28,6 +28,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
new file mode 100644
index 000000000000..d6b3042cffa9
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
+ * Copyright (c) 2019 Markus Reichl <m.reichl@fivetechno.de>
+ */
+
+/dts-v1/;
+#include "rk3399-roc-pc.dtsi"
+
+/ {
+ model = "Firefly ROC-RK3399-PC Mezzanine Board";
+ compatible = "firefly,roc-rk3399-pc-mezzanine", "rockchip,rk3399";
+
+ vcc3v3_ngff: vcc3v3-ngff {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3_ngff";
+ enable-active-high;
+ gpio = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc3v3_ngff_en>;
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&dc_12v>;
+ };
+
+ vcc3v3_pcie: vcc3v3-pcie {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3_pcie";
+ enable-active-high;
+ gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc3v3_pcie_en>;
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&dc_12v>;
+ };
+};
+
+&pcie_phy {
+ status = "okay";
+};
+
+&pcie0 {
+ ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
+ num-lanes = <4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie_perst>;
+ vpcie3v3-supply = <&vcc3v3_pcie>;
+ status = "okay";
+};
+
+&pinctrl {
+ ngff {
+ vcc3v3_ngff_en: vcc3v3-ngff-en {
+ rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ pcie {
+ vcc3v3_pcie_en: vcc3v3-pcie-en {
+ rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ pcie_perst: pcie-perst {
+ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
index 7e07dae33d0f..cd4195425309 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
@@ -4,764 +4,9 @@
*/
/dts-v1/;
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/pwm/pwm.h>
-#include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
+#include "rk3399-roc-pc.dtsi"
/ {
model = "Firefly ROC-RK3399-PC Board";
compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
-
- chosen {
- stdout-path = "serial2:1500000n8";
- };
-
- backlight: backlight {
- compatible = "pwm-backlight";
- pwms = <&pwm0 0 25000 0>;
- };
-
- clkin_gmac: external-gmac-clock {
- compatible = "fixed-clock";
- clock-frequency = <125000000>;
- clock-output-names = "clkin_gmac";
- #clock-cells = <0>;
- };
-
- adc-keys {
- compatible = "adc-keys";
- io-channels = <&saradc 1>;
- io-channel-names = "buttons";
- keyup-threshold-microvolt = <1500000>;
- poll-interval = <100>;
-
- recovery {
- label = "Recovery";
- linux,code = <KEY_VENDOR>;
- press-threshold-microvolt = <18000>;
- };
- };
-
- gpio-keys {
- compatible = "gpio-keys";
- autorepeat;
- pinctrl-names = "default";
- pinctrl-0 = <&pwr_key_l>;
-
- power {
- debounce-interval = <100>;
- gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
- label = "GPIO Key Power";
- linux,code = <KEY_POWER>;
- wakeup-source;
- };
- };
-
- leds {
- compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
-
- work-led {
- label = "green:work";
- gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
- default-state = "on";
- linux,default-trigger = "heartbeat";
- };
-
- diy-led {
- label = "red:diy";
- gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
- default-state = "off";
- linux,default-trigger = "mmc1";
- };
-
- yellow-led {
- label = "yellow:yellow-led";
- gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
- default-state = "off";
- linux,default-trigger = "mmc0";
- };
- };
-
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
- clocks = <&rk808 1>;
- clock-names = "ext_clock";
- 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_PB2 GPIO_ACTIVE_LOW>;
- };
-
- vcc_vbus_typec0: vcc-vbus-typec0 {
- compatible = "regulator-fixed";
- regulator-name = "vcc_vbus_typec0";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- };
-
- /*
- * should be placed inside mp8859, but not until mp8859 has
- * its own dt-binding.
- */
- dc_12v: mp8859-dcdc1 {
- compatible = "regulator-fixed";
- regulator-name = "dc_12v";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- vin-supply = <&vcc_vbus_typec0>;
- };
-
- /* switched by pmic_sleep */
- vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
- compatible = "regulator-fixed";
- regulator-name = "vcc1v8_s3";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- vin-supply = <&vcc_1v8>;
- };
-
- vcc3v3_sys: vcc3v3-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc3v3_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&dc_12v>;
- };
-
- /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
- vcc5v0_host: vcc5v0-host-regulator {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
- regulator-name = "vcc5v0_host";
- regulator-always-on;
- vin-supply = <&vcc_sys>;
- };
-
- vcc_vbus_typec1: vcc-vbus-typec1 {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc_vbus_typec1_en>;
- regulator-name = "vcc_vbus_typec1";
- regulator-always-on;
- vin-supply = <&vcc_sys>;
- };
-
- vcc_sys: vcc-sys {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc_sys_en>;
- regulator-name = "vcc_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&dc_12v>;
- };
-
- vdd_log: vdd-log {
- compatible = "pwm-regulator";
- pwms = <&pwm2 0 25000 1>;
- regulator-name = "vdd_log";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1400000>;
- vin-supply = <&vcc3v3_sys>;
- };
-};
-
-&cpu_l0 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l1 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l2 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l3 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_b0 {
- cpu-supply = <&vdd_cpu_b>;
-};
-
-&cpu_b1 {
- cpu-supply = <&vdd_cpu_b>;
-};
-
-&emmc_phy {
- status = "okay";
-};
-
-&gmac {
- assigned-clocks = <&cru SCLK_RMII_SRC>;
- assigned-clock-parents = <&clkin_gmac>;
- clock_in_out = "input";
- phy-supply = <&vcc_lan>;
- phy-mode = "rgmii";
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
- snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 10000 50000>;
- tx_delay = <0x28>;
- rx_delay = <0x11>;
- status = "okay";
-};
-
-&hdmi {
- ddc-i2c-bus = <&i2c3>;
- pinctrl-names = "default";
- pinctrl-0 = <&hdmi_cec>;
- status = "okay";
-};
-
-&i2c0 {
- clock-frequency = <400000>;
- i2c-scl-rising-time-ns = <168>;
- i2c-scl-falling-time-ns = <4>;
- status = "okay";
-
- rk808: pmic@1b {
- compatible = "rockchip,rk808";
- reg = <0x1b>;
- interrupt-parent = <&gpio1>;
- interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
- #clock-cells = <1>;
- clock-output-names = "xin32k", "rk808-clkout2";
- pinctrl-names = "default";
- pinctrl-0 = <&pmic_int_l>;
- rockchip,system-power-controller;
- wakeup-source;
-
- vcc1-supply = <&vcc3v3_sys>;
- vcc2-supply = <&vcc3v3_sys>;
- vcc3-supply = <&vcc3v3_sys>;
- vcc4-supply = <&vcc3v3_sys>;
- vcc6-supply = <&vcc3v3_sys>;
- vcc7-supply = <&vcc3v3_sys>;
- vcc8-supply = <&vcc3v3_sys>;
- vcc9-supply = <&vcc3v3_sys>;
- vcc10-supply = <&vcc3v3_sys>;
- vcc11-supply = <&vcc3v3_sys>;
- vcc12-supply = <&vcc3v3_sys>;
- vcc13-supply = <&vcc3v3_sys>;
- vcc14-supply = <&vcc3v3_sys>;
- vddio-supply = <&vcc_3v0>;
-
- regulators {
- vdd_center: DCDC_REG1 {
- regulator-name = "vdd_center";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <750000>;
- regulator-max-microvolt = <1350000>;
- regulator-ramp-delay = <6001>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vdd_cpu_l: DCDC_REG2 {
- regulator-name = "vdd_cpu_l";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <750000>;
- regulator-max-microvolt = <1350000>;
- regulator-ramp-delay = <6001>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_ddr: DCDC_REG3 {
- regulator-name = "vcc_ddr";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-on-in-suspend;
- };
- };
-
- vcc_1v8: DCDC_REG4 {
- regulator-name = "vcc_1v8";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1800000>;
- };
- };
-
- vcca1v8_codec: LDO_REG1 {
- regulator-name = "vcca1v8_codec";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc1v8_hdmi: LDO_REG2 {
- regulator-name = "vcc1v8_hdmi";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc1v8_pmu: LDO_REG3 {
- regulator-name = "vcc1v8_pmu";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1800000>;
- };
- };
-
- vcc_sdio: LDO_REG4 {
- regulator-name = "vcc_sdio";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <3000000>;
- };
- };
-
- vcca3v0_codec: LDO_REG5 {
- regulator-name = "vcca3v0_codec";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_1v5: LDO_REG6 {
- regulator-name = "vcc_1v5";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1500000>;
- regulator-max-microvolt = <1500000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1500000>;
- };
- };
-
- vcca0v9_hdmi: LDO_REG7 {
- regulator-name = "vcca0v9_hdmi";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <900000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_3v0: LDO_REG8 {
- regulator-name = "vcc_3v0";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <3000000>;
- };
- };
-
- vcc3v3_s3: vcc_lan: SWITCH_REG1 {
- regulator-name = "vcc3v3_s3";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc3v3_s0: SWITCH_REG2 {
- regulator-name = "vcc3v3_s0";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
- };
- };
-
- vdd_cpu_b: regulator@40 {
- compatible = "silergy,syr827";
- reg = <0x40>;
- fcs,suspend-voltage-selector = <1>;
- pinctrl-names = "default";
- pinctrl-0 = <&vsel1_gpio>;
- regulator-name = "vdd_cpu_b";
- regulator-min-microvolt = <712500>;
- regulator-max-microvolt = <1500000>;
- regulator-ramp-delay = <1000>;
- regulator-always-on;
- regulator-boot-on;
- vin-supply = <&vcc3v3_sys>;
-
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vdd_gpu: regulator@41 {
- compatible = "silergy,syr828";
- reg = <0x41>;
- fcs,suspend-voltage-selector = <1>;
- pinctrl-names = "default";
- pinctrl-0 = <&vsel2_gpio>;
- regulator-name = "vdd_gpu";
- regulator-min-microvolt = <712500>;
- regulator-max-microvolt = <1500000>;
- regulator-ramp-delay = <1000>;
- regulator-always-on;
- regulator-boot-on;
- vin-supply = <&vcc3v3_sys>;
-
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-};
-
-&i2c1 {
- i2c-scl-rising-time-ns = <300>;
- i2c-scl-falling-time-ns = <15>;
- status = "okay";
-};
-
-&i2c3 {
- i2c-scl-rising-time-ns = <450>;
- i2c-scl-falling-time-ns = <15>;
- status = "okay";
-};
-
-&i2c4 {
- i2c-scl-rising-time-ns = <600>;
- i2c-scl-falling-time-ns = <20>;
- status = "okay";
-
- fusb1: usb-typec@22 {
- compatible = "fcs,fusb302";
- reg = <0x22>;
- interrupt-parent = <&gpio1>;
- interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&fusb1_int>;
- vbus-supply = <&vcc_vbus_typec1>;
- status = "okay";
- };
-};
-
-&i2c7 {
- i2c-scl-rising-time-ns = <600>;
- i2c-scl-falling-time-ns = <20>;
- status = "okay";
-
- fusb0: usb-typec@22 {
- compatible = "fcs,fusb302";
- reg = <0x22>;
- interrupt-parent = <&gpio1>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&fusb0_int>;
- vbus-supply = <&vcc_vbus_typec0>;
- status = "okay";
- };
-};
-
-&i2s0 {
- rockchip,playback-channels = <8>;
- rockchip,capture-channels = <8>;
- status = "okay";
-};
-
-&i2s1 {
- rockchip,playback-channels = <2>;
- rockchip,capture-channels = <2>;
- status = "okay";
-};
-
-&i2s2 {
- status = "okay";
-};
-
-&io_domains {
- audio-supply = <&vcca1v8_codec>;
- bt656-supply = <&vcc_3v0>;
- gpio1830-supply = <&vcc_3v0>;
- sdmmc-supply = <&vcc_sdio>;
- status = "okay";
-};
-
-&pmu_io_domains {
- pmu1830-supply = <&vcc_3v0>;
- status = "okay";
-};
-
-&pinctrl {
- buttons {
- pwr_key_l: pwr-key-l {
- rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- lcd-panel {
- lcd_panel_reset: lcd-panel-reset {
- rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- leds {
- diy_led_gpio: diy_led-gpio {
- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- work_led_gpio: work_led-gpio {
- rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- yellow_led_gpio: yellow_led-gpio {
- rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- pmic {
- vsel1_gpio: vsel1-gpio {
- rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
- };
-
- vsel2_gpio: vsel2-gpio {
- rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
- };
- };
-
- sdio-pwrseq {
- wifi_enable_h: wifi-enable-h {
- rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- pmic {
- pmic_int_l: pmic-int-l {
- rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- usb2 {
- vcc5v0_host_en: vcc5v0-host-en {
- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- vcc_sys_en: vcc-sys-en {
- rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- hub_rst: hub-rst {
- rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
- };
- };
-
- usb-typec {
- vcc_vbus_typec1_en: vcc-vbus-typec1-en {
- rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- fusb30x {
- fusb0_int: fusb0-int {
- rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
- };
-
- fusb1_int: fusb1-int {
- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-};
-
-&pwm0 {
- status = "okay";
-};
-
-&pwm2 {
- status = "okay";
-};
-
-&saradc {
- vref-supply = <&vcca1v8_s3>;
- status = "okay";
-};
-
-&sdmmc {
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
- disable-wp;
- max-frequency = <150000000>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
- status = "okay";
-};
-
-&sdhci {
- bus-width = <8>;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
- non-removable;
- status = "okay";
-};
-
-&tcphy0 {
- status = "okay";
-};
-
-&tcphy1 {
- status = "okay";
-};
-
-&tsadc {
- /* tshut mode 0:CRU 1:GPIO */
- rockchip,hw-tshut-mode = <1>;
- /* tshut polarity 0:LOW 1:HIGH */
- rockchip,hw-tshut-polarity = <1>;
- status = "okay";
-};
-
-&u2phy0 {
- status = "okay";
-
- u2phy0_otg: otg-port {
- phy-supply = <&vcc_vbus_typec0>;
- status = "okay";
- };
-
- u2phy0_host: host-port {
- phy-supply = <&vcc5v0_host>;
- status = "okay";
- };
-};
-
-&u2phy1 {
- status = "okay";
-
- u2phy1_otg: otg-port {
- phy-supply = <&vcc_vbus_typec1>;
- status = "okay";
- };
-
- u2phy1_host: host-port {
- phy-supply = <&vcc5v0_host>;
- status = "okay";
- };
-};
-
-&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_xfer &uart0_cts>;
- status = "okay";
-};
-
-&uart2 {
- status = "okay";
-};
-
-&usb_host0_ehci {
- status = "okay";
-};
-
-&usb_host0_ohci {
- status = "okay";
-};
-
-&usb_host1_ehci {
- status = "okay";
-};
-
-&usb_host1_ohci {
- status = "okay";
-};
-
-&usbdrd3_0 {
- status = "okay";
-};
-
-&usbdrd_dwc3_0 {
- status = "okay";
-};
-
-&usbdrd3_1 {
- status = "okay";
-};
-
-&usbdrd_dwc3_1 {
- status = "okay";
- dr_mode = "host";
-};
-
-&vopb {
- status = "okay";
-};
-
-&vopb_mmu {
- status = "okay";
-};
-
-&vopl {
- status = "okay";
-};
-
-&vopl_mmu {
- status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
new file mode 100644
index 000000000000..287f97488f65
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -0,0 +1,770 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
+ */
+
+/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/pwm/pwm.h>
+#include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
+
+/ {
+ model = "Firefly ROC-RK3399-PC Board";
+ compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
+
+ chosen {
+ stdout-path = "serial2:1500000n8";
+ };
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm0 0 25000 0>;
+ };
+
+ clkin_gmac: external-gmac-clock {
+ compatible = "fixed-clock";
+ clock-frequency = <125000000>;
+ clock-output-names = "clkin_gmac";
+ #clock-cells = <0>;
+ };
+
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 1>;
+ io-channel-names = "buttons";
+ keyup-threshold-microvolt = <1500000>;
+ poll-interval = <100>;
+
+ recovery {
+ label = "Recovery";
+ linux,code = <KEY_VENDOR>;
+ press-threshold-microvolt = <18000>;
+ };
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ autorepeat;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pwr_key_l>;
+
+ power {
+ debounce-interval = <100>;
+ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
+ label = "GPIO Key Power";
+ linux,code = <KEY_POWER>;
+ wakeup-source;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
+
+ work-led {
+ label = "green:work";
+ gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ linux,default-trigger = "heartbeat";
+ };
+
+ diy-led {
+ label = "red:diy";
+ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ linux,default-trigger = "mmc1";
+ };
+
+ yellow-led {
+ label = "yellow:yellow-led";
+ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ linux,default-trigger = "mmc0";
+ };
+ };
+
+ sdio_pwrseq: sdio-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ clocks = <&rk808 1>;
+ clock-names = "ext_clock";
+ 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_PB2 GPIO_ACTIVE_LOW>;
+ };
+
+ vcc_vbus_typec0: vcc-vbus-typec0 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc_vbus_typec0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
+
+ /*
+ * should be placed inside mp8859, but not until mp8859 has
+ * its own dt-binding.
+ */
+ dc_12v: mp8859-dcdc1 {
+ compatible = "regulator-fixed";
+ regulator-name = "dc_12v";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
+ vin-supply = <&vcc_vbus_typec0>;
+ };
+
+ /* switched by pmic_sleep */
+ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc1v8_s3";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ vin-supply = <&vcc_1v8>;
+ };
+
+ vcc3v3_sys: vcc3v3-sys {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&dc_12v>;
+ };
+
+ /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
+ vcc5v0_host: vcc5v0-host-regulator {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
+ regulator-name = "vcc5v0_host";
+ regulator-always-on;
+ vin-supply = <&vcc_sys>;
+ };
+
+ vcc_vbus_typec1: vcc-vbus-typec1 {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc_vbus_typec1_en>;
+ regulator-name = "vcc_vbus_typec1";
+ regulator-always-on;
+ vin-supply = <&vcc_sys>;
+ };
+
+ vcc_sys: vcc-sys {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc_sys_en>;
+ regulator-name = "vcc_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&dc_12v>;
+ };
+
+ vdd_log: vdd-log {
+ compatible = "pwm-regulator";
+ pwms = <&pwm2 0 25000 1>;
+ regulator-name = "vdd_log";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1400000>;
+ vin-supply = <&vcc3v3_sys>;
+ };
+};
+
+&cpu_l0 {
+ cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l1 {
+ cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l2 {
+ cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l3 {
+ cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_b0 {
+ cpu-supply = <&vdd_cpu_b>;
+};
+
+&cpu_b1 {
+ cpu-supply = <&vdd_cpu_b>;
+};
+
+&emmc_phy {
+ status = "okay";
+};
+
+&gmac {
+ assigned-clocks = <&cru SCLK_RMII_SRC>;
+ assigned-clock-parents = <&clkin_gmac>;
+ clock_in_out = "input";
+ phy-supply = <&vcc_lan>;
+ phy-mode = "rgmii";
+ pinctrl-names = "default";
+ pinctrl-0 = <&rgmii_pins>;
+ snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+ snps,reset-active-low;
+ snps,reset-delays-us = <0 10000 50000>;
+ tx_delay = <0x28>;
+ rx_delay = <0x11>;
+ status = "okay";
+};
+
+&gpu {
+ mali-supply = <&vdd_gpu>;
+ status = "okay";
+};
+
+&hdmi {
+ ddc-i2c-bus = <&i2c3>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_cec>;
+ status = "okay";
+};
+
+&i2c0 {
+ clock-frequency = <400000>;
+ i2c-scl-rising-time-ns = <168>;
+ i2c-scl-falling-time-ns = <4>;
+ status = "okay";
+
+ rk808: pmic@1b {
+ compatible = "rockchip,rk808";
+ reg = <0x1b>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
+ #clock-cells = <1>;
+ clock-output-names = "xin32k", "rk808-clkout2";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int_l>;
+ rockchip,system-power-controller;
+ wakeup-source;
+
+ vcc1-supply = <&vcc3v3_sys>;
+ vcc2-supply = <&vcc3v3_sys>;
+ vcc3-supply = <&vcc3v3_sys>;
+ vcc4-supply = <&vcc3v3_sys>;
+ vcc6-supply = <&vcc3v3_sys>;
+ vcc7-supply = <&vcc3v3_sys>;
+ vcc8-supply = <&vcc3v3_sys>;
+ vcc9-supply = <&vcc3v3_sys>;
+ vcc10-supply = <&vcc3v3_sys>;
+ vcc11-supply = <&vcc3v3_sys>;
+ vcc12-supply = <&vcc3v3_sys>;
+ vcc13-supply = <&vcc3v3_sys>;
+ vcc14-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_3v0>;
+
+ regulators {
+ vdd_center: DCDC_REG1 {
+ regulator-name = "vdd_center";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vdd_cpu_l: DCDC_REG2 {
+ regulator-name = "vdd_cpu_l";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
+ };
+
+ vcc_1v8: DCDC_REG4 {
+ regulator-name = "vcc_1v8";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vcca1v8_codec: LDO_REG1 {
+ regulator-name = "vcca1v8_codec";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc1v8_hdmi: LDO_REG2 {
+ regulator-name = "vcc1v8_hdmi";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc1v8_pmu: LDO_REG3 {
+ regulator-name = "vcc1v8_pmu";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vcc_sdio: LDO_REG4 {
+ regulator-name = "vcc_sdio";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+
+ vcca3v0_codec: LDO_REG5 {
+ regulator-name = "vcca3v0_codec";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc_1v5: LDO_REG6 {
+ regulator-name = "vcc_1v5";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <1500000>;
+ regulator-max-microvolt = <1500000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1500000>;
+ };
+ };
+
+ vcca0v9_hdmi: LDO_REG7 {
+ regulator-name = "vcca0v9_hdmi";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <900000>;
+ regulator-max-microvolt = <900000>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc_3v0: LDO_REG8 {
+ regulator-name = "vcc_3v0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+
+ vcc3v3_s3: vcc_lan: SWITCH_REG1 {
+ regulator-name = "vcc3v3_s3";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vcc3v3_s0: SWITCH_REG2 {
+ regulator-name = "vcc3v3_s0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+ };
+ };
+
+ vdd_cpu_b: regulator@40 {
+ compatible = "silergy,syr827";
+ reg = <0x40>;
+ fcs,suspend-voltage-selector = <1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vsel1_gpio>;
+ regulator-name = "vdd_cpu_b";
+ regulator-min-microvolt = <712500>;
+ regulator-max-microvolt = <1500000>;
+ regulator-ramp-delay = <1000>;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc3v3_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vdd_gpu: regulator@41 {
+ compatible = "silergy,syr828";
+ reg = <0x41>;
+ fcs,suspend-voltage-selector = <1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vsel2_gpio>;
+ regulator-name = "vdd_gpu";
+ regulator-min-microvolt = <712500>;
+ regulator-max-microvolt = <1500000>;
+ regulator-ramp-delay = <1000>;
+ vin-supply = <&vcc3v3_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+};
+
+&i2c1 {
+ i2c-scl-rising-time-ns = <300>;
+ i2c-scl-falling-time-ns = <15>;
+ status = "okay";
+};
+
+&i2c3 {
+ i2c-scl-rising-time-ns = <450>;
+ i2c-scl-falling-time-ns = <15>;
+ status = "okay";
+};
+
+&i2c4 {
+ i2c-scl-rising-time-ns = <600>;
+ i2c-scl-falling-time-ns = <20>;
+ status = "okay";
+
+ fusb1: usb-typec@22 {
+ compatible = "fcs,fusb302";
+ reg = <0x22>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&fusb1_int>;
+ vbus-supply = <&vcc_vbus_typec1>;
+ status = "okay";
+ };
+};
+
+&i2c7 {
+ i2c-scl-rising-time-ns = <600>;
+ i2c-scl-falling-time-ns = <20>;
+ status = "okay";
+
+ fusb0: usb-typec@22 {
+ compatible = "fcs,fusb302";
+ reg = <0x22>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&fusb0_int>;
+ vbus-supply = <&vcc_vbus_typec0>;
+ status = "okay";
+ };
+};
+
+&i2s0 {
+ rockchip,playback-channels = <8>;
+ rockchip,capture-channels = <8>;
+ status = "okay";
+};
+
+&i2s1 {
+ rockchip,playback-channels = <2>;
+ rockchip,capture-channels = <2>;
+ status = "okay";
+};
+
+&i2s2 {
+ status = "okay";
+};
+
+&io_domains {
+ audio-supply = <&vcca1v8_codec>;
+ bt656-supply = <&vcc_3v0>;
+ gpio1830-supply = <&vcc_3v0>;
+ sdmmc-supply = <&vcc_sdio>;
+ status = "okay";
+};
+
+&pmu_io_domains {
+ pmu1830-supply = <&vcc_3v0>;
+ status = "okay";
+};
+
+&pinctrl {
+ buttons {
+ pwr_key_l: pwr-key-l {
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
+ lcd-panel {
+ lcd_panel_reset: lcd-panel-reset {
+ rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
+ leds {
+ diy_led_gpio: diy_led-gpio {
+ rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ work_led_gpio: work_led-gpio {
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ yellow_led_gpio: yellow_led-gpio {
+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ pmic {
+ vsel1_gpio: vsel1-gpio {
+ rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+
+ vsel2_gpio: vsel2-gpio {
+ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
+
+ sdio-pwrseq {
+ wifi_enable_h: wifi-enable-h {
+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ pmic {
+ pmic_int_l: pmic-int-l {
+ rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
+ usb2 {
+ vcc5v0_host_en: vcc5v0-host-en {
+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ vcc_sys_en: vcc-sys-en {
+ rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ hub_rst: hub-rst {
+ rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
+ };
+ };
+
+ usb-typec {
+ vcc_vbus_typec1_en: vcc-vbus-typec1-en {
+ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ fusb30x {
+ fusb0_int: fusb0-int {
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ fusb1_int: fusb1-int {
+ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+};
+
+&pwm0 {
+ status = "okay";
+};
+
+&pwm2 {
+ status = "okay";
+};
+
+&saradc {
+ vref-supply = <&vcca1v8_s3>;
+ status = "okay";
+};
+
+&sdmmc {
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
+ cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
+ disable-wp;
+ max-frequency = <150000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
+ status = "okay";
+};
+
+&sdhci {
+ bus-width = <8>;
+ mmc-hs400-1_8v;
+ mmc-hs400-enhanced-strobe;
+ non-removable;
+ status = "okay";
+};
+
+&tcphy0 {
+ status = "okay";
+};
+
+&tcphy1 {
+ status = "okay";
+};
+
+&tsadc {
+ /* tshut mode 0:CRU 1:GPIO */
+ rockchip,hw-tshut-mode = <1>;
+ /* tshut polarity 0:LOW 1:HIGH */
+ rockchip,hw-tshut-polarity = <1>;
+ status = "okay";
+};
+
+&u2phy0 {
+ status = "okay";
+
+ u2phy0_otg: otg-port {
+ phy-supply = <&vcc_vbus_typec0>;
+ status = "okay";
+ };
+
+ u2phy0_host: host-port {
+ phy-supply = <&vcc5v0_host>;
+ status = "okay";
+ };
+};
+
+&u2phy1 {
+ status = "okay";
+
+ u2phy1_otg: otg-port {
+ phy-supply = <&vcc_vbus_typec1>;
+ status = "okay";
+ };
+
+ u2phy1_host: host-port {
+ phy-supply = <&vcc5v0_host>;
+ status = "okay";
+ };
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_xfer &uart0_cts>;
+ status = "okay";
+};
+
+&uart2 {
+ status = "okay";
+};
+
+&usb_host0_ehci {
+ status = "okay";
+};
+
+&usb_host0_ohci {
+ status = "okay";
+};
+
+&usb_host1_ehci {
+ status = "okay";
+};
+
+&usb_host1_ohci {
+ status = "okay";
+};
+
+&usbdrd3_0 {
+ status = "okay";
+};
+
+&usbdrd_dwc3_0 {
+ status = "okay";
+};
+
+&usbdrd3_1 {
+ status = "okay";
+};
+
+&usbdrd_dwc3_1 {
+ status = "okay";
+ dr_mode = "host";
+};
+
+&vopb {
+ status = "okay";
+};
+
+&vopb_mmu {
+ status = "okay";
+};
+
+&vopl {
+ status = "okay";
+};
+
+&vopl_mmu {
+ status = "okay";
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
2019-11-04 15:22 [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board Markus Reichl
@ 2019-11-05 21:13 ` Rob Herring
2019-11-08 14:41 ` Heiko Stübner
1 sibling, 0 replies; 5+ messages in thread
From: Rob Herring @ 2019-11-05 21:13 UTC (permalink / raw)
To: Markus Reichl
Cc: Mark Rutland, Heiko Stuebner, Jagan Teki, Markus Reichl,
devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
On Mon, 4 Nov 2019 16:22:25 +0100, Markus Reichl wrote:
> For rk3399-roc-pc is a mezzanine board available that carries M.2 and
> POE interfaces. Use it with a separate dts.
>
> ---
> v3: Use enum in binding and full name in compatible string and file name.
> v2: Add new compatible string for roc-pc with mezzanine board.
> --
>
> Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
> ---
> .../devicetree/bindings/arm/rockchip.yaml | 4 +-
> arch/arm64/boot/dts/rockchip/Makefile | 1 +
> .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++
> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
> .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++
> 5 files changed, 847 insertions(+), 757 deletions(-)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
2019-11-04 15:22 [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board Markus Reichl
2019-11-05 21:13 ` Rob Herring
@ 2019-11-08 14:41 ` Heiko Stübner
2019-11-08 15:18 ` Markus Reichl
1 sibling, 1 reply; 5+ messages in thread
From: Heiko Stübner @ 2019-11-08 14:41 UTC (permalink / raw)
To: Markus Reichl
Cc: Rob Herring, Mark Rutland, Jagan Teki, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
Hi Markus,
Am Montag, 4. November 2019, 16:22:25 CET schrieb Markus Reichl:
> For rk3399-roc-pc is a mezzanine board available that carries M.2 and
> POE interfaces. Use it with a separate dts.
>
> ---
> v3: Use enum in binding and full name in compatible string and file name.
> v2: Add new compatible string for roc-pc with mezzanine board.
> --
>
> Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
> ---
> .../devicetree/bindings/arm/rockchip.yaml | 4 +-
> arch/arm64/boot/dts/rockchip/Makefile | 1 +
> .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++
> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
> .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++
> 5 files changed, 847 insertions(+), 757 deletions(-)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> index 7e07dae33d0f..cd4195425309 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> @@ -4,764 +4,9 @@
This whole hunk fails to apply against my current branch for 5.5
which contain your other patches [0].
And the moved block is obviously so big that I can't really check
which part is somehow different, so I'd ask you to rebase this
patch accordingly, so that it applies again.
Thanks
Heiko
[0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=v5.5-armsoc/dts64
> */
>
> /dts-v1/;
> -#include <dt-bindings/input/linux-event-codes.h>
> -#include <dt-bindings/pwm/pwm.h>
> -#include "rk3399.dtsi"
> -#include "rk3399-opp.dtsi"
> +#include "rk3399-roc-pc.dtsi"
>
> / {
> model = "Firefly ROC-RK3399-PC Board";
> compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
> -
> - chosen {
> - stdout-path = "serial2:1500000n8";
> - };
> -
> - backlight: backlight {
> - compatible = "pwm-backlight";
> - pwms = <&pwm0 0 25000 0>;
> - };
> -
> - clkin_gmac: external-gmac-clock {
> - compatible = "fixed-clock";
> - clock-frequency = <125000000>;
> - clock-output-names = "clkin_gmac";
> - #clock-cells = <0>;
> - };
> -
> - adc-keys {
> - compatible = "adc-keys";
> - io-channels = <&saradc 1>;
> - io-channel-names = "buttons";
> - keyup-threshold-microvolt = <1500000>;
> - poll-interval = <100>;
> -
> - recovery {
> - label = "Recovery";
> - linux,code = <KEY_VENDOR>;
> - press-threshold-microvolt = <18000>;
> - };
> - };
> -
> - gpio-keys {
> - compatible = "gpio-keys";
> - autorepeat;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pwr_key_l>;
> -
> - power {
> - debounce-interval = <100>;
> - gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
> - label = "GPIO Key Power";
> - linux,code = <KEY_POWER>;
> - wakeup-source;
> - };
> - };
> -
> - leds {
> - compatible = "gpio-leds";
> - pinctrl-names = "default";
> - pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
> -
> - work-led {
> - label = "green:work";
> - gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
> - default-state = "on";
> - linux,default-trigger = "heartbeat";
> - };
> -
> - diy-led {
> - label = "red:diy";
> - gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
> - default-state = "off";
> - linux,default-trigger = "mmc1";
> - };
> -
> - yellow-led {
> - label = "yellow:yellow-led";
> - gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
> - default-state = "off";
> - linux,default-trigger = "mmc0";
> - };
> - };
> -
> - sdio_pwrseq: sdio-pwrseq {
> - compatible = "mmc-pwrseq-simple";
> - clocks = <&rk808 1>;
> - clock-names = "ext_clock";
> - 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_PB2 GPIO_ACTIVE_LOW>;
> - };
> -
> - vcc_vbus_typec0: vcc-vbus-typec0 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc_vbus_typec0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - };
> -
> - /*
> - * should be placed inside mp8859, but not until mp8859 has
> - * its own dt-binding.
> - */
> - dc_12v: mp8859-dcdc1 {
> - compatible = "regulator-fixed";
> - regulator-name = "dc_12v";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <12000000>;
> - regulator-max-microvolt = <12000000>;
> - vin-supply = <&vcc_vbus_typec0>;
> - };
> -
> - /* switched by pmic_sleep */
> - vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc1v8_s3";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - vin-supply = <&vcc_1v8>;
> - };
> -
> - vcc3v3_sys: vcc3v3-sys {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc3v3_sys";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - vin-supply = <&dc_12v>;
> - };
> -
> - /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
> - vcc5v0_host: vcc5v0-host-regulator {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
> - regulator-name = "vcc5v0_host";
> - regulator-always-on;
> - vin-supply = <&vcc_sys>;
> - };
> -
> - vcc_vbus_typec1: vcc-vbus-typec1 {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc_vbus_typec1_en>;
> - regulator-name = "vcc_vbus_typec1";
> - regulator-always-on;
> - vin-supply = <&vcc_sys>;
> - };
> -
> - vcc_sys: vcc-sys {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc_sys_en>;
> - regulator-name = "vcc_sys";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&dc_12v>;
> - };
> -
> - vdd_log: vdd-log {
> - compatible = "pwm-regulator";
> - pwms = <&pwm2 0 25000 1>;
> - regulator-name = "vdd_log";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <800000>;
> - regulator-max-microvolt = <1400000>;
> - vin-supply = <&vcc3v3_sys>;
> - };
> -};
> -
> -&cpu_l0 {
> - cpu-supply = <&vdd_cpu_l>;
> -};
> -
> -&cpu_l1 {
> - cpu-supply = <&vdd_cpu_l>;
> -};
> -
> -&cpu_l2 {
> - cpu-supply = <&vdd_cpu_l>;
> -};
> -
> -&cpu_l3 {
> - cpu-supply = <&vdd_cpu_l>;
> -};
> -
> -&cpu_b0 {
> - cpu-supply = <&vdd_cpu_b>;
> -};
> -
> -&cpu_b1 {
> - cpu-supply = <&vdd_cpu_b>;
> -};
> -
> -&emmc_phy {
> - status = "okay";
> -};
> -
> -&gmac {
> - assigned-clocks = <&cru SCLK_RMII_SRC>;
> - assigned-clock-parents = <&clkin_gmac>;
> - clock_in_out = "input";
> - phy-supply = <&vcc_lan>;
> - phy-mode = "rgmii";
> - pinctrl-names = "default";
> - pinctrl-0 = <&rgmii_pins>;
> - snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
> - snps,reset-active-low;
> - snps,reset-delays-us = <0 10000 50000>;
> - tx_delay = <0x28>;
> - rx_delay = <0x11>;
> - status = "okay";
> -};
> -
> -&hdmi {
> - ddc-i2c-bus = <&i2c3>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&hdmi_cec>;
> - status = "okay";
> -};
> -
> -&i2c0 {
> - clock-frequency = <400000>;
> - i2c-scl-rising-time-ns = <168>;
> - i2c-scl-falling-time-ns = <4>;
> - status = "okay";
> -
> - rk808: pmic@1b {
> - compatible = "rockchip,rk808";
> - reg = <0x1b>;
> - interrupt-parent = <&gpio1>;
> - interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
> - #clock-cells = <1>;
> - clock-output-names = "xin32k", "rk808-clkout2";
> - pinctrl-names = "default";
> - pinctrl-0 = <&pmic_int_l>;
> - rockchip,system-power-controller;
> - wakeup-source;
> -
> - vcc1-supply = <&vcc3v3_sys>;
> - vcc2-supply = <&vcc3v3_sys>;
> - vcc3-supply = <&vcc3v3_sys>;
> - vcc4-supply = <&vcc3v3_sys>;
> - vcc6-supply = <&vcc3v3_sys>;
> - vcc7-supply = <&vcc3v3_sys>;
> - vcc8-supply = <&vcc3v3_sys>;
> - vcc9-supply = <&vcc3v3_sys>;
> - vcc10-supply = <&vcc3v3_sys>;
> - vcc11-supply = <&vcc3v3_sys>;
> - vcc12-supply = <&vcc3v3_sys>;
> - vcc13-supply = <&vcc3v3_sys>;
> - vcc14-supply = <&vcc3v3_sys>;
> - vddio-supply = <&vcc_3v0>;
> -
> - regulators {
> - vdd_center: DCDC_REG1 {
> - regulator-name = "vdd_center";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <750000>;
> - regulator-max-microvolt = <1350000>;
> - regulator-ramp-delay = <6001>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdd_cpu_l: DCDC_REG2 {
> - regulator-name = "vdd_cpu_l";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <750000>;
> - regulator-max-microvolt = <1350000>;
> - regulator-ramp-delay = <6001>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_ddr: DCDC_REG3 {
> - regulator-name = "vcc_ddr";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - };
> - };
> -
> - vcc_1v8: DCDC_REG4 {
> - regulator-name = "vcc_1v8";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - vcca1v8_codec: LDO_REG1 {
> - regulator-name = "vcca1v8_codec";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc1v8_hdmi: LDO_REG2 {
> - regulator-name = "vcc1v8_hdmi";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc1v8_pmu: LDO_REG3 {
> - regulator-name = "vcc1v8_pmu";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - vcc_sdio: LDO_REG4 {
> - regulator-name = "vcc_sdio";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3000000>;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <3000000>;
> - };
> - };
> -
> - vcca3v0_codec: LDO_REG5 {
> - regulator-name = "vcca3v0_codec";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3000000>;
> - regulator-max-microvolt = <3000000>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_1v5: LDO_REG6 {
> - regulator-name = "vcc_1v5";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1500000>;
> - regulator-max-microvolt = <1500000>;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <1500000>;
> - };
> - };
> -
> - vcca0v9_hdmi: LDO_REG7 {
> - regulator-name = "vcca0v9_hdmi";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <900000>;
> - regulator-max-microvolt = <900000>;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_3v0: LDO_REG8 {
> - regulator-name = "vcc_3v0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3000000>;
> - regulator-max-microvolt = <3000000>;
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <3000000>;
> - };
> - };
> -
> - vcc3v3_s3: vcc_lan: SWITCH_REG1 {
> - regulator-name = "vcc3v3_s3";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc3v3_s0: SWITCH_REG2 {
> - regulator-name = "vcc3v3_s0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> - };
> - };
> -
> - vdd_cpu_b: regulator@40 {
> - compatible = "silergy,syr827";
> - reg = <0x40>;
> - fcs,suspend-voltage-selector = <1>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vsel1_gpio>;
> - regulator-name = "vdd_cpu_b";
> - regulator-min-microvolt = <712500>;
> - regulator-max-microvolt = <1500000>;
> - regulator-ramp-delay = <1000>;
> - regulator-always-on;
> - regulator-boot-on;
> - vin-supply = <&vcc3v3_sys>;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdd_gpu: regulator@41 {
> - compatible = "silergy,syr828";
> - reg = <0x41>;
> - fcs,suspend-voltage-selector = <1>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vsel2_gpio>;
> - regulator-name = "vdd_gpu";
> - regulator-min-microvolt = <712500>;
> - regulator-max-microvolt = <1500000>;
> - regulator-ramp-delay = <1000>;
> - regulator-always-on;
> - regulator-boot-on;
> - vin-supply = <&vcc3v3_sys>;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -};
> -
> -&i2c1 {
> - i2c-scl-rising-time-ns = <300>;
> - i2c-scl-falling-time-ns = <15>;
> - status = "okay";
> -};
> -
> -&i2c3 {
> - i2c-scl-rising-time-ns = <450>;
> - i2c-scl-falling-time-ns = <15>;
> - status = "okay";
> -};
> -
> -&i2c4 {
> - i2c-scl-rising-time-ns = <600>;
> - i2c-scl-falling-time-ns = <20>;
> - status = "okay";
> -
> - fusb1: usb-typec@22 {
> - compatible = "fcs,fusb302";
> - reg = <0x22>;
> - interrupt-parent = <&gpio1>;
> - interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&fusb1_int>;
> - vbus-supply = <&vcc_vbus_typec1>;
> - status = "okay";
> - };
> -};
> -
> -&i2c7 {
> - i2c-scl-rising-time-ns = <600>;
> - i2c-scl-falling-time-ns = <20>;
> - status = "okay";
> -
> - fusb0: usb-typec@22 {
> - compatible = "fcs,fusb302";
> - reg = <0x22>;
> - interrupt-parent = <&gpio1>;
> - interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&fusb0_int>;
> - vbus-supply = <&vcc_vbus_typec0>;
> - status = "okay";
> - };
> -};
> -
> -&i2s0 {
> - rockchip,playback-channels = <8>;
> - rockchip,capture-channels = <8>;
> - status = "okay";
> -};
> -
> -&i2s1 {
> - rockchip,playback-channels = <2>;
> - rockchip,capture-channels = <2>;
> - status = "okay";
> -};
> -
> -&i2s2 {
> - status = "okay";
> -};
> -
> -&io_domains {
> - audio-supply = <&vcca1v8_codec>;
> - bt656-supply = <&vcc_3v0>;
> - gpio1830-supply = <&vcc_3v0>;
> - sdmmc-supply = <&vcc_sdio>;
> - status = "okay";
> -};
> -
> -&pmu_io_domains {
> - pmu1830-supply = <&vcc_3v0>;
> - status = "okay";
> -};
> -
> -&pinctrl {
> - buttons {
> - pwr_key_l: pwr-key-l {
> - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> - };
> -
> - lcd-panel {
> - lcd_panel_reset: lcd-panel-reset {
> - rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> - };
> -
> - leds {
> - diy_led_gpio: diy_led-gpio {
> - rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - work_led_gpio: work_led-gpio {
> - rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - yellow_led_gpio: yellow_led-gpio {
> - rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> - pmic {
> - vsel1_gpio: vsel1-gpio {
> - rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
> - };
> -
> - vsel2_gpio: vsel2-gpio {
> - rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
> - };
> - };
> -
> - sdio-pwrseq {
> - wifi_enable_h: wifi-enable-h {
> - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> - pmic {
> - pmic_int_l: pmic-int-l {
> - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> - };
> -
> - usb2 {
> - vcc5v0_host_en: vcc5v0-host-en {
> - rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - vcc_sys_en: vcc-sys-en {
> - rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - hub_rst: hub-rst {
> - rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
> - };
> - };
> -
> - usb-typec {
> - vcc_vbus_typec1_en: vcc-vbus-typec1-en {
> - rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> - fusb30x {
> - fusb0_int: fusb0-int {
> - rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> -
> - fusb1_int: fusb1-int {
> - rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> - };
> -};
> -
> -&pwm0 {
> - status = "okay";
> -};
> -
> -&pwm2 {
> - status = "okay";
> -};
> -
> -&saradc {
> - vref-supply = <&vcca1v8_s3>;
> - status = "okay";
> -};
> -
> -&sdmmc {
> - bus-width = <4>;
> - cap-mmc-highspeed;
> - cap-sd-highspeed;
> - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
> - disable-wp;
> - max-frequency = <150000000>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
> - status = "okay";
> -};
> -
> -&sdhci {
> - bus-width = <8>;
> - mmc-hs400-1_8v;
> - mmc-hs400-enhanced-strobe;
> - non-removable;
> - status = "okay";
> -};
> -
> -&tcphy0 {
> - status = "okay";
> -};
> -
> -&tcphy1 {
> - status = "okay";
> -};
> -
> -&tsadc {
> - /* tshut mode 0:CRU 1:GPIO */
> - rockchip,hw-tshut-mode = <1>;
> - /* tshut polarity 0:LOW 1:HIGH */
> - rockchip,hw-tshut-polarity = <1>;
> - status = "okay";
> -};
> -
> -&u2phy0 {
> - status = "okay";
> -
> - u2phy0_otg: otg-port {
> - phy-supply = <&vcc_vbus_typec0>;
> - status = "okay";
> - };
> -
> - u2phy0_host: host-port {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> - };
> -};
> -
> -&u2phy1 {
> - status = "okay";
> -
> - u2phy1_otg: otg-port {
> - phy-supply = <&vcc_vbus_typec1>;
> - status = "okay";
> - };
> -
> - u2phy1_host: host-port {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> - };
> -};
> -
> -&uart0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&uart0_xfer &uart0_cts>;
> - status = "okay";
> -};
> -
> -&uart2 {
> - status = "okay";
> -};
> -
> -&usb_host0_ehci {
> - status = "okay";
> -};
> -
> -&usb_host0_ohci {
> - status = "okay";
> -};
> -
> -&usb_host1_ehci {
> - status = "okay";
> -};
> -
> -&usb_host1_ohci {
> - status = "okay";
> -};
> -
> -&usbdrd3_0 {
> - status = "okay";
> -};
> -
> -&usbdrd_dwc3_0 {
> - status = "okay";
> -};
> -
> -&usbdrd3_1 {
> - status = "okay";
> -};
> -
> -&usbdrd_dwc3_1 {
> - status = "okay";
> - dr_mode = "host";
> -};
> -
> -&vopb {
> - status = "okay";
> -};
> -
> -&vopb_mmu {
> - status = "okay";
> -};
> -
> -&vopl {
> - status = "okay";
> -};
> -
> -&vopl_mmu {
> - status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> new file mode 100644
> index 000000000000..287f97488f65
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> @@ -0,0 +1,770 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
> + */
> +
> +/dts-v1/;
> +#include <dt-bindings/input/linux-event-codes.h>
> +#include <dt-bindings/pwm/pwm.h>
> +#include "rk3399.dtsi"
> +#include "rk3399-opp.dtsi"
> +
> +/ {
> + model = "Firefly ROC-RK3399-PC Board";
> + compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
> +
> + chosen {
> + stdout-path = "serial2:1500000n8";
> + };
> +
> + backlight: backlight {
> + compatible = "pwm-backlight";
> + pwms = <&pwm0 0 25000 0>;
> + };
> +
> + clkin_gmac: external-gmac-clock {
> + compatible = "fixed-clock";
> + clock-frequency = <125000000>;
> + clock-output-names = "clkin_gmac";
> + #clock-cells = <0>;
> + };
> +
> + adc-keys {
> + compatible = "adc-keys";
> + io-channels = <&saradc 1>;
> + io-channel-names = "buttons";
> + keyup-threshold-microvolt = <1500000>;
> + poll-interval = <100>;
> +
> + recovery {
> + label = "Recovery";
> + linux,code = <KEY_VENDOR>;
> + press-threshold-microvolt = <18000>;
> + };
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> + autorepeat;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwr_key_l>;
> +
> + power {
> + debounce-interval = <100>;
> + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
> + label = "GPIO Key Power";
> + linux,code = <KEY_POWER>;
> + wakeup-source;
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + pinctrl-names = "default";
> + pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
> +
> + work-led {
> + label = "green:work";
> + gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
> + default-state = "on";
> + linux,default-trigger = "heartbeat";
> + };
> +
> + diy-led {
> + label = "red:diy";
> + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
> + default-state = "off";
> + linux,default-trigger = "mmc1";
> + };
> +
> + yellow-led {
> + label = "yellow:yellow-led";
> + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
> + default-state = "off";
> + linux,default-trigger = "mmc0";
> + };
> + };
> +
> + sdio_pwrseq: sdio-pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + clocks = <&rk808 1>;
> + clock-names = "ext_clock";
> + 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_PB2 GPIO_ACTIVE_LOW>;
> + };
> +
> + vcc_vbus_typec0: vcc-vbus-typec0 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc_vbus_typec0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + };
> +
> + /*
> + * should be placed inside mp8859, but not until mp8859 has
> + * its own dt-binding.
> + */
> + dc_12v: mp8859-dcdc1 {
> + compatible = "regulator-fixed";
> + regulator-name = "dc_12v";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <12000000>;
> + regulator-max-microvolt = <12000000>;
> + vin-supply = <&vcc_vbus_typec0>;
> + };
> +
> + /* switched by pmic_sleep */
> + vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc1v8_s3";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + vin-supply = <&vcc_1v8>;
> + };
> +
> + vcc3v3_sys: vcc3v3-sys {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3_sys";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + vin-supply = <&dc_12v>;
> + };
> +
> + /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
> + vcc5v0_host: vcc5v0-host-regulator {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
> + regulator-name = "vcc5v0_host";
> + regulator-always-on;
> + vin-supply = <&vcc_sys>;
> + };
> +
> + vcc_vbus_typec1: vcc-vbus-typec1 {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vcc_vbus_typec1_en>;
> + regulator-name = "vcc_vbus_typec1";
> + regulator-always-on;
> + vin-supply = <&vcc_sys>;
> + };
> +
> + vcc_sys: vcc-sys {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vcc_sys_en>;
> + regulator-name = "vcc_sys";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + vin-supply = <&dc_12v>;
> + };
> +
> + vdd_log: vdd-log {
> + compatible = "pwm-regulator";
> + pwms = <&pwm2 0 25000 1>;
> + regulator-name = "vdd_log";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1400000>;
> + vin-supply = <&vcc3v3_sys>;
> + };
> +};
> +
> +&cpu_l0 {
> + cpu-supply = <&vdd_cpu_l>;
> +};
> +
> +&cpu_l1 {
> + cpu-supply = <&vdd_cpu_l>;
> +};
> +
> +&cpu_l2 {
> + cpu-supply = <&vdd_cpu_l>;
> +};
> +
> +&cpu_l3 {
> + cpu-supply = <&vdd_cpu_l>;
> +};
> +
> +&cpu_b0 {
> + cpu-supply = <&vdd_cpu_b>;
> +};
> +
> +&cpu_b1 {
> + cpu-supply = <&vdd_cpu_b>;
> +};
> +
> +&emmc_phy {
> + status = "okay";
> +};
> +
> +&gmac {
> + assigned-clocks = <&cru SCLK_RMII_SRC>;
> + assigned-clock-parents = <&clkin_gmac>;
> + clock_in_out = "input";
> + phy-supply = <&vcc_lan>;
> + phy-mode = "rgmii";
> + pinctrl-names = "default";
> + pinctrl-0 = <&rgmii_pins>;
> + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
> + snps,reset-active-low;
> + snps,reset-delays-us = <0 10000 50000>;
> + tx_delay = <0x28>;
> + rx_delay = <0x11>;
> + status = "okay";
> +};
> +
> +&gpu {
> + mali-supply = <&vdd_gpu>;
> + status = "okay";
> +};
> +
> +&hdmi {
> + ddc-i2c-bus = <&i2c3>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&hdmi_cec>;
> + status = "okay";
> +};
> +
> +&i2c0 {
> + clock-frequency = <400000>;
> + i2c-scl-rising-time-ns = <168>;
> + i2c-scl-falling-time-ns = <4>;
> + status = "okay";
> +
> + rk808: pmic@1b {
> + compatible = "rockchip,rk808";
> + reg = <0x1b>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
> + #clock-cells = <1>;
> + clock-output-names = "xin32k", "rk808-clkout2";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pmic_int_l>;
> + rockchip,system-power-controller;
> + wakeup-source;
> +
> + vcc1-supply = <&vcc3v3_sys>;
> + vcc2-supply = <&vcc3v3_sys>;
> + vcc3-supply = <&vcc3v3_sys>;
> + vcc4-supply = <&vcc3v3_sys>;
> + vcc6-supply = <&vcc3v3_sys>;
> + vcc7-supply = <&vcc3v3_sys>;
> + vcc8-supply = <&vcc3v3_sys>;
> + vcc9-supply = <&vcc3v3_sys>;
> + vcc10-supply = <&vcc3v3_sys>;
> + vcc11-supply = <&vcc3v3_sys>;
> + vcc12-supply = <&vcc3v3_sys>;
> + vcc13-supply = <&vcc3v3_sys>;
> + vcc14-supply = <&vcc3v3_sys>;
> + vddio-supply = <&vcc_3v0>;
> +
> + regulators {
> + vdd_center: DCDC_REG1 {
> + regulator-name = "vdd_center";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <750000>;
> + regulator-max-microvolt = <1350000>;
> + regulator-ramp-delay = <6001>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vdd_cpu_l: DCDC_REG2 {
> + regulator-name = "vdd_cpu_l";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <750000>;
> + regulator-max-microvolt = <1350000>;
> + regulator-ramp-delay = <6001>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc_ddr: DCDC_REG3 {
> + regulator-name = "vcc_ddr";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + };
> + };
> +
> + vcc_1v8: DCDC_REG4 {
> + regulator-name = "vcc_1v8";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + regulator-suspend-microvolt = <1800000>;
> + };
> + };
> +
> + vcca1v8_codec: LDO_REG1 {
> + regulator-name = "vcca1v8_codec";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc1v8_hdmi: LDO_REG2 {
> + regulator-name = "vcc1v8_hdmi";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc1v8_pmu: LDO_REG3 {
> + regulator-name = "vcc1v8_pmu";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + regulator-suspend-microvolt = <1800000>;
> + };
> + };
> +
> + vcc_sdio: LDO_REG4 {
> + regulator-name = "vcc_sdio";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + regulator-suspend-microvolt = <3000000>;
> + };
> + };
> +
> + vcca3v0_codec: LDO_REG5 {
> + regulator-name = "vcca3v0_codec";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3000000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc_1v5: LDO_REG6 {
> + regulator-name = "vcc_1v5";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1500000>;
> + regulator-max-microvolt = <1500000>;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + regulator-suspend-microvolt = <1500000>;
> + };
> + };
> +
> + vcca0v9_hdmi: LDO_REG7 {
> + regulator-name = "vcca0v9_hdmi";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <900000>;
> + regulator-max-microvolt = <900000>;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc_3v0: LDO_REG8 {
> + regulator-name = "vcc_3v0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3000000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-state-mem {
> + regulator-on-in-suspend;
> + regulator-suspend-microvolt = <3000000>;
> + };
> + };
> +
> + vcc3v3_s3: vcc_lan: SWITCH_REG1 {
> + regulator-name = "vcc3v3_s3";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vcc3v3_s0: SWITCH_REG2 {
> + regulator-name = "vcc3v3_s0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> + };
> + };
> +
> + vdd_cpu_b: regulator@40 {
> + compatible = "silergy,syr827";
> + reg = <0x40>;
> + fcs,suspend-voltage-selector = <1>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vsel1_gpio>;
> + regulator-name = "vdd_cpu_b";
> + regulator-min-microvolt = <712500>;
> + regulator-max-microvolt = <1500000>;
> + regulator-ramp-delay = <1000>;
> + regulator-always-on;
> + regulator-boot-on;
> + vin-supply = <&vcc3v3_sys>;
> +
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +
> + vdd_gpu: regulator@41 {
> + compatible = "silergy,syr828";
> + reg = <0x41>;
> + fcs,suspend-voltage-selector = <1>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vsel2_gpio>;
> + regulator-name = "vdd_gpu";
> + regulator-min-microvolt = <712500>;
> + regulator-max-microvolt = <1500000>;
> + regulator-ramp-delay = <1000>;
> + vin-supply = <&vcc3v3_sys>;
> +
> + regulator-state-mem {
> + regulator-off-in-suspend;
> + };
> + };
> +};
> +
> +&i2c1 {
> + i2c-scl-rising-time-ns = <300>;
> + i2c-scl-falling-time-ns = <15>;
> + status = "okay";
> +};
> +
> +&i2c3 {
> + i2c-scl-rising-time-ns = <450>;
> + i2c-scl-falling-time-ns = <15>;
> + status = "okay";
> +};
> +
> +&i2c4 {
> + i2c-scl-rising-time-ns = <600>;
> + i2c-scl-falling-time-ns = <20>;
> + status = "okay";
> +
> + fusb1: usb-typec@22 {
> + compatible = "fcs,fusb302";
> + reg = <0x22>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&fusb1_int>;
> + vbus-supply = <&vcc_vbus_typec1>;
> + status = "okay";
> + };
> +};
> +
> +&i2c7 {
> + i2c-scl-rising-time-ns = <600>;
> + i2c-scl-falling-time-ns = <20>;
> + status = "okay";
> +
> + fusb0: usb-typec@22 {
> + compatible = "fcs,fusb302";
> + reg = <0x22>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&fusb0_int>;
> + vbus-supply = <&vcc_vbus_typec0>;
> + status = "okay";
> + };
> +};
> +
> +&i2s0 {
> + rockchip,playback-channels = <8>;
> + rockchip,capture-channels = <8>;
> + status = "okay";
> +};
> +
> +&i2s1 {
> + rockchip,playback-channels = <2>;
> + rockchip,capture-channels = <2>;
> + status = "okay";
> +};
> +
> +&i2s2 {
> + status = "okay";
> +};
> +
> +&io_domains {
> + audio-supply = <&vcca1v8_codec>;
> + bt656-supply = <&vcc_3v0>;
> + gpio1830-supply = <&vcc_3v0>;
> + sdmmc-supply = <&vcc_sdio>;
> + status = "okay";
> +};
> +
> +&pmu_io_domains {
> + pmu1830-supply = <&vcc_3v0>;
> + status = "okay";
> +};
> +
> +&pinctrl {
> + buttons {
> + pwr_key_l: pwr-key-l {
> + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
> + };
> + };
> +
> + lcd-panel {
> + lcd_panel_reset: lcd-panel-reset {
> + rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
> + };
> + };
> +
> + leds {
> + diy_led_gpio: diy_led-gpio {
> + rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + work_led_gpio: work_led-gpio {
> + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + yellow_led_gpio: yellow_led-gpio {
> + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + pmic {
> + vsel1_gpio: vsel1-gpio {
> + rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
> + };
> +
> + vsel2_gpio: vsel2-gpio {
> + rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
> + };
> + };
> +
> + sdio-pwrseq {
> + wifi_enable_h: wifi-enable-h {
> + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + pmic {
> + pmic_int_l: pmic-int-l {
> + rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
> + };
> + };
> +
> + usb2 {
> + vcc5v0_host_en: vcc5v0-host-en {
> + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + vcc_sys_en: vcc-sys-en {
> + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> +
> + hub_rst: hub-rst {
> + rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
> + };
> + };
> +
> + usb-typec {
> + vcc_vbus_typec1_en: vcc-vbus-typec1-en {
> + rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> + fusb30x {
> + fusb0_int: fusb0-int {
> + rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
> + };
> +
> + fusb1_int: fusb1-int {
> + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
> + };
> + };
> +};
> +
> +&pwm0 {
> + status = "okay";
> +};
> +
> +&pwm2 {
> + status = "okay";
> +};
> +
> +&saradc {
> + vref-supply = <&vcca1v8_s3>;
> + status = "okay";
> +};
> +
> +&sdmmc {
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
> + disable-wp;
> + max-frequency = <150000000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
> + status = "okay";
> +};
> +
> +&sdhci {
> + bus-width = <8>;
> + mmc-hs400-1_8v;
> + mmc-hs400-enhanced-strobe;
> + non-removable;
> + status = "okay";
> +};
> +
> +&tcphy0 {
> + status = "okay";
> +};
> +
> +&tcphy1 {
> + status = "okay";
> +};
> +
> +&tsadc {
> + /* tshut mode 0:CRU 1:GPIO */
> + rockchip,hw-tshut-mode = <1>;
> + /* tshut polarity 0:LOW 1:HIGH */
> + rockchip,hw-tshut-polarity = <1>;
> + status = "okay";
> +};
> +
> +&u2phy0 {
> + status = "okay";
> +
> + u2phy0_otg: otg-port {
> + phy-supply = <&vcc_vbus_typec0>;
> + status = "okay";
> + };
> +
> + u2phy0_host: host-port {
> + phy-supply = <&vcc5v0_host>;
> + status = "okay";
> + };
> +};
> +
> +&u2phy1 {
> + status = "okay";
> +
> + u2phy1_otg: otg-port {
> + phy-supply = <&vcc_vbus_typec1>;
> + status = "okay";
> + };
> +
> + u2phy1_host: host-port {
> + phy-supply = <&vcc5v0_host>;
> + status = "okay";
> + };
> +};
> +
> +&uart0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart0_xfer &uart0_cts>;
> + status = "okay";
> +};
> +
> +&uart2 {
> + status = "okay";
> +};
> +
> +&usb_host0_ehci {
> + status = "okay";
> +};
> +
> +&usb_host0_ohci {
> + status = "okay";
> +};
> +
> +&usb_host1_ehci {
> + status = "okay";
> +};
> +
> +&usb_host1_ohci {
> + status = "okay";
> +};
> +
> +&usbdrd3_0 {
> + status = "okay";
> +};
> +
> +&usbdrd_dwc3_0 {
> + status = "okay";
> +};
> +
> +&usbdrd3_1 {
> + status = "okay";
> +};
> +
> +&usbdrd_dwc3_1 {
> + status = "okay";
> + dr_mode = "host";
> +};
> +
> +&vopb {
> + status = "okay";
> +};
> +
> +&vopb_mmu {
> + status = "okay";
> +};
> +
> +&vopl {
> + status = "okay";
> +};
> +
> +&vopl_mmu {
> + status = "okay";
> +};
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
2019-11-08 14:41 ` Heiko Stübner
@ 2019-11-08 15:18 ` Markus Reichl
2019-11-08 16:52 ` Heiko Stübner
0 siblings, 1 reply; 5+ messages in thread
From: Markus Reichl @ 2019-11-08 15:18 UTC (permalink / raw)
To: Heiko Stübner
Cc: Rob Herring, Mark Rutland, Jagan Teki, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 40891 bytes --]
Hi Heiko,
Am 08.11.19 um 15:41 schrieb Heiko Stübner:
> Hi Markus,
>
> Am Montag, 4. November 2019, 16:22:25 CET schrieb Markus Reichl:
>> For rk3399-roc-pc is a mezzanine board available that carries M.2 and
>> POE interfaces. Use it with a separate dts.
>>
>> ---
>> v3: Use enum in binding and full name in compatible string and file name.
>> v2: Add new compatible string for roc-pc with mezzanine board.
>> --
>>
>> Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
>> ---
>> .../devicetree/bindings/arm/rockchip.yaml | 4 +-
>> arch/arm64/boot/dts/rockchip/Makefile | 1 +
>> .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++
>> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
>> .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++
>> 5 files changed, 847 insertions(+), 757 deletions(-)
>> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
>> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>>
>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> index 7e07dae33d0f..cd4195425309 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> @@ -4,764 +4,9 @@
>
> This whole hunk fails to apply against my current branch for 5.5
> which contain your other patches [0].
>
> And the moved block is obviously so big that I can't really check
> which part is somehow different, so I'd ask you to rebase this
> patch accordingly, so that it applies again.
Yes, will rebase and come with v4.
>
> Thanks
> Heiko
>
> [0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=v5.5-armsoc/dts64
>
>
>> */
>>
>> /dts-v1/;
>> -#include <dt-bindings/input/linux-event-codes.h>
>> -#include <dt-bindings/pwm/pwm.h>
>> -#include "rk3399.dtsi"
>> -#include "rk3399-opp.dtsi"
>> +#include "rk3399-roc-pc.dtsi"
>>
>> / {
>> model = "Firefly ROC-RK3399-PC Board";
>> compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
>> -
>> - chosen {
>> - stdout-path = "serial2:1500000n8";
>> - };
>> -
>> - backlight: backlight {
>> - compatible = "pwm-backlight";
>> - pwms = <&pwm0 0 25000 0>;
>> - };
>> -
>> - clkin_gmac: external-gmac-clock {
>> - compatible = "fixed-clock";
>> - clock-frequency = <125000000>;
>> - clock-output-names = "clkin_gmac";
>> - #clock-cells = <0>;
>> - };
>> -
>> - adc-keys {
>> - compatible = "adc-keys";
>> - io-channels = <&saradc 1>;
>> - io-channel-names = "buttons";
>> - keyup-threshold-microvolt = <1500000>;
>> - poll-interval = <100>;
>> -
>> - recovery {
>> - label = "Recovery";
>> - linux,code = <KEY_VENDOR>;
>> - press-threshold-microvolt = <18000>;
>> - };
>> - };
>> -
>> - gpio-keys {
>> - compatible = "gpio-keys";
>> - autorepeat;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&pwr_key_l>;
>> -
>> - power {
>> - debounce-interval = <100>;
>> - gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
>> - label = "GPIO Key Power";
>> - linux,code = <KEY_POWER>;
>> - wakeup-source;
>> - };
>> - };
>> -
>> - leds {
>> - compatible = "gpio-leds";
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
>> -
>> - work-led {
>> - label = "green:work";
>> - gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
>> - default-state = "on";
>> - linux,default-trigger = "heartbeat";
>> - };
>> -
>> - diy-led {
>> - label = "red:diy";
>> - gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
>> - default-state = "off";
>> - linux,default-trigger = "mmc1";
>> - };
>> -
>> - yellow-led {
>> - label = "yellow:yellow-led";
>> - gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
>> - default-state = "off";
>> - linux,default-trigger = "mmc0";
>> - };
>> - };
>> -
>> - sdio_pwrseq: sdio-pwrseq {
>> - compatible = "mmc-pwrseq-simple";
>> - clocks = <&rk808 1>;
>> - clock-names = "ext_clock";
>> - 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_PB2 GPIO_ACTIVE_LOW>;
>> - };
>> -
>> - vcc_vbus_typec0: vcc-vbus-typec0 {
>> - compatible = "regulator-fixed";
>> - regulator-name = "vcc_vbus_typec0";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <5000000>;
>> - regulator-max-microvolt = <5000000>;
>> - };
>> -
>> - /*
>> - * should be placed inside mp8859, but not until mp8859 has
>> - * its own dt-binding.
>> - */
>> - dc_12v: mp8859-dcdc1 {
>> - compatible = "regulator-fixed";
>> - regulator-name = "dc_12v";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <12000000>;
>> - regulator-max-microvolt = <12000000>;
>> - vin-supply = <&vcc_vbus_typec0>;
>> - };
>> -
>> - /* switched by pmic_sleep */
>> - vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
>> - compatible = "regulator-fixed";
>> - regulator-name = "vcc1v8_s3";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <1800000>;
>> - vin-supply = <&vcc_1v8>;
>> - };
>> -
>> - vcc3v3_sys: vcc3v3-sys {
>> - compatible = "regulator-fixed";
>> - regulator-name = "vcc3v3_sys";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <3300000>;
>> - regulator-max-microvolt = <3300000>;
>> - vin-supply = <&dc_12v>;
>> - };
>> -
>> - /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
>> - vcc5v0_host: vcc5v0-host-regulator {
>> - compatible = "regulator-fixed";
>> - enable-active-high;
>> - gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
>> - regulator-name = "vcc5v0_host";
>> - regulator-always-on;
>> - vin-supply = <&vcc_sys>;
>> - };
>> -
>> - vcc_vbus_typec1: vcc-vbus-typec1 {
>> - compatible = "regulator-fixed";
>> - enable-active-high;
>> - gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vcc_vbus_typec1_en>;
>> - regulator-name = "vcc_vbus_typec1";
>> - regulator-always-on;
>> - vin-supply = <&vcc_sys>;
>> - };
>> -
>> - vcc_sys: vcc-sys {
>> - compatible = "regulator-fixed";
>> - enable-active-high;
>> - gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vcc_sys_en>;
>> - regulator-name = "vcc_sys";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <5000000>;
>> - regulator-max-microvolt = <5000000>;
>> - vin-supply = <&dc_12v>;
>> - };
>> -
>> - vdd_log: vdd-log {
>> - compatible = "pwm-regulator";
>> - pwms = <&pwm2 0 25000 1>;
>> - regulator-name = "vdd_log";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <800000>;
>> - regulator-max-microvolt = <1400000>;
>> - vin-supply = <&vcc3v3_sys>;
>> - };
>> -};
>> -
>> -&cpu_l0 {
>> - cpu-supply = <&vdd_cpu_l>;
>> -};
>> -
>> -&cpu_l1 {
>> - cpu-supply = <&vdd_cpu_l>;
>> -};
>> -
>> -&cpu_l2 {
>> - cpu-supply = <&vdd_cpu_l>;
>> -};
>> -
>> -&cpu_l3 {
>> - cpu-supply = <&vdd_cpu_l>;
>> -};
>> -
>> -&cpu_b0 {
>> - cpu-supply = <&vdd_cpu_b>;
>> -};
>> -
>> -&cpu_b1 {
>> - cpu-supply = <&vdd_cpu_b>;
>> -};
>> -
>> -&emmc_phy {
>> - status = "okay";
>> -};
>> -
>> -&gmac {
>> - assigned-clocks = <&cru SCLK_RMII_SRC>;
>> - assigned-clock-parents = <&clkin_gmac>;
>> - clock_in_out = "input";
>> - phy-supply = <&vcc_lan>;
>> - phy-mode = "rgmii";
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&rgmii_pins>;
>> - snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
>> - snps,reset-active-low;
>> - snps,reset-delays-us = <0 10000 50000>;
>> - tx_delay = <0x28>;
>> - rx_delay = <0x11>;
>> - status = "okay";
>> -};
>> -
>> -&hdmi {
>> - ddc-i2c-bus = <&i2c3>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&hdmi_cec>;
>> - status = "okay";
>> -};
>> -
>> -&i2c0 {
>> - clock-frequency = <400000>;
>> - i2c-scl-rising-time-ns = <168>;
>> - i2c-scl-falling-time-ns = <4>;
>> - status = "okay";
>> -
>> - rk808: pmic@1b {
>> - compatible = "rockchip,rk808";
>> - reg = <0x1b>;
>> - interrupt-parent = <&gpio1>;
>> - interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
>> - #clock-cells = <1>;
>> - clock-output-names = "xin32k", "rk808-clkout2";
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&pmic_int_l>;
>> - rockchip,system-power-controller;
>> - wakeup-source;
>> -
>> - vcc1-supply = <&vcc3v3_sys>;
>> - vcc2-supply = <&vcc3v3_sys>;
>> - vcc3-supply = <&vcc3v3_sys>;
>> - vcc4-supply = <&vcc3v3_sys>;
>> - vcc6-supply = <&vcc3v3_sys>;
>> - vcc7-supply = <&vcc3v3_sys>;
>> - vcc8-supply = <&vcc3v3_sys>;
>> - vcc9-supply = <&vcc3v3_sys>;
>> - vcc10-supply = <&vcc3v3_sys>;
>> - vcc11-supply = <&vcc3v3_sys>;
>> - vcc12-supply = <&vcc3v3_sys>;
>> - vcc13-supply = <&vcc3v3_sys>;
>> - vcc14-supply = <&vcc3v3_sys>;
>> - vddio-supply = <&vcc_3v0>;
>> -
>> - regulators {
>> - vdd_center: DCDC_REG1 {
>> - regulator-name = "vdd_center";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <750000>;
>> - regulator-max-microvolt = <1350000>;
>> - regulator-ramp-delay = <6001>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vdd_cpu_l: DCDC_REG2 {
>> - regulator-name = "vdd_cpu_l";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <750000>;
>> - regulator-max-microvolt = <1350000>;
>> - regulator-ramp-delay = <6001>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc_ddr: DCDC_REG3 {
>> - regulator-name = "vcc_ddr";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - };
>> - };
>> -
>> - vcc_1v8: DCDC_REG4 {
>> - regulator-name = "vcc_1v8";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <1800000>;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - regulator-suspend-microvolt = <1800000>;
>> - };
>> - };
>> -
>> - vcca1v8_codec: LDO_REG1 {
>> - regulator-name = "vcca1v8_codec";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <1800000>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc1v8_hdmi: LDO_REG2 {
>> - regulator-name = "vcc1v8_hdmi";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <1800000>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc1v8_pmu: LDO_REG3 {
>> - regulator-name = "vcc1v8_pmu";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <1800000>;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - regulator-suspend-microvolt = <1800000>;
>> - };
>> - };
>> -
>> - vcc_sdio: LDO_REG4 {
>> - regulator-name = "vcc_sdio";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <3000000>;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - regulator-suspend-microvolt = <3000000>;
>> - };
>> - };
>> -
>> - vcca3v0_codec: LDO_REG5 {
>> - regulator-name = "vcca3v0_codec";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <3000000>;
>> - regulator-max-microvolt = <3000000>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc_1v5: LDO_REG6 {
>> - regulator-name = "vcc_1v5";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <1500000>;
>> - regulator-max-microvolt = <1500000>;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - regulator-suspend-microvolt = <1500000>;
>> - };
>> - };
>> -
>> - vcca0v9_hdmi: LDO_REG7 {
>> - regulator-name = "vcca0v9_hdmi";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <900000>;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc_3v0: LDO_REG8 {
>> - regulator-name = "vcc_3v0";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <3000000>;
>> - regulator-max-microvolt = <3000000>;
>> - regulator-state-mem {
>> - regulator-on-in-suspend;
>> - regulator-suspend-microvolt = <3000000>;
>> - };
>> - };
>> -
>> - vcc3v3_s3: vcc_lan: SWITCH_REG1 {
>> - regulator-name = "vcc3v3_s3";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vcc3v3_s0: SWITCH_REG2 {
>> - regulator-name = "vcc3v3_s0";
>> - regulator-always-on;
>> - regulator-boot-on;
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> - };
>> - };
>> -
>> - vdd_cpu_b: regulator@40 {
>> - compatible = "silergy,syr827";
>> - reg = <0x40>;
>> - fcs,suspend-voltage-selector = <1>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vsel1_gpio>;
>> - regulator-name = "vdd_cpu_b";
>> - regulator-min-microvolt = <712500>;
>> - regulator-max-microvolt = <1500000>;
>> - regulator-ramp-delay = <1000>;
>> - regulator-always-on;
>> - regulator-boot-on;
>> - vin-supply = <&vcc3v3_sys>;
>> -
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -
>> - vdd_gpu: regulator@41 {
>> - compatible = "silergy,syr828";
>> - reg = <0x41>;
>> - fcs,suspend-voltage-selector = <1>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vsel2_gpio>;
>> - regulator-name = "vdd_gpu";
>> - regulator-min-microvolt = <712500>;
>> - regulator-max-microvolt = <1500000>;
>> - regulator-ramp-delay = <1000>;
>> - regulator-always-on;
>> - regulator-boot-on;
>> - vin-supply = <&vcc3v3_sys>;
>> -
>> - regulator-state-mem {
>> - regulator-off-in-suspend;
>> - };
>> - };
>> -};
>> -
>> -&i2c1 {
>> - i2c-scl-rising-time-ns = <300>;
>> - i2c-scl-falling-time-ns = <15>;
>> - status = "okay";
>> -};
>> -
>> -&i2c3 {
>> - i2c-scl-rising-time-ns = <450>;
>> - i2c-scl-falling-time-ns = <15>;
>> - status = "okay";
>> -};
>> -
>> -&i2c4 {
>> - i2c-scl-rising-time-ns = <600>;
>> - i2c-scl-falling-time-ns = <20>;
>> - status = "okay";
>> -
>> - fusb1: usb-typec@22 {
>> - compatible = "fcs,fusb302";
>> - reg = <0x22>;
>> - interrupt-parent = <&gpio1>;
>> - interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&fusb1_int>;
>> - vbus-supply = <&vcc_vbus_typec1>;
>> - status = "okay";
>> - };
>> -};
>> -
>> -&i2c7 {
>> - i2c-scl-rising-time-ns = <600>;
>> - i2c-scl-falling-time-ns = <20>;
>> - status = "okay";
>> -
>> - fusb0: usb-typec@22 {
>> - compatible = "fcs,fusb302";
>> - reg = <0x22>;
>> - interrupt-parent = <&gpio1>;
>> - interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&fusb0_int>;
>> - vbus-supply = <&vcc_vbus_typec0>;
>> - status = "okay";
>> - };
>> -};
>> -
>> -&i2s0 {
>> - rockchip,playback-channels = <8>;
>> - rockchip,capture-channels = <8>;
>> - status = "okay";
>> -};
>> -
>> -&i2s1 {
>> - rockchip,playback-channels = <2>;
>> - rockchip,capture-channels = <2>;
>> - status = "okay";
>> -};
>> -
>> -&i2s2 {
>> - status = "okay";
>> -};
>> -
>> -&io_domains {
>> - audio-supply = <&vcca1v8_codec>;
>> - bt656-supply = <&vcc_3v0>;
>> - gpio1830-supply = <&vcc_3v0>;
>> - sdmmc-supply = <&vcc_sdio>;
>> - status = "okay";
>> -};
>> -
>> -&pmu_io_domains {
>> - pmu1830-supply = <&vcc_3v0>;
>> - status = "okay";
>> -};
>> -
>> -&pinctrl {
>> - buttons {
>> - pwr_key_l: pwr-key-l {
>> - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
>> - };
>> - };
>> -
>> - lcd-panel {
>> - lcd_panel_reset: lcd-panel-reset {
>> - rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
>> - };
>> - };
>> -
>> - leds {
>> - diy_led_gpio: diy_led-gpio {
>> - rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> -
>> - work_led_gpio: work_led-gpio {
>> - rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> -
>> - yellow_led_gpio: yellow_led-gpio {
>> - rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> - };
>> -
>> - pmic {
>> - vsel1_gpio: vsel1-gpio {
>> - rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
>> - };
>> -
>> - vsel2_gpio: vsel2-gpio {
>> - rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
>> - };
>> - };
>> -
>> - sdio-pwrseq {
>> - wifi_enable_h: wifi-enable-h {
>> - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> - };
>> -
>> - pmic {
>> - pmic_int_l: pmic-int-l {
>> - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
>> - };
>> - };
>> -
>> - usb2 {
>> - vcc5v0_host_en: vcc5v0-host-en {
>> - rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> -
>> - vcc_sys_en: vcc-sys-en {
>> - rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> -
>> - hub_rst: hub-rst {
>> - rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
>> - };
>> - };
>> -
>> - usb-typec {
>> - vcc_vbus_typec1_en: vcc-vbus-typec1-en {
>> - rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
>> - };
>> - };
>> -
>> - fusb30x {
>> - fusb0_int: fusb0-int {
>> - rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
>> - };
>> -
>> - fusb1_int: fusb1-int {
>> - rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
>> - };
>> - };
>> -};
>> -
>> -&pwm0 {
>> - status = "okay";
>> -};
>> -
>> -&pwm2 {
>> - status = "okay";
>> -};
>> -
>> -&saradc {
>> - vref-supply = <&vcca1v8_s3>;
>> - status = "okay";
>> -};
>> -
>> -&sdmmc {
>> - bus-width = <4>;
>> - cap-mmc-highspeed;
>> - cap-sd-highspeed;
>> - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
>> - disable-wp;
>> - max-frequency = <150000000>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
>> - status = "okay";
>> -};
>> -
>> -&sdhci {
>> - bus-width = <8>;
>> - mmc-hs400-1_8v;
>> - mmc-hs400-enhanced-strobe;
>> - non-removable;
>> - status = "okay";
>> -};
>> -
>> -&tcphy0 {
>> - status = "okay";
>> -};
>> -
>> -&tcphy1 {
>> - status = "okay";
>> -};
>> -
>> -&tsadc {
>> - /* tshut mode 0:CRU 1:GPIO */
>> - rockchip,hw-tshut-mode = <1>;
>> - /* tshut polarity 0:LOW 1:HIGH */
>> - rockchip,hw-tshut-polarity = <1>;
>> - status = "okay";
>> -};
>> -
>> -&u2phy0 {
>> - status = "okay";
>> -
>> - u2phy0_otg: otg-port {
>> - phy-supply = <&vcc_vbus_typec0>;
>> - status = "okay";
>> - };
>> -
>> - u2phy0_host: host-port {
>> - phy-supply = <&vcc5v0_host>;
>> - status = "okay";
>> - };
>> -};
>> -
>> -&u2phy1 {
>> - status = "okay";
>> -
>> - u2phy1_otg: otg-port {
>> - phy-supply = <&vcc_vbus_typec1>;
>> - status = "okay";
>> - };
>> -
>> - u2phy1_host: host-port {
>> - phy-supply = <&vcc5v0_host>;
>> - status = "okay";
>> - };
>> -};
>> -
>> -&uart0 {
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&uart0_xfer &uart0_cts>;
>> - status = "okay";
>> -};
>> -
>> -&uart2 {
>> - status = "okay";
>> -};
>> -
>> -&usb_host0_ehci {
>> - status = "okay";
>> -};
>> -
>> -&usb_host0_ohci {
>> - status = "okay";
>> -};
>> -
>> -&usb_host1_ehci {
>> - status = "okay";
>> -};
>> -
>> -&usb_host1_ohci {
>> - status = "okay";
>> -};
>> -
>> -&usbdrd3_0 {
>> - status = "okay";
>> -};
>> -
>> -&usbdrd_dwc3_0 {
>> - status = "okay";
>> -};
>> -
>> -&usbdrd3_1 {
>> - status = "okay";
>> -};
>> -
>> -&usbdrd_dwc3_1 {
>> - status = "okay";
>> - dr_mode = "host";
>> -};
>> -
>> -&vopb {
>> - status = "okay";
>> -};
>> -
>> -&vopb_mmu {
>> - status = "okay";
>> -};
>> -
>> -&vopl {
>> - status = "okay";
>> -};
>> -
>> -&vopl_mmu {
>> - status = "okay";
>> };
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>> new file mode 100644
>> index 000000000000..287f97488f65
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>> @@ -0,0 +1,770 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
>> + */
>> +
>> +/dts-v1/;
>> +#include <dt-bindings/input/linux-event-codes.h>
>> +#include <dt-bindings/pwm/pwm.h>
>> +#include "rk3399.dtsi"
>> +#include "rk3399-opp.dtsi"
>> +
>> +/ {
>> + model = "Firefly ROC-RK3399-PC Board";
>> + compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
>> +
>> + chosen {
>> + stdout-path = "serial2:1500000n8";
>> + };
>> +
>> + backlight: backlight {
>> + compatible = "pwm-backlight";
>> + pwms = <&pwm0 0 25000 0>;
>> + };
>> +
>> + clkin_gmac: external-gmac-clock {
>> + compatible = "fixed-clock";
>> + clock-frequency = <125000000>;
>> + clock-output-names = "clkin_gmac";
>> + #clock-cells = <0>;
>> + };
>> +
>> + adc-keys {
>> + compatible = "adc-keys";
>> + io-channels = <&saradc 1>;
>> + io-channel-names = "buttons";
>> + keyup-threshold-microvolt = <1500000>;
>> + poll-interval = <100>;
>> +
>> + recovery {
>> + label = "Recovery";
>> + linux,code = <KEY_VENDOR>;
>> + press-threshold-microvolt = <18000>;
>> + };
>> + };
>> +
>> + gpio-keys {
>> + compatible = "gpio-keys";
>> + autorepeat;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pwr_key_l>;
>> +
>> + power {
>> + debounce-interval = <100>;
>> + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
>> + label = "GPIO Key Power";
>> + linux,code = <KEY_POWER>;
>> + wakeup-source;
>> + };
>> + };
>> +
>> + leds {
>> + compatible = "gpio-leds";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>, <&yellow_led_gpio>;
>> +
>> + work-led {
>> + label = "green:work";
>> + gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
>> + default-state = "on";
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + diy-led {
>> + label = "red:diy";
>> + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
>> + default-state = "off";
>> + linux,default-trigger = "mmc1";
>> + };
>> +
>> + yellow-led {
>> + label = "yellow:yellow-led";
>> + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
>> + default-state = "off";
>> + linux,default-trigger = "mmc0";
>> + };
>> + };
>> +
>> + sdio_pwrseq: sdio-pwrseq {
>> + compatible = "mmc-pwrseq-simple";
>> + clocks = <&rk808 1>;
>> + clock-names = "ext_clock";
>> + 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_PB2 GPIO_ACTIVE_LOW>;
>> + };
>> +
>> + vcc_vbus_typec0: vcc-vbus-typec0 {
>> + compatible = "regulator-fixed";
>> + regulator-name = "vcc_vbus_typec0";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + };
>> +
>> + /*
>> + * should be placed inside mp8859, but not until mp8859 has
>> + * its own dt-binding.
>> + */
>> + dc_12v: mp8859-dcdc1 {
>> + compatible = "regulator-fixed";
>> + regulator-name = "dc_12v";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <12000000>;
>> + regulator-max-microvolt = <12000000>;
>> + vin-supply = <&vcc_vbus_typec0>;
>> + };
>> +
>> + /* switched by pmic_sleep */
>> + vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
>> + compatible = "regulator-fixed";
>> + regulator-name = "vcc1v8_s3";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <1800000>;
>> + vin-supply = <&vcc_1v8>;
>> + };
>> +
>> + vcc3v3_sys: vcc3v3-sys {
>> + compatible = "regulator-fixed";
>> + regulator-name = "vcc3v3_sys";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <3300000>;
>> + regulator-max-microvolt = <3300000>;
>> + vin-supply = <&dc_12v>;
>> + };
>> +
>> + /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
>> + vcc5v0_host: vcc5v0-host-regulator {
>> + compatible = "regulator-fixed";
>> + enable-active-high;
>> + gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
>> + regulator-name = "vcc5v0_host";
>> + regulator-always-on;
>> + vin-supply = <&vcc_sys>;
>> + };
>> +
>> + vcc_vbus_typec1: vcc-vbus-typec1 {
>> + compatible = "regulator-fixed";
>> + enable-active-high;
>> + gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vcc_vbus_typec1_en>;
>> + regulator-name = "vcc_vbus_typec1";
>> + regulator-always-on;
>> + vin-supply = <&vcc_sys>;
>> + };
>> +
>> + vcc_sys: vcc-sys {
>> + compatible = "regulator-fixed";
>> + enable-active-high;
>> + gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vcc_sys_en>;
>> + regulator-name = "vcc_sys";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + vin-supply = <&dc_12v>;
>> + };
>> +
>> + vdd_log: vdd-log {
>> + compatible = "pwm-regulator";
>> + pwms = <&pwm2 0 25000 1>;
>> + regulator-name = "vdd_log";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <800000>;
>> + regulator-max-microvolt = <1400000>;
>> + vin-supply = <&vcc3v3_sys>;
>> + };
>> +};
>> +
>> +&cpu_l0 {
>> + cpu-supply = <&vdd_cpu_l>;
>> +};
>> +
>> +&cpu_l1 {
>> + cpu-supply = <&vdd_cpu_l>;
>> +};
>> +
>> +&cpu_l2 {
>> + cpu-supply = <&vdd_cpu_l>;
>> +};
>> +
>> +&cpu_l3 {
>> + cpu-supply = <&vdd_cpu_l>;
>> +};
>> +
>> +&cpu_b0 {
>> + cpu-supply = <&vdd_cpu_b>;
>> +};
>> +
>> +&cpu_b1 {
>> + cpu-supply = <&vdd_cpu_b>;
>> +};
>> +
>> +&emmc_phy {
>> + status = "okay";
>> +};
>> +
>> +&gmac {
>> + assigned-clocks = <&cru SCLK_RMII_SRC>;
>> + assigned-clock-parents = <&clkin_gmac>;
>> + clock_in_out = "input";
>> + phy-supply = <&vcc_lan>;
>> + phy-mode = "rgmii";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&rgmii_pins>;
>> + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
>> + snps,reset-active-low;
>> + snps,reset-delays-us = <0 10000 50000>;
>> + tx_delay = <0x28>;
>> + rx_delay = <0x11>;
>> + status = "okay";
>> +};
>> +
>> +&gpu {
>> + mali-supply = <&vdd_gpu>;
>> + status = "okay";
>> +};
>> +
>> +&hdmi {
>> + ddc-i2c-bus = <&i2c3>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&hdmi_cec>;
>> + status = "okay";
>> +};
>> +
>> +&i2c0 {
>> + clock-frequency = <400000>;
>> + i2c-scl-rising-time-ns = <168>;
>> + i2c-scl-falling-time-ns = <4>;
>> + status = "okay";
>> +
>> + rk808: pmic@1b {
>> + compatible = "rockchip,rk808";
>> + reg = <0x1b>;
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
>> + #clock-cells = <1>;
>> + clock-output-names = "xin32k", "rk808-clkout2";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pmic_int_l>;
>> + rockchip,system-power-controller;
>> + wakeup-source;
>> +
>> + vcc1-supply = <&vcc3v3_sys>;
>> + vcc2-supply = <&vcc3v3_sys>;
>> + vcc3-supply = <&vcc3v3_sys>;
>> + vcc4-supply = <&vcc3v3_sys>;
>> + vcc6-supply = <&vcc3v3_sys>;
>> + vcc7-supply = <&vcc3v3_sys>;
>> + vcc8-supply = <&vcc3v3_sys>;
>> + vcc9-supply = <&vcc3v3_sys>;
>> + vcc10-supply = <&vcc3v3_sys>;
>> + vcc11-supply = <&vcc3v3_sys>;
>> + vcc12-supply = <&vcc3v3_sys>;
>> + vcc13-supply = <&vcc3v3_sys>;
>> + vcc14-supply = <&vcc3v3_sys>;
>> + vddio-supply = <&vcc_3v0>;
>> +
>> + regulators {
>> + vdd_center: DCDC_REG1 {
>> + regulator-name = "vdd_center";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <750000>;
>> + regulator-max-microvolt = <1350000>;
>> + regulator-ramp-delay = <6001>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vdd_cpu_l: DCDC_REG2 {
>> + regulator-name = "vdd_cpu_l";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <750000>;
>> + regulator-max-microvolt = <1350000>;
>> + regulator-ramp-delay = <6001>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc_ddr: DCDC_REG3 {
>> + regulator-name = "vcc_ddr";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + };
>> + };
>> +
>> + vcc_1v8: DCDC_REG4 {
>> + regulator-name = "vcc_1v8";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <1800000>;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + regulator-suspend-microvolt = <1800000>;
>> + };
>> + };
>> +
>> + vcca1v8_codec: LDO_REG1 {
>> + regulator-name = "vcca1v8_codec";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <1800000>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc1v8_hdmi: LDO_REG2 {
>> + regulator-name = "vcc1v8_hdmi";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <1800000>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc1v8_pmu: LDO_REG3 {
>> + regulator-name = "vcc1v8_pmu";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <1800000>;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + regulator-suspend-microvolt = <1800000>;
>> + };
>> + };
>> +
>> + vcc_sdio: LDO_REG4 {
>> + regulator-name = "vcc_sdio";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <3000000>;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + regulator-suspend-microvolt = <3000000>;
>> + };
>> + };
>> +
>> + vcca3v0_codec: LDO_REG5 {
>> + regulator-name = "vcca3v0_codec";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <3000000>;
>> + regulator-max-microvolt = <3000000>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc_1v5: LDO_REG6 {
>> + regulator-name = "vcc_1v5";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <1500000>;
>> + regulator-max-microvolt = <1500000>;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + regulator-suspend-microvolt = <1500000>;
>> + };
>> + };
>> +
>> + vcca0v9_hdmi: LDO_REG7 {
>> + regulator-name = "vcca0v9_hdmi";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <900000>;
>> + regulator-max-microvolt = <900000>;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc_3v0: LDO_REG8 {
>> + regulator-name = "vcc_3v0";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <3000000>;
>> + regulator-max-microvolt = <3000000>;
>> + regulator-state-mem {
>> + regulator-on-in-suspend;
>> + regulator-suspend-microvolt = <3000000>;
>> + };
>> + };
>> +
>> + vcc3v3_s3: vcc_lan: SWITCH_REG1 {
>> + regulator-name = "vcc3v3_s3";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vcc3v3_s0: SWITCH_REG2 {
>> + regulator-name = "vcc3v3_s0";
>> + regulator-always-on;
>> + regulator-boot-on;
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> + };
>> + };
>> +
>> + vdd_cpu_b: regulator@40 {
>> + compatible = "silergy,syr827";
>> + reg = <0x40>;
>> + fcs,suspend-voltage-selector = <1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vsel1_gpio>;
>> + regulator-name = "vdd_cpu_b";
>> + regulator-min-microvolt = <712500>;
>> + regulator-max-microvolt = <1500000>;
>> + regulator-ramp-delay = <1000>;
>> + regulator-always-on;
>> + regulator-boot-on;
>> + vin-supply = <&vcc3v3_sys>;
>> +
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +
>> + vdd_gpu: regulator@41 {
>> + compatible = "silergy,syr828";
>> + reg = <0x41>;
>> + fcs,suspend-voltage-selector = <1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vsel2_gpio>;
>> + regulator-name = "vdd_gpu";
>> + regulator-min-microvolt = <712500>;
>> + regulator-max-microvolt = <1500000>;
>> + regulator-ramp-delay = <1000>;
>> + vin-supply = <&vcc3v3_sys>;
>> +
>> + regulator-state-mem {
>> + regulator-off-in-suspend;
>> + };
>> + };
>> +};
>> +
>> +&i2c1 {
>> + i2c-scl-rising-time-ns = <300>;
>> + i2c-scl-falling-time-ns = <15>;
>> + status = "okay";
>> +};
>> +
>> +&i2c3 {
>> + i2c-scl-rising-time-ns = <450>;
>> + i2c-scl-falling-time-ns = <15>;
>> + status = "okay";
>> +};
>> +
>> +&i2c4 {
>> + i2c-scl-rising-time-ns = <600>;
>> + i2c-scl-falling-time-ns = <20>;
>> + status = "okay";
>> +
>> + fusb1: usb-typec@22 {
>> + compatible = "fcs,fusb302";
>> + reg = <0x22>;
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&fusb1_int>;
>> + vbus-supply = <&vcc_vbus_typec1>;
>> + status = "okay";
>> + };
>> +};
>> +
>> +&i2c7 {
>> + i2c-scl-rising-time-ns = <600>;
>> + i2c-scl-falling-time-ns = <20>;
>> + status = "okay";
>> +
>> + fusb0: usb-typec@22 {
>> + compatible = "fcs,fusb302";
>> + reg = <0x22>;
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&fusb0_int>;
>> + vbus-supply = <&vcc_vbus_typec0>;
>> + status = "okay";
>> + };
>> +};
>> +
>> +&i2s0 {
>> + rockchip,playback-channels = <8>;
>> + rockchip,capture-channels = <8>;
>> + status = "okay";
>> +};
>> +
>> +&i2s1 {
>> + rockchip,playback-channels = <2>;
>> + rockchip,capture-channels = <2>;
>> + status = "okay";
>> +};
>> +
>> +&i2s2 {
>> + status = "okay";
>> +};
>> +
>> +&io_domains {
>> + audio-supply = <&vcca1v8_codec>;
>> + bt656-supply = <&vcc_3v0>;
>> + gpio1830-supply = <&vcc_3v0>;
>> + sdmmc-supply = <&vcc_sdio>;
>> + status = "okay";
>> +};
>> +
>> +&pmu_io_domains {
>> + pmu1830-supply = <&vcc_3v0>;
>> + status = "okay";
>> +};
>> +
>> +&pinctrl {
>> + buttons {
>> + pwr_key_l: pwr-key-l {
>> + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
>> + };
>> + };
>> +
>> + lcd-panel {
>> + lcd_panel_reset: lcd-panel-reset {
>> + rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
>> + };
>> + };
>> +
>> + leds {
>> + diy_led_gpio: diy_led-gpio {
>> + rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> +
>> + work_led_gpio: work_led-gpio {
>> + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> +
>> + yellow_led_gpio: yellow_led-gpio {
>> + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> + };
>> +
>> + pmic {
>> + vsel1_gpio: vsel1-gpio {
>> + rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
>> + };
>> +
>> + vsel2_gpio: vsel2-gpio {
>> + rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
>> + };
>> + };
>> +
>> + sdio-pwrseq {
>> + wifi_enable_h: wifi-enable-h {
>> + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> + };
>> +
>> + pmic {
>> + pmic_int_l: pmic-int-l {
>> + rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
>> + };
>> + };
>> +
>> + usb2 {
>> + vcc5v0_host_en: vcc5v0-host-en {
>> + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> +
>> + vcc_sys_en: vcc-sys-en {
>> + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> +
>> + hub_rst: hub-rst {
>> + rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;
>> + };
>> + };
>> +
>> + usb-typec {
>> + vcc_vbus_typec1_en: vcc-vbus-typec1-en {
>> + rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
>> + };
>> + };
>> +
>> + fusb30x {
>> + fusb0_int: fusb0-int {
>> + rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
>> + };
>> +
>> + fusb1_int: fusb1-int {
>> + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
>> + };
>> + };
>> +};
>> +
>> +&pwm0 {
>> + status = "okay";
>> +};
>> +
>> +&pwm2 {
>> + status = "okay";
>> +};
>> +
>> +&saradc {
>> + vref-supply = <&vcca1v8_s3>;
>> + status = "okay";
>> +};
>> +
>> +&sdmmc {
>> + bus-width = <4>;
>> + cap-mmc-highspeed;
>> + cap-sd-highspeed;
>> + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
>> + disable-wp;
>> + max-frequency = <150000000>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
>> + status = "okay";
>> +};
>> +
>> +&sdhci {
>> + bus-width = <8>;
>> + mmc-hs400-1_8v;
>> + mmc-hs400-enhanced-strobe;
>> + non-removable;
>> + status = "okay";
>> +};
>> +
>> +&tcphy0 {
>> + status = "okay";
>> +};
>> +
>> +&tcphy1 {
>> + status = "okay";
>> +};
>> +
>> +&tsadc {
>> + /* tshut mode 0:CRU 1:GPIO */
>> + rockchip,hw-tshut-mode = <1>;
>> + /* tshut polarity 0:LOW 1:HIGH */
>> + rockchip,hw-tshut-polarity = <1>;
>> + status = "okay";
>> +};
>> +
>> +&u2phy0 {
>> + status = "okay";
>> +
>> + u2phy0_otg: otg-port {
>> + phy-supply = <&vcc_vbus_typec0>;
>> + status = "okay";
>> + };
>> +
>> + u2phy0_host: host-port {
>> + phy-supply = <&vcc5v0_host>;
>> + status = "okay";
>> + };
>> +};
>> +
>> +&u2phy1 {
>> + status = "okay";
>> +
>> + u2phy1_otg: otg-port {
>> + phy-supply = <&vcc_vbus_typec1>;
>> + status = "okay";
>> + };
>> +
>> + u2phy1_host: host-port {
>> + phy-supply = <&vcc5v0_host>;
>> + status = "okay";
>> + };
>> +};
>> +
>> +&uart0 {
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&uart0_xfer &uart0_cts>;
>> + status = "okay";
>> +};
>> +
>> +&uart2 {
>> + status = "okay";
>> +};
>> +
>> +&usb_host0_ehci {
>> + status = "okay";
>> +};
>> +
>> +&usb_host0_ohci {
>> + status = "okay";
>> +};
>> +
>> +&usb_host1_ehci {
>> + status = "okay";
>> +};
>> +
>> +&usb_host1_ohci {
>> + status = "okay";
>> +};
>> +
>> +&usbdrd3_0 {
>> + status = "okay";
>> +};
>> +
>> +&usbdrd_dwc3_0 {
>> + status = "okay";
>> +};
>> +
>> +&usbdrd3_1 {
>> + status = "okay";
>> +};
>> +
>> +&usbdrd_dwc3_1 {
>> + status = "okay";
>> + dr_mode = "host";
>> +};
>> +
>> +&vopb {
>> + status = "okay";
>> +};
>> +
>> +&vopb_mmu {
>> + status = "okay";
>> +};
>> +
>> +&vopl {
>> + status = "okay";
>> +};
>> +
>> +&vopl_mmu {
>> + status = "okay";
>> +};
>>
>
>
>
>
Gruß,
--
Markus Reichl
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
2019-11-08 15:18 ` Markus Reichl
@ 2019-11-08 16:52 ` Heiko Stübner
0 siblings, 0 replies; 5+ messages in thread
From: Heiko Stübner @ 2019-11-08 16:52 UTC (permalink / raw)
To: Markus Reichl
Cc: Rob Herring, Mark Rutland, Jagan Teki, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
Hi Markus,
Am Freitag, 8. November 2019, 16:18:39 CET schrieb Markus Reichl:
> Am 08.11.19 um 15:41 schrieb Heiko Stübner:
> > Am Montag, 4. November 2019, 16:22:25 CET schrieb Markus Reichl:
> >> For rk3399-roc-pc is a mezzanine board available that carries M.2 and
> >> POE interfaces. Use it with a separate dts.
> >>
> >> ---
> >> v3: Use enum in binding and full name in compatible string and file name.
> >> v2: Add new compatible string for roc-pc with mezzanine board.
> >> --
> >>
> >> Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
> >> ---
> >> .../devicetree/bindings/arm/rockchip.yaml | 4 +-
> >> arch/arm64/boot/dts/rockchip/Makefile | 1 +
> >> .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++
> >> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
> >> .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++
> >> 5 files changed, 847 insertions(+), 757 deletions(-)
> >> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
> >> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> >>
> >
> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> >> index 7e07dae33d0f..cd4195425309 100644
> >> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> >> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> >> @@ -4,764 +4,9 @@
> >
> > This whole hunk fails to apply against my current branch for 5.5
> > which contain your other patches [0].
> >
> > And the moved block is obviously so big that I can't really check
> > which part is somehow different, so I'd ask you to rebase this
> > patch accordingly, so that it applies again.
>
> Yes, will rebase and come with v4.
Not wanting to put any pressure on you, but do you have an estimate
for this? I need to do my second (and final) round of pull requests for
v5.5, so it would of course be interesting if it's sensible to wait for
your respin ;-)
Thanks
Heiko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-08 16:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-04 15:22 [PATCH v3] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board Markus Reichl
2019-11-05 21:13 ` Rob Herring
2019-11-08 14:41 ` Heiko Stübner
2019-11-08 15:18 ` Markus Reichl
2019-11-08 16:52 ` Heiko Stübner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).