diff mbox

[v0] arm64: dts: rockchip: add support for ROC-RK3399-PC board

Message ID 1532161826-2537-1-git-send-email-djw@t-chip.com.cn (mailing list archive)
State New, archived
Headers show

Commit Message

Levin July 21, 2018, 8:30 a.m. UTC
From: Levin Du <djw@t-chip.com.cn>

ROC-RK3399-PC is the first power efficient 4GB DDR4 single board
computer with USB 3.0 and Gigabit Ethernet in a form factor compatible
with the Raspberry Pi. It is based on the Rockchip RK3399 SoC, powered
by the Type-C port.

The devicetree currently supports peripherals of:

- Ethernet
- HDMI
- SD Card
- UART2 debug
- USB3
- eMMC

Signed-off-by: Levin Du <djw@t-chip.com.cn>

---

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm64/boot/dts/rockchip/Makefile              |   1 +
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts     | 717 +++++++++++++++++++++
 3 files changed, 722 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts

Comments

Heiko Stuebner July 24, 2018, 9:28 a.m. UTC | #1
Hi Levin,

Am Samstag, 21. Juli 2018, 10:30:26 CEST schrieb djw@t-chip.com.cn:
> From: Levin Du <djw@t-chip.com.cn>
> 
> ROC-RK3399-PC is the first power efficient 4GB DDR4 single board

maybe "is a power efficient" instead of "the first" ;-)

[...]

> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> new file mode 100644
> index 0000000..207f2e3
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> @@ -0,0 +1,717 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
> + */
> +
> +/dts-v1/;
> +#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 {
> +		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";

I don't think we want to hard-code linux bootargs in the generic devicetree

> +		stdout-path = "serial2:1500000n8";
> +	};
> +
> +	backlight: backlight {
> +		compatible = "pwm-backlight";
> +		enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
> +		pwms = <&pwm0 0 25000 0>;
> +		brightness-levels = <
> +			  0   1   2   3   4   5   6   7

As Rob noted in the px30 evb patch, there is now a property helping
to drop these long lists of brightness levels, see
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=1e5e7cc794b5a332c23216dade0a2e937d694b7f


> +			  8   9  10  11  12  13  14  15
> +			 16  17  18  19  20  21  22  23
> +			 24  25  26  27  28  29  30  31
> +			 32  33  34  35  36  37  38  39
> +			 40  41  42  43  44  45  46  47
> +			 48  49  50  51  52  53  54  55
> +			 56  57  58  59  60  61  62  63
> +			 64  65  66  67  68  69  70  71
> +			 72  73  74  75  76  77  78  79
> +			 80  81  82  83  84  85  86  87
> +			 88  89  90  91  92  93  94  95
> +			 96  97  98  99 100 101 102 103
> +			104 105 106 107 108 109 110 111
> +			112 113 114 115 116 117 118 119
> +			120 121 122 123 124 125 126 127
> +			128 129 130 131 132 133 134 135
> +			136 137 138 139 140 141 142 143
> +			144 145 146 147 148 149 150 151
> +			152 153 154 155 156 157 158 159
> +			160 161 162 163 164 165 166 167
> +			168 169 170 171 172 173 174 175
> +			176 177 178 179 180 181 182 183
> +			184 185 186 187 188 189 190 191
> +			192 193 194 195 196 197 198 199
> +			200 201 202 203 204 205 206 207
> +			208 209 210 211 212 213 214 215
> +			216 217 218 219 220 221 222 223
> +			224 225 226 227 228 229 230 231
> +			232 233 234 235 236 237 238 239
> +			240 241 242 243 244 245 246 247
> +			248 249 250 251 252 253 254 255>;
> +		default-brightness-level = <200>;
> +	};

[...]

> +	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>;
> +	};
> +
> +	vcc12v_sys: mp8859-dcdc1 {

The mp8859 seems to be an i2c-device, as also shown by the
nearly empty mp8859 entry below, so shouldn't this regulator
be defined there?


> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc12v_sys";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <12000000>;
> +		regulator-max-microvolt = <12000000>;
> +		vin-supply = <&vcc_vbus_typec0>;
> +	};

[...]

