Re: [PATCH v1 1/1] arm64: dts: rockchip: Add support for TB-96AI board
From: Manivannan Sadhasivam
Date: Wed Jul 17 2019 - 11:49:41 EST
On Wed, Jul 17, 2019 at 09:17:52PM +0530, Manivannan Sadhasivam wrote:
> Hi Elon,
>
> Thanks for the patch. Overall, this patch needs a bit of cleanup. There
> are many nodes added which are not available in mainline.
>
> Please see comments inline.
>
> On Thu, Jul 11, 2019 at 10:12:09AM +0800, Elon Zhang wrote:
> > Add devicetree support for RK3399Pro TB-96AI board, one of
> > the 96Boards family.
> >
> > The TB-96AI board is a 96Boards Compute SOM design, launched
> > by Linaro, Rockchip and Beiqicloud.
> >
> > More information can be obtained from the following websites:
> > 1.https://www.96boards.org/product/tb-96ai/
> > 2.http://t.rock-chips.com/
> > 3.http://www.beiqicloud.com/
> >
> > This patch add basic node for the board and support booting up
> > to Fedora.
> >
> > Signed-off-by: Elon Zhang <zhangzj@xxxxxxxxxxxxxx>
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
> > index 5f2687acbf94..3d6c8d4363b5 100644
> > --- a/arch/arm64/boot/dts/rockchip/Makefile
> > +++ b/arch/arm64/boot/dts/rockchip/Makefile
> > @@ -27,3 +27,4 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
> > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
> > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
> > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
> > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-tb-96ai.dtb
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-tb-96ai.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-tb-96ai.dts
> > new file mode 100644
> > index 000000000000..1935df99065d
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-tb-96ai.dts
> > @@ -0,0 +1,629 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > +/*
> > + * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd.
> > + */
> > +
> > +/dts-v1/;
> > +#include "rk3399pro.dtsi"
> > +#include "rk3399-opp.dtsi"
> > +
> > +/ {
> > + compatible = "rockchip,rk3399pro-tb-96ai", "rockchip,rk3399pro";
> > +
>
> I think the manufacturer of this board is, Xiamen Beiqi Technology Co. Ltd.
> So, the compatible should be:
>
> compatible = "beiqui,rk3399pro-tb-96ai", "rockchip,rk3399pro";
s/beiqui/beiqi
>
> And there should a separate patch to add the vendor prefix. You can refer
> below patch:
>
> https://lkml.org/lkml/2019/7/17/39
>
> > + chosen {
> > + stdout-path = "serial2:1500000n8";
> > + };
> > +
> > + xin32k: xin32k {
> > + compatible = "fixed-clock";
> > + clock-frequency = <32768>;
> > + clock-output-names = "xin32k";
> > + #clock-cells = <0>;
> > + };
> > +
> > + vcc_phy: vcc-phy-regulator {
> > + compatible = "regulator-fixed";
> > + regulator-name = "vcc_phy";
> > + regulator-always-on;
> > + regulator-boot-on;
> > + };
> > +
> > + vcc5v0_sys: vccsys {
> > + compatible = "regulator-fixed";
> > + regulator-name = "vcc5v0_sys";
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + };
> > +
> > + vdd_log: vdd_log {
> > + compatible = "regulator-fixed";
> > + regulator-name = "vdd_log";
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <900000>;
> > + regulator-max-microvolt = <900000>;
> > + };
> > +
> > + leds: gpio-leds {
> > + compatible = "gpio-leds";
> > + pinctrl-names = "default";
> > + pinctrl-0 =<&leds_gpio>;
>
> Leave a space after =
>
> > +
> > + led@1 {
> > + gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
> > + label = "system_work_led1";
> > + retain-state-suspended;
> > + };
> > +
>
> We are using a standard LED formats for all 96Boards. Please see,
> rk3399-rock960.dts for reference. Since there is only user leds
> (apart from power leds), just define those as per the format.
>
> > + led@2 {
> > + gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>;
> > + label = "system_work_led2";
> > + retain-state-suspended;
> > + };
> > +
> > + led@3 {
> > + gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
> > + label = "system_work_led3";
> > + retain-state-suspended;
> > + };
> > + };
> > +};
> > +
> > +&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";
> > +};
> > +
> > +&i2c0 {
> > + status = "okay";
> > + i2c-scl-rising-time-ns = <180>;
> > + i2c-scl-falling-time-ns = <30>;
> > + clock-frequency = <400000>;
> > +
> > + rk809: pmic@20 {
> > + compatible = "rockchip,rk809";
>
> It looks like this driver is not present in mainline yet. I can see
> some old patches in lkml archive but not sure about the status of those.
> So, please remove this node and use dummy regulators where applicable.
>
> > + reg = <0x20>;
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <RK_PC2 IRQ_TYPE_LEVEL_LOW>;
> > + pinctrl-names = "default", "pmic-sleep",
> > + "pmic-power-off", "pmic-reset";
> > + pinctrl-0 = <&pmic_int_l>;
> > + pinctrl-1 = <&soc_slppin_slp>, <&rk809_slppin_slp>;
> > + pinctrl-2 = <&soc_slppin_gpio>, <&rk809_slppin_pwrdn>;
> > + pinctrl-3 = <&soc_slppin_gpio>,<&rk809_slppin_null>;
> > + rockchip,system-power-controller;
> > + pmic-reset-func = <1>;
> > + wakeup-source;
> > + #clock-cells = <1>;
> > + clock-output-names = "rk808-clkout1", "rk808-clkout2";
> > +
> > + vcc1-supply = <&vcc5v0_sys>;
> > + vcc2-supply = <&vcc5v0_sys>;
> > + vcc3-supply = <&vcc5v0_sys>;
> > + vcc4-supply = <&vcc5v0_sys>;
> > + vcc5-supply = <&vcc_buck5>;
> > + vcc6-supply = <&vcc_buck5>;
> > + vcc7-supply = <&vcc3v3_sys>;
> > + vcc8-supply = <&vcc3v3_sys>;
> > + vcc9-supply = <&vcc5v0_sys>;
> > +
> > + pwrkey {
> > + status = "okay";
> > + };
> > +
> > + rtc {
> > + status = "okay";
> > + };
> > +
> > + pinctrl_rk8xx: pinctrl_rk8xx {
> > + gpio-controller;
> > + #gpio-cells = <2>;
> > +
> > + rk809_slppin_null: rk809_slppin_null {
> > + pins = "gpio_slp";
> > + function = "pin_fun0";
> > + };
> > +
> > + rk809_slppin_slp: rk809_slppin_slp {
> > + pins = "gpio_slp";
> > + function = "pin_fun1";
> > + };
> > +
> > + rk809_slppin_pwrdn: rk809_slppin_pwrdn {
> > + pins = "gpio_slp";
> > + function = "pin_fun2";
> > + };
> > +
> > + rk809_slppin_rst: rk809_slppin_rst {
> > + pins = "gpio_slp";
> > + function = "pin_fun3";
> > + };
> > + };
> > +
> > + regulators {
> > + vdd_center: DCDC_REG1 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <750000>;
> > + regulator-max-microvolt = <1350000>;
> > + regulator-initial-mode = <0x2>;
> > + regulator-name = "vdd_center";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <900000>;
> > + };
> > + };
> > +
> > + vdd_cpu_l: DCDC_REG2 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <750000>;
> > + regulator-max-microvolt = <1350000>;
> > + regulator-ramp-delay = <6001>;
> > + regulator-initial-mode = <0x2>;
> > + regulator-name = "vdd_cpu_l";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vcc_ddr: DCDC_REG3 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-name = "vcc_ddr";
> > + regulator-initial-mode = <0x2>;
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + };
> > + };
> > +
> > + vcc3v3_sys: DCDC_REG4 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + regulator-initial-mode = <0x2>;
> > + regulator-name = "vcc3v3_sys";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <3300000>;
> > + };
> > + };
> > +
> > + vcc_buck5: DCDC_REG5 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <2200000>;
> > + regulator-max-microvolt = <2200000>;
> > + regulator-name = "vcc_buck5";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <2200000>;
> > + };
> > + };
> > +
> > + vcca_0v9: LDO_REG1 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <900000>;
> > + regulator-max-microvolt = <900000>;
> > + regulator-name = "vcca_0v9";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vcc_1v8: LDO_REG2 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <1800000>;
> > +
> > + regulator-name = "vcc_1v8";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <1800000>;
> > + };
> > + };
> > +
> > + vcc0v9_soc: LDO_REG3 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <900000>;
> > + regulator-max-microvolt = <900000>;
> > +
> > + regulator-name = "vcc0v9_soc";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <900000>;
> > + };
> > + };
> > +
> > + vcca_1v8: LDO_REG4 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <1800000>;
> > +
> > + regulator-name = "vcca_1v8";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vdd1v5_dvp: LDO_REG5 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <1500000>;
> > + regulator-max-microvolt = <1500000>;
> > +
> > + regulator-name = "vdd1v5_dvp";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vcc_1v5: LDO_REG6 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <1500000>;
> > + regulator-max-microvolt = <1500000>;
> > +
> > + regulator-name = "vcc_1v5";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vcc_3v0: LDO_REG7 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <3000000>;
> > + regulator-max-microvolt = <3000000>;
> > +
> > + regulator-name = "vcc_3v0";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vccio_sd: LDO_REG8 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <3300000>;
> > +
> > + regulator-name = "vccio_sd";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <3300000>;
> > + };
> > + };
> > +
> > + vcc_sd: LDO_REG9 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > +
> > + regulator-name = "vcc_sd";
> > + regulator-state-mem {
> > + regulator-on-in-suspend;
> > + regulator-suspend-microvolt = <3300000>;
> > + };
> > + };
> > +
> > + vcc5v0_usb: SWITCH_REG1 {
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > +
> > + regulator-name = "vcc5v0_usb";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vccio_3v3: SWITCH_REG2 {
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > +
> > + regulator-name = "vccio_3v3";
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > + };
> > + };
> > +
> > + vdd_cpu_b: tcs452x@1c {
> > + compatible = "tcs,tcs452x";
>
> Again, there is no driver for this.
>
> > + reg = <0x1c>;
> > + vin-supply = <&vcc5v0_sys>;
> > + regulator-compatible = "fan53555-reg";
> > + pinctrl-0 = <&vsel1_gpio>;
> > + vsel-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
> > + regulator-name = "vdd_cpu_b";
> > + regulator-min-microvolt = <712500>;
> > + regulator-max-microvolt = <1500000>;
> > + regulator-ramp-delay = <2300>;
> > + fcs,suspend-voltage-selector = <1>;
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-initial-state = <3>;
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > + vdd_gpu: tcs452x@10 {
> > + compatible = "tcs,tcs452x";
>
> ditto.
>
> > + status = "okay";
> > + reg = <0x10>;
> > + vin-supply = <&vcc5v0_sys>;
> > + regulator-compatible = "fan53555-reg";
> > + pinctrl-0 = <&vsel2_gpio>;
> > + vsel-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
> > + regulator-name = "vdd_gpu";
> > + regulator-min-microvolt = <735000>;
> > + regulator-max-microvolt = <1400000>;
> > + regulator-ramp-delay = <2300>;
> > + fcs,suspend-voltage-selector = <1>;
> > + regulator-always-on;
> > + regulator-boot-on;
> > + regulator-state-mem {
> > + regulator-off-in-suspend;
> > + };
> > + };
> > +
> > +};
> > +
> > +&i2c8 {
> > + status = "okay";
> > + i2c-scl-rising-time-ns = <345>;
> > + i2c-scl-falling-time-ns = <11>;
> > + clock-frequency = <100000>;
> > +
> > + fusb0: fusb30x@22 {
> > + compatible = "fairchild,fusb302";
>
> ditto, please remove.
>
> > + reg = <0x22>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&fusb0_int>;
> > + int-n-gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
> > + vbus-5v-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > + };
> > +
> > +};
> > +
> > +&io_domains {
> > + status = "okay";
> > + bt656-supply = <&vcca_1v8>; /* APIO2_VDD */
> > + audio-supply = <&vcca_1v8>; /* APIO5_VDD */
> > + sdmmc-supply = <&vccio_sd>; /* SDMMC0_VDD */
> > + gpio1830-supply = <&vcc_1v8>; /* APIO4_VDD */
> > +};
> > +
> > +&pinctrl {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&npu_ref_clk>;
> > +
> > + fusb30x {
> > + fusb0_int: fusb0-int {
> > + rockchip,pins =
> > + <1 RK_PA2 0 &pcfg_pull_up>;
> > + };
> > + };
>
> not needed.
>
> > +
> > + gpio-leds {
> > + leds_gpio: leds-gpio {
> > + rockchip,pins =
> > + <2 5 RK_FUNC_GPIO &pcfg_pull_up>,
> > + <2 4 RK_FUNC_GPIO &pcfg_pull_up>,
> > + <2 3 RK_FUNC_GPIO &pcfg_pull_up>;
>
> I don't think we need pull-up here.
>
> > + };
> > + };
> > +
> > + npu_clk {
> > + npu_ref_clk: npu-ref-clk {
> > + rockchip,pins =
> > + <0 RK_PA2 1 &pcfg_pull_none>;
> > + };
> > + };
> > +
> > + pmic {
> > + pmic_int_l: pmic-int-l {
> > + rockchip,pins =
> > + <1 RK_PC2 0 &pcfg_pull_up>;
> > + };
> > +
> > + soc_slppin_gpio: soc-slppin-gpio {
> > + rockchip,pins =
> > + <1 RK_PA5 0 &pcfg_output_low>;
> > + };
> > +
> > + soc_slppin_slp: soc-slppin-slp {
> > + rockchip,pins =
> > + <1 RK_PA5 1 &pcfg_pull_down>;
> > + };
> > +
> > + vsel1_gpio: vsel1-gpio {
> > + rockchip,pins =
> > + <1 RK_PC1 0 &pcfg_pull_down>;
> > + };
> > +
> > + vsel2_gpio: vsel2-gpio {
> > + rockchip,pins =
> > + <1 RK_PB6 0 &pcfg_pull_down>;
> > + };
> > + };
>
> not needed.
>
> > +
> > + usb3 {
> > + usb3_host_en: usb3-host-en {
> > + rockchip,pins =
> > + <2 RK_PA2 RK_FUNC_GPIO &pcfg_output_high>;
> > + };
> > + };
> > +};
> > +
> > +&pmu_io_domains {
> > + status = "okay";
> > + pmu1830-supply = <&vcc_1v8>;
> > +};
> > +
> > +&pwm0 {
> > + status = "okay";
> > +};
> > +
> > +&pwm2 {
> > + status = "okay";
> > +};
> > +
> > +&saradc {
> > + status = "okay";
> > + vref-supply = <&vcc_1v8>;
> > +};
> > +
> > +&sdhci {
> > + bus-width = <8>;
> > + mmc-hs400-1_8v;
> > + supports-emmc;
>
> there is no such property, so please remove. Since this controller is
> used for emmc, you can use "no-sd" and "no-sdio" properties if needed.
>
> > + non-removable;
> > + keep-power-in-suspend;
> > + mmc-hs400-enhanced-strobe;
> > + status = "okay";
> > +};
> > +
> > +&sdmmc {
> > + clock-frequency = <150000000>;
> > + clock-freq-min-max = <400000 150000000>;
> > + supports-sd;
>
> Same as above, property not available. Use, "no-sdio" and "no-emmc" if
> needed.
>
> > + bus-width = <4>;
> > + cap-mmc-highspeed;
> > + cap-sd-highspeed;
> > + disable-wp;
> > + num-slots = <1>;
>
> not needed.
>
> > + vqmmc-supply = <&vccio_sd>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
> > + status = "okay";
> > +};
> > +
> > +&tcphy0 {
> > + extcon = <&fusb0>;
> > + status = "okay";
> > +};
> > +
> > +&tcphy1 {
> > + status = "okay";
> > +};
> > +
> > +&tsadc {
> > + rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
> > + rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
>
> Any clue about shutdown temperature? Not necessary now but good to have.
>
> Thanks,
> Mani
> > + status = "okay";
> > +};
> > +
> > +&u2phy0 {
> > + status = "okay";
> > + extcon = <&fusb0>;
> > +
> > + u2phy0_otg: otg-port {
> > + status = "okay";
> > + };
> > +
> > + u2phy0_host: host-port {
> > + phy-supply = <&vcc5v0_usb>;
> > + status = "okay";
> > + };
> > +};
> > +
> > +&u2phy1 {
> > + status = "okay";
> > +
> > + u2phy1_otg: otg-port {
> > + status = "okay";
> > + };
> > +
> > + u2phy1_host: host-port {
> > + phy-supply = <&vcc5v0_usb>;
> > + status = "okay";
> > + };
> > +};
> > +
> > +&uart0 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&uart0_xfer &uart0_cts>;
> > + status = "okay";
> > +};
> > +
> > +&uart2 {
> > + status = "okay";
> > +};
> > +
> > +&uart4 {
> > + status = "okay";
> > +};
> > +
> > +&usb_host0_ehci {
> > + status = "okay";
> > +};
> > +
> > +&usb_host1_ehci {
> > + status = "okay";
> > +};
> > +
> > +&usb_host0_ohci {
> > + status = "okay";
> > +};
> > +
> > +&usb_host1_ohci {
> > + status = "okay";
> > +};
> > +
> > +&usbdrd3_0 {
> > + extcon = <&fusb0>;
> > + status = "okay";
> > +};
> > +
> > +&usbdrd3_1 {
> > + status = "okay";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&usb3_host_en>;
> > +};
> > +
> > +&usbdrd_dwc3_0 {
> > + status = "okay";
> > +};
> > +
> > +&usbdrd_dwc3_1 {
> > + snps,dis-u3-autosuspend-quirk;
> > + status = "okay";
> > +};
> > +
> > --
> > 2.17.1
> >
> >
> >