> +	vcc_hub_en: vcc_hub_en-regulator {
> +		compatible = "regulator-fixed";
> +		enable-active-high;
> +		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&hub_rst>;
> +		regulator-name = "vcc_hub_en";
> +		regulator-always-on;

missing vin-supply

> +	};
> +

[...]

> +	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;
> +		vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;

vsel-gpios is not defined in the mainline dt-binding of the fan5355/syr82*

> +		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;
> +		vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;

same as above

> +		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";
> +
> +	mp8859: mp8859@66 {
> +		compatible = "mps,mp8859";

missing a dt-binding and also a real regulator implementation?

> +		reg = <0x66>;
> +	};
> +
> +	fusb1: usb-typec@22 {
> +		compatible = "fcs,fusb302";
> +		reg = <0x22>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&fusb1_int>;
> +		fcs,int-n = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;

mainline binding expects an "interrupts" property not the
fcs,int-n from above

> +		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>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&fusb0_int>;
> +		fcs,int-n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;

same as above

> +		status = "okay";
> +	};
> +};
> +
> +&i2s0 {
> +	rockchip,playback-channels = <8>;
> +	rockchip,capture-channels = <8>;
> +	#sound-dai-cells = <0>;

sound-dai-cells are in rk3399.dtsi now ... see
https://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git/commit/?id=4486baca66e7a96a6ded3957cb522872a49870ce

> +	status = "okay";
> +};
> +
> +&i2s1 {
> +	rockchip,playback-channels = <2>;
> +	rockchip,capture-channels = <2>;
> +	#sound-dai-cells = <0>;

same as above

> +	status = "okay";
> +};
> +
> +&i2s2 {
> +	#sound-dai-cells = <0>;

same as above

> +	status = "okay";
> +};
> +

> +&tcphy0 {
> +	extcon = <&fusb0>;

the extcon is not described in the mainline fusb302 binding.

> +	status = "okay";
> +};
> +
> +&tcphy1 {
> +	extcon = <&fusb1>;

same as above

> +	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 = <&vcc5v0_host>;
> +		//status = "disabled";

don't leave commented stuff in the dt please.

> +		status = "okay";
> +	};
> +
> +	u2phy0_host: host-port {
> +		phy-supply = <&vcc5v0_host>;
> +		status = "okay";
> +	};
> +};
> +
> +&u2phy1 {
> +	status = "okay";
> +
> +	u2phy1_otg: otg-port {
> +		phy-supply = <&vcc5v0_host>;
> +		//status = "disabled";

same as above

> +		status = "okay";
> +	};
> +
> +	u2phy1_host: host-port {
> +		phy-supply = <&vcc5v0_host>;
> +		status = "okay";
> +	};
> +};


Thanks
Heiko
Enric Balletbo Serra July 24, 2018, 9:53 a.m. UTC | #2
Hi Levin,

Missatge de Heiko Stuebner <heiko@sntech.de> del dia dt., 24 de jul.
2018 a les 11:29:
>
> Hi Levin,
>
> Am Samstag, 21. Juli 2018, 10:30:26 CEST schrieb djw@t-chip.com.cn:
> > From: Levin Du <djw@t-chip.com.cn>
> >
> > ROC-RK3399-PC is the first power efficient 4GB DDR4 single board
>
> maybe "is a power efficient" instead of "the first" ;-)
>
> [...]
>
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> > new file mode 100644
> > index 0000000..207f2e3
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> > @@ -0,0 +1,717 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > +/*
> > + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
> > + */
> > +
> > +/dts-v1/;
> > +#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 {
> > +             bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
>
> I don't think we want to hard-code linux bootargs in the generic devicetree
>
> > +             stdout-path = "serial2:1500000n8";
> > +     };
> > +
> > +     backlight: backlight {
> > +             compatible = "pwm-backlight";
> > +             enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
> > +             pwms = <&pwm0 0 25000 0>;
> > +             brightness-levels = <
> > +                       0   1   2   3   4   5   6   7
>
> As Rob noted in the px30 evb patch, there is now a property helping
> to drop these long lists of brightness levels, see
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=1e5e7cc794b5a332c23216dade0a2e937d694b7f

Adding to the Heiko information. Did you try to just remove brightness-levels?
Without this property, the driver computes a default table with the
brightness levels filled with the numbers provided by the CIE 1931
algorithm. That algorithm is used to dim a led for human perception.

Note that the patches needed did not land yet, are in linux-next, and
you will also be interested in apply this patch [1].

[1] https://lkml.org/lkml/2018/7/24/116

>
>
> > +                       8   9  10  11  12  13  14  15
> > +                      16  17  18  19  20  21  22  23
> > +                      24  25  26  27  28  29  30  31
> > +                      32  33  34  35  36  37  38  39
> > +                      40  41  42  43  44  45  46  47
> > +                      48  49  50  51  52  53  54  55
> > +                      56  57  58  59  60  61  62  63
> > +                      64  65  66  67  68  69  70  71
> > +                      72  73  74  75  76  77  78  79
> > +                      80  81  82  83  84  85  86  87
> > +                      88  89  90  91  92  93  94  95
> > +                      96  97  98  99 100 101 102 103
> > +                     104 105 106 107 108 109 110 111
> > +                     112 113 114 115 116 117 118 119
> > +                     120 121 122 123 124 125 126 127
> > +                     128 129 130 131 132 133 134 135
> > +                     136 137 138 139 140 141 142 143
> > +                     144 145 146 147 148 149 150 151
> > +                     152 153 154 155 156 157 158 159
> > +                     160 161 162 163 164 165 166 167
> > +                     168 169 170 171 172 173 174 175
> > +                     176 177 178 179 180 181 182 183
> > +                     184 185 186 187 188 189 190 191
> > +                     192 193 194 195 196 197 198 199
> > +                     200 201 202 203 204 205 206 207
> > +                     208 209 210 211 212 213 214 215
> > +                     216 217 218 219 220 221 222 223
> > +                     224 225 226 227 228 229 230 231
> > +                     232 233 234 235 236 237 238 239
> > +                     240 241 242 243 244 245 246 247
> > +                     248 249 250 251 252 253 254 255>;
> > +             default-brightness-level = <200>;
> > +     };
>
> [...]
>
> > +     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>;
> > +     };
> > +
> > +     vcc12v_sys: mp8859-dcdc1 {
>
> The mp8859 seems to be an i2c-device, as also shown by the
> nearly empty mp8859 entry below, so shouldn't this regulator
> be defined there?
>
>
> > +             compatible = "regulator-fixed";
> > +             regulator-name = "vcc12v_sys";
> > +             regulator-always-on;
> > +             regulator-boot-on;
> > +             regulator-min-microvolt = <12000000>;
> > +             regulator-max-microvolt = <12000000>;
> > +             vin-supply = <&vcc_vbus_typec0>;
> > +     };
>
> [...]
>
> > +     vcc_hub_en: vcc_hub_en-regulator {
> > +             compatible = "regulator-fixed";
> > +             enable-active-high;
> > +             gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
> > +             pinctrl-names = "default";
> > +             pinctrl-0 = <&hub_rst>;
> > +             regulator-name = "vcc_hub_en";
> > +             regulator-always-on;
>
> missing vin-supply
>
> > +     };
> > +
>
> [...]
>
> > +     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;
> > +             vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
>
> vsel-gpios is not defined in the mainline dt-binding of the fan5355/syr82*
>
> > +             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;
> > +             vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
>
> same as above
>
> > +             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";
> > +
> > +     mp8859: mp8859@66 {
> > +             compatible = "mps,mp8859";
>
> missing a dt-binding and also a real regulator implementation?
>
> > +             reg = <0x66>;
> > +     };
> > +
> > +     fusb1: usb-typec@22 {
> > +             compatible = "fcs,fusb302";
> > +             reg = <0x22>;
> > +             pinctrl-names = "default";
> > +             pinctrl-0 = <&fusb1_int>;
> > +             fcs,int-n = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
>
> mainline binding expects an "interrupts" property not the
> fcs,int-n from above
>
> > +             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>;
> > +             pinctrl-names = "default";
> > +             pinctrl-0 = <&fusb0_int>;
> > +             fcs,int-n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
>
> same as above
>
> > +             status = "okay";
> > +     };
> > +};
> > +
> > +&i2s0 {
> > +     rockchip,playback-channels = <8>;
> > +     rockchip,capture-channels = <8>;
> > +     #sound-dai-cells = <0>;
>
> sound-dai-cells are in rk3399.dtsi now ... see
> https://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git/commit/?id=4486baca66e7a96a6ded3957cb522872a49870ce
>
> > +     status = "okay";
> > +};
> > +
> > +&i2s1 {
> > +     rockchip,playback-channels = <2>;
> > +     rockchip,capture-channels = <2>;
> > +     #sound-dai-cells = <0>;
>
> same as above
>
> > +     status = "okay";
> > +};
> > +
> > +&i2s2 {
> > +     #sound-dai-cells = <0>;
>
> same as above
>
> > +     status = "okay";
> > +};
> > +
>
> > +&tcphy0 {
> > +     extcon = <&fusb0>;
>
> the extcon is not described in the mainline fusb302 binding.
>
> > +     status = "okay";
> > +};
> > +
> > +&tcphy1 {
> > +     extcon = <&fusb1>;
>
> same as above
>
> > +     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 = <&vcc5v0_host>;
> > +             //status = "disabled";
>
> don't leave commented stuff in the dt please.
>
> > +             status = "okay";
> > +     };
> > +
> > +     u2phy0_host: host-port {
> > +             phy-supply = <&vcc5v0_host>;
> > +             status = "okay";
> > +     };
> > +};
> > +
> > +&u2phy1 {
> > +     status = "okay";
> > +
> > +     u2phy1_otg: otg-port {
> > +             phy-supply = <&vcc5v0_host>;
> > +             //status = "disabled";
>
> same as above
>
> > +             status = "okay";
> > +     };
> > +
> > +     u2phy1_host: host-port {
> > +             phy-supply = <&vcc5v0_host>;
> > +             status = "okay";
> > +     };
> > +};
>
>
> Thanks
> Heiko
>

Best regards,
 Enric

>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
Levin July 25, 2018, 3:57 a.m. UTC | #3
Hi Heiko,

Heiko Stuebner <heiko@sntech.de> writes:
> Hi Levin,
>
> Am Samstag, 21. Juli 2018, 10:30:26 CEST schrieb djw@t-chip.com.cn:
>> From: Levin Du <djw@t-chip.com.cn>
>> 
>> ROC-RK3399-PC is the first power efficient 4GB DDR4 single board
>
> maybe "is a power efficient" instead of "the first" ;-)
>
> [...]
>
ok :)

>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> new file mode 100644
>> index 0000000..207f2e3
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> @@ -0,0 +1,717 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
>> + */
>> +
>> +/dts-v1/;
>> +#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 {
>> +		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
>
> I don't think we want to hard-code linux bootargs in the generic devicetree
>
removed. though I think that earlycon is useful in debugging.

>> +		stdout-path = "serial2:1500000n8";
>> +	};
>> +
>> +	backlight: backlight {
>> +		compatible = "pwm-backlight";
>> +		enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
>> +		pwms = <&pwm0 0 25000 0>;
>> +		brightness-levels = <
>> +			  0   1   2   3   4   5   6   7
>
> As Rob noted in the px30 evb patch, there is now a property helping
> to drop these long lists of brightness levels, see
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=1e5e7cc794b5a332c23216dade0a2e937d694b7f
adapted. 

>> +			  8   9  10  11  12  13  14  15
>> +			 16  17  18  19  20  21  22  23
>> +			 24  25  26  27  28  29  30  31
>> +			 32  33  34  35  36  37  38  39
>> +			 40  41  42  43  44  45  46  47
>> +			 48  49  50  51  52  53  54  55
>> +			 56  57  58  59  60  61  62  63
>> +			 64  65  66  67  68  69  70  71
>> +			 72  73  74  75  76  77  78  79
>> +			 80  81  82  83  84  85  86  87
>> +			 88  89  90  91  92  93  94  95
>> +			 96  97  98  99 100 101 102 103
>> +			104 105 106 107 108 109 110 111
>> +			112 113 114 115 116 117 118 119
>> +			120 121 122 123 124 125 126 127
>> +			128 129 130 131 132 133 134 135
>> +			136 137 138 139 140 141 142 143
>> +			144 145 146 147 148 149 150 151
>> +			152 153 154 155 156 157 158 159
>> +			160 161 162 163 164 165 166 167
>> +			168 169 170 171 172 173 174 175
>> +			176 177 178 179 180 181 182 183
>> +			184 185 186 187 188 189 190 191
>> +			192 193 194 195 196 197 198 199
>> +			200 201 202 203 204 205 206 207
>> +			208 209 210 211 212 213 214 215
>> +			216 217 218 219 220 221 222 223
>> +			224 225 226 227 228 229 230 231
>> +			232 233 234 235 236 237 238 239
>> +			240 241 242 243 244 245 246 247
>> +			248 249 250 251 252 253 254 255>;
>> +		default-brightness-level = <200>;
>> +	};
>
> [...]
>
>> +	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>;
>> +	};
>> +
>> +	vcc12v_sys: mp8859-dcdc1 {
>
> The mp8859 seems to be an i2c-device, as also shown by the
> nearly empty mp8859 entry below, so shouldn't this regulator
> be defined there?

Question here. Since mp8859 driver is not mainlined yet. Shall I leave
the regulator here (mp8859 defaults to output 5V) and remove the
mp8859 from the i2c?

>
>
>> +		compatible = "regulator-fixed";
>> +		regulator-name = "vcc12v_sys";
>> +		regulator-always-on;
>> +		regulator-boot-on;
>> +		regulator-min-microvolt = <12000000>;
>> +		regulator-max-microvolt = <12000000>;
>> +		vin-supply = <&vcc_vbus_typec0>;
>> +	};
>
> [...]
>
>> +	vcc_hub_en: vcc_hub_en-regulator {
>> +		compatible = "regulator-fixed";
>> +		enable-active-high;
>> +		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
>> +		pinctrl-names = "default";
>> +		pinctrl-0 = <&hub_rst>;
>> +		regulator-name = "vcc_hub_en";
>> +		regulator-always-on;
>
> missing vin-supply
This just comes in need of setting GPIO2_A4 (HUB_RST) to high 
This dummy regulator should be removed.

I modify the pinctrl of hub_rst to output high:

               hub_rst: hub-rst {                                                                                                                 
                        rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;                                                                 
               };                                                                                                                                 

and add hub_rst to the pinctrl-0 of vcc5v0_host:

    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>;                                                                                                           
    };

Tested show that it works. But is it the recommended way to set this
 gpio (HUB_RST) high? BTW, vcc5v0_host is the usb host voltage,
 and HUB_RST needs to set high for the usb hub chip to work.

>
>> +	}
>> +
>
> [...]
>
>> +	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;
>> +		vsel-gpios = <&gpio1 18 gpio_active_high>;
>
> vsel-gpios is not defined in the mainline dt-binding of the fan5355/syr82*
>
removed.

>> +		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;
>> +		vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
>
> same as above
>
removed

>> +		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";
>> +
>> +	mp8859: mp8859@66 {
>> +		compatible = "mps,mp8859";
>
> missing a dt-binding and also a real regulator implementation?
>
Since this driver is not upstreamed yet. Will remove it.

>> +		reg = <0x66>;
>> +	};
>> +
>> +	fusb1: usb-typec@22 {
>> +		compatible = "fcs,fusb302";
>> +		reg = <0x22>;
>> +		pinctrl-names = "default";
>> +		pinctrl-0 = <&fusb1_int>;
>> +		fcs,int-n = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
>
> mainline binding expects an "interrupts" property not the
> fcs,int-n from above
>
It seems no existing user of fusb302 yet. I take that fcs,int-n
from the driver code. But I look up the binding doc, and come
with this result:

    fusb1: usb-typec@22 {                                                                                                                      
            compatible = "fcs,fusb302";                                                                                                        
            reg = <0x22>;                                                                                                                      
            pinctrl-names = "default";                                                                                                         
            pinctrl-0 = <&fusb1_int>;                                                                                                          
            interrupt-parent = <&gpio1>;                                                                                                       
            interrupts = <1 IRQ_TYPE_LEVEL_LOW>;                                                                                               
            status = "okay";                                                                                                                   
    };                                                                                                                                         


>> +		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>;
>> +		pinctrl-names = "default";
>> +		pinctrl-0 = <&fusb0_int>;
>> +		fcs,int-n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
>
> same as above
>
fixed like above

>> +		status = "okay";
>> +	};
>> +};
>> +
>> +&i2s0 {
>> +	rockchip,playback-channels = <8>;
>> +	rockchip,capture-channels = <8>;
>> +	#sound-dai-cells = <0>;
>
> sound-dai-cells are in rk3399.dtsi now ... see
> https://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git/commit/?id=4486baca66e7a96a6ded3957cb522872a49870ce
>
remove it.

>> +	status = "okay";
>> +};
>> +
>> +&i2s1 {
>> +	rockchip,playback-channels = <2>;
>> +	rockchip,capture-channels = <2>;
>> +	#sound-dai-cells = <0>;
>
> same as above
>
remove it.

>> +	status = "okay";
>> +};
>> +
>> +&i2s2 {
>> +	#sound-dai-cells = <0>;
>
> same as above
>
remove it.

>> +	status = "okay";
>> +};
>> +
>
>> +&tcphy0 {
>> +	extcon = <&fusb0>;
>
> the extcon is not described in the mainline fusb302 binding.
>
remove it.

>> +	status = "okay";
>> +};
>> +
>> +&tcphy1 {
>> +	extcon = <&fusb1>;
>
> same as above
>
remove it.

>> +	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 = <&vcc5v0_host>;
>> +		//status = "disabled";
>
> don't leave commented stuff in the dt please.
>
remove it, sorry for the noise.

>> +		status = "okay";
>> +	};
>> +
>> +	u2phy0_host: host-port {
>> +		phy-supply = <&vcc5v0_host>;
>> +		status = "okay";
>> +	};
>> +};
>> +
>> +&u2phy1 {
>> +	status = "okay";
>> +
>> +	u2phy1_otg: otg-port {
>> +		phy-supply = <&vcc5v0_host>;
>> +		//status = "disabled";
>
> same as above
>
remove it, sorry for the noise.

>> +		status = "okay";
>> +	};
>> +
>> +	u2phy1_host: host-port {
>> +		phy-supply = <&vcc5v0_host>;
>> +		status = "okay";
>> +	};
>> +};
>
>
> Thanks
> Heiko

Thank you very much, Heiko.

Regards,
Levin
Levin July 25, 2018, 4:01 a.m. UTC | #4
Enric Balletbo Serra <eballetbo@gmail.com> writes:

> Hi Levin,
>
> Missatge de Heiko Stuebner <heiko@sntech.de> del dia dt., 24 de jul.
> 2018 a les 11:29:
>>
>> Hi Levin,
>>
>> Am Samstag, 21. Juli 2018, 10:30:26 CEST schrieb djw@t-chip.com.cn:
>> > From: Levin Du <djw@t-chip.com.cn>
>> >
>> > ROC-RK3399-PC is the first power efficient 4GB DDR4 single board
>>
>> maybe "is a power efficient" instead of "the first" ;-)
>>
>> [...]
>>
>> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> > new file mode 100644
>> > index 0000000..207f2e3
>> > --- /dev/null
>> > +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> > @@ -0,0 +1,717 @@
>> > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> > +/*
>> > + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
>> > + */
>> > +
>> > +/dts-v1/;
>> > +#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 {
>> > +             bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
>>
>> I don't think we want to hard-code linux bootargs in the generic devicetree
>>
>> > +             stdout-path = "serial2:1500000n8";
>> > +     };
>> > +
>> > +     backlight: backlight {
>> > +             compatible = "pwm-backlight";
>> > +             enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
>> > +             pwms = <&pwm0 0 25000 0>;
>> > +             brightness-levels = <
>> > +                       0   1   2   3   4   5   6   7
>>
>> As Rob noted in the px30 evb patch, there is now a property helping
>> to drop these long lists of brightness levels, see
>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=1e5e7cc794b5a332c23216dade0a2e937d694b7f
>
> Adding to the Heiko information. Did you try to just remove brightness-levels?
> Without this property, the driver computes a default table with the
> brightness levels filled with the numbers provided by the CIE 1931
> algorithm. That algorithm is used to dim a led for human perception.
>
> Note that the patches needed did not land yet, are in linux-next, and
> you will also be interested in apply this patch [1].
>
> [1] https://lkml.org/lkml/2018/7/24/116
>
>
> Best regards,
>  Enric
>

Thanks you for the note, Enric. I'll test that later.

Regards,
Levin
Heiko Stuebner July 25, 2018, 10:02 a.m. UTC | #5
Hi Levin,

Am Mittwoch, 25. Juli 2018, 05:57:51 CEST schrieb djw@t-chip.com.cn:
> >> +	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>;
> >> +	};
> >> +
> >> +	vcc12v_sys: mp8859-dcdc1 {
> >
> > The mp8859 seems to be an i2c-device, as also shown by the
> > nearly empty mp8859 entry below, so shouldn't this regulator
> > be defined there?
> 
> Question here. Since mp8859 driver is not mainlined yet. Shall I leave
> the regulator here (mp8859 defaults to output 5V) and remove the
> mp8859 from the i2c?

Yep, sounds good ... also please add a comment of sorts that this is
temporary until the mp8859 has its own dt-binding.

> > [...]
> >
> >> +	vcc_hub_en: vcc_hub_en-regulator {
> >> +		compatible = "regulator-fixed";
> >> +		enable-active-high;
> >> +		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
> >> +		pinctrl-names = "default";
> >> +		pinctrl-0 = <&hub_rst>;
> >> +		regulator-name = "vcc_hub_en";
> >> +		regulator-always-on;
> >
> > missing vin-supply
> This just comes in need of setting GPIO2_A4 (HUB_RST) to high 
> This dummy regulator should be removed.
> 
> I modify the pinctrl of hub_rst to output high:
> 
>                hub_rst: hub-rst {                                                                                                                 
>                         rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_output_high>;                                                                 
>                };                                                                                                                                 
> 
> and add hub_rst to the pinctrl-0 of vcc5v0_host:
> 
>     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>;                                                                                                           
>     };
> 
> Tested show that it works. But is it the recommended way to set this
>  gpio (HUB_RST) high? BTW, vcc5v0_host is the usb host voltage,
>  and HUB_RST needs to set high for the usb hub chip to work.

It seems you can also model usb-hirarchy internals via the devicetree.
I guess for these things like soc-gpios and such. See
Documentation/devicetree/bindings/usb/usb-device.txt

While I don't know if this can handle such reset gpios yet, you
could at least move the pinctrl setting there.


> >> +		reg = <0x66>;
> >> +	};
> >> +
> >> +	fusb1: usb-typec@22 {
> >> +		compatible = "fcs,fusb302";
> >> +		reg = <0x22>;
> >> +		pinctrl-names = "default";
> >> +		pinctrl-0 = <&fusb1_int>;
> >> +		fcs,int-n = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
> >
> > mainline binding expects an "interrupts" property not the
> > fcs,int-n from above
> >
> It seems no existing user of fusb302 yet. I take that fcs,int-n
> from the driver code. But I look up the binding doc, and come
> with this result:
> 
>     fusb1: usb-typec@22 {                                                                                                                      
>             compatible = "fcs,fusb302";                                                                                                        
>             reg = <0x22>;                                                                                                                      
>             pinctrl-names = "default";                                                                                                         
>             pinctrl-0 = <&fusb1_int>;                                                                                                          
>             interrupt-parent = <&gpio1>;                                                                                                       
>             interrupts = <1 IRQ_TYPE_LEVEL_LOW>;                                                                                               
>             status = "okay";                                                                                                                   
>     };                                                                                                                                         

looks good, except please move the interrupt* properties between reg
and pinctrl


Heiko
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index acfd3c7..ab5fde8 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -59,6 +59,10 @@  Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
 
+- Firefly ROC-RK3399-PC board:
+    Required root node properties:
+      - compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
+
 - ChipSPARK PopMetal-RK3288 board:
     Required root node properties:
       - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index b0092d9..06028db 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -14,5 +14,6 @@  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
new file mode 100644
index 0000000..207f2e3
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
@@ -0,0 +1,717 @@ 
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
+ */
+
+/dts-v1/;
+#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 {
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
+		stdout-path = "serial2:1500000n8";
+	};
+
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
+		pwms = <&pwm0 0 25000 0>;
+		brightness-levels = <
+			  0   1   2   3   4   5   6   7
+			  8   9  10  11  12  13  14  15
+			 16  17  18  19  20  21  22  23
+			 24  25  26  27  28  29  30  31
+			 32  33  34  35  36  37  38  39
+			 40  41  42  43  44  45  46  47
+			 48  49  50  51  52  53  54  55
+			 56  57  58  59  60  61  62  63
+			 64  65  66  67  68  69  70  71
+			 72  73  74  75  76  77  78  79
+			 80  81  82  83  84  85  86  87
+			 88  89  90  91  92  93  94  95
+			 96  97  98  99 100 101 102 103
+			104 105 106 107 108 109 110 111
+			112 113 114 115 116 117 118 119
+			120 121 122 123 124 125 126 127
+			128 129 130 131 132 133 134 135
+			136 137 138 139 140 141 142 143
+			144 145 146 147 148 149 150 151
+			152 153 154 155 156 157 158 159
+			160 161 162 163 164 165 166 167
+			168 169 170 171 172 173 174 175
+			176 177 178 179 180 181 182 183
+			184 185 186 187 188 189 190 191
+			192 193 194 195 196 197 198 199
+			200 201 202 203 204 205 206 207
+			208 209 210 211 212 213 214 215
+			216 217 218 219 220 221 222 223
+			224 225 226 227 228 229 230 231
+			232 233 234 235 236 237 238 239
+			240 241 242 243 244 245 246 247
+			248 249 250 251 252 253 254 255>;
+		default-brightness-level = <200>;
+	};
+
+	clkin_gmac: external-gmac-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <125000000>;
+		clock-output-names = "clkin_gmac";
+		#clock-cells = <0>;
+	};
+
+	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>;
+	};
+
+	vcc12v_sys: mp8859-dcdc1 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_sys";
+		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 = <&vcc12v_sys>;
+	};
+
+	/* 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>;
+		regulator-name = "vcc5v0_host";
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vcc_hub_en: vcc_hub_en-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hub_rst>;
+		regulator-name = "vcc_hub_en";
+		regulator-always-on;
+	};
+
+	vcc_sys: vcc-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_sys>;
+	};
+
+	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>;
+		vddio-supply = <&vcc1v8_pmu>;
+
+		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;
+		vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+		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;
+		vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+		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";
+
+	mp8859: mp8859@66 {
+		compatible = "mps,mp8859";
+		reg = <0x66>;
+	};
+
+	fusb1: usb-typec@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&fusb1_int>;
+		fcs,int-n = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+		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>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&fusb0_int>;
+		fcs,int-n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
+		status = "okay";
+	};
+};
+
+&i2s0 {
+	rockchip,playback-channels = <8>;
+	rockchip,capture-channels = <8>;
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&i2s1 {
+	rockchip,playback-channels = <2>;
+	rockchip,capture-channels = <2>;
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&i2s2 {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&io_domains {
+	status = "okay";
+
+	bt656-supply = <&vcc_3v0>;
+	audio-supply = <&vcca1v8_codec>;
+	sdmmc-supply = <&vcc_sdio>;
+	gpio1830-supply = <&vcc_3v0>;
+};
+
+&pmu_io_domains {
+	pmu1830-supply = <&vcc_3v0>;
+	status = "okay";
+};
+
+&pinctrl {
+	lcd-panel {
+		lcd_panel_reset: lcd-panel-reset {
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	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>;
+		};
+		hub_rst: hub-rst {
+			rockchip,pins = <2 RK_PA4 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 7 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 {
+	extcon = <&fusb0>;
+	status = "okay";
+};
+
+&tcphy1 {
+	extcon = <&fusb1>;
+	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 = <&vcc5v0_host>;
+		//status = "disabled";
+		status = "okay";
+	};
+
+	u2phy0_host: host-port {
+		phy-supply = <&vcc5v0_host>;
+		status = "okay";
+	};
+};
+
+&u2phy1 {
+	status = "okay";
+
+	u2phy1_otg: otg-port {
+		phy-supply = <&vcc5v0_host>;
+		//status = "disabled";
+		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";
+	dr_mode = "otg";
+};
+
+&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";
+};