diff --git a/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts b/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts index 4abffe687aef..e160ec157a88 100644 --- a/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts +++ b/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts @@ -5,16 +5,13 @@ /dts-v1/; #include "rv1126.dtsi" +#include "rv11xx-ipc.dtsi" #include / { model = "Rockchip RV1126 IPC2 DDR3 V10 Board"; compatible = "rockchip,rv1126-ipc2-ddr3-v10", "rockchip,rv1126"; - chosen { - bootargs = "earlycon=uart8250,mmio32,0xff570000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_aloop.index=7"; - }; - adc-keys { compatible = "adc-keys"; io-channels = <&saradc 0>; @@ -49,47 +46,6 @@ sound-dai = <&rk809_codec>; }; }; - - 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_npu: vdd-npu { - compatible = "pwm-regulator"; - pwms = <&pwm0 0 5000 1>; - regulator-name = "vdd_npu"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <950000>; - regulator-init-microvolt = <800000>; - regulator-always-on; - regulator-boot-on; - regulator-settling-time-up-us = <250>; - pwm-supply = <&vcc5v0_sys>; - status = "okay"; - }; - - vdd_vepu: vdd-vepu { - compatible = "pwm-regulator"; - pwms = <&pwm1 0 5000 1>; - regulator-name = "vdd_vepu"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <950000>; - regulator-init-microvolt = <800000>; - regulator-always-on; - regulator-boot-on; - regulator-settling-time-up-us = <250>; - pwm-supply = <&vcc5v0_sys>; - status = "okay"; - }; -}; - -&cpu0 { - cpu-supply = <&vdd_arm>; }; &emmc { @@ -104,10 +60,6 @@ status = "okay"; }; -&fiq_debugger { - status = "okay"; -}; - &gmac { phy-mode = "rmii"; clock_in_out = "output"; @@ -392,43 +344,6 @@ }; }; -&mpp_srv { - status = "okay"; -}; - -&npu { - npu-supply = <&vdd_npu>; - status = "okay"; -}; - -&pinctrl { - pmic { - /omit-if-no-ref/ - pmic_int: pmic_int { - rockchip,pins = - <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - /omit-if-no-ref/ - soc_slppin_gpio: soc_slppin_gpio { - rockchip,pins = - <0 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; - }; - - /omit-if-no-ref/ - soc_slppin_slp: soc_slppin_slp { - rockchip,pins = - <0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>; - }; - - /omit-if-no-ref/ - soc_slppin_rst: soc_slppin_rst { - rockchip,pins = - <0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>; - }; - }; -}; - &pmu_io_domains { status = "okay"; @@ -440,46 +355,7 @@ vccio7-supply = <&vcc_1v8>; }; -&pwm0 { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm0m0_pins_pull_down>; -}; - -&pwm1 { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm1m0_pins_pull_down>; -}; - -&ramoops { - status = "okay"; -}; - -&rk_rga { - status = "okay"; -}; - -&rkvenc { - status = "okay"; -}; - -&rkvenc_mmu { - status = "okay"; -}; - &saradc { status = "okay"; vref-supply = <&vcc_1v8>; }; - -&usbdrd { - status = "okay"; -}; - -&usbdrd_dwc3 { - status = "okay"; - /delete-property/ phys; - dr_mode = "peripheral"; -}; - diff --git a/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts b/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts index d847e1610936..1e349773defe 100644 --- a/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts +++ b/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts @@ -5,16 +5,13 @@ /dts-v1/; #include "rv1126.dtsi" +#include "rv11xx-ipc.dtsi" #include / { model = "Rockchip RV1126 SPHERICALIPC DDR3 V10 Board"; compatible = "rockchip,rv1126-sphericalipc-ddr3-v10", "rockchip,rv1126"; - chosen { - bootargs = "clk_ignore_unused earlycon=uart8250,mmio32,0xff570000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_aloop.index=7"; - }; - adc-keys { compatible = "adc-keys"; io-channels = <&saradc 0>; @@ -49,47 +46,6 @@ sound-dai = <&rk809_codec>; }; }; - - 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_npu: vdd-npu { - compatible = "pwm-regulator"; - pwms = <&pwm0 0 5000 1>; - regulator-name = "vdd_npu"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <950000>; - regulator-init-microvolt = <800000>; - regulator-always-on; - regulator-boot-on; - regulator-settling-time-up-us = <250>; - pwm-supply = <&vcc5v0_sys>; - status = "okay"; - }; - - vdd_vepu: vdd-vepu { - compatible = "pwm-regulator"; - pwms = <&pwm1 0 5000 1>; - regulator-name = "vdd_vepu"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <950000>; - regulator-init-microvolt = <800000>; - regulator-always-on; - regulator-boot-on; - regulator-settling-time-up-us = <250>; - pwm-supply = <&vcc5v0_sys>; - status = "okay"; - }; -}; - -&cpu0 { - cpu-supply = <&vdd_arm>; }; &emmc { @@ -104,10 +60,6 @@ status = "okay"; }; -&fiq_debugger { - status = "okay"; -}; - &gmac { phy-mode = "rmii"; clock_in_out = "output"; @@ -396,43 +348,6 @@ }; }; -&mpp_srv { - status = "okay"; -}; - -&npu { - npu-supply = <&vdd_npu>; - status = "okay"; -}; - -&pinctrl { - pmic { - /omit-if-no-ref/ - pmic_int: pmic_int { - rockchip,pins = - <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - /omit-if-no-ref/ - soc_slppin_gpio: soc_slppin_gpio { - rockchip,pins = - <0 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; - }; - - /omit-if-no-ref/ - soc_slppin_slp: soc_slppin_slp { - rockchip,pins = - <0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>; - }; - - /omit-if-no-ref/ - soc_slppin_rst: soc_slppin_rst { - rockchip,pins = - <0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>; - }; - }; -}; - &pmu_io_domains { status = "okay"; @@ -445,34 +360,6 @@ vccio7-supply = <&vcc_1v8>; }; -&pwm0 { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm0m0_pins_pull_down>; -}; - -&pwm1 { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm1m0_pins_pull_down>; -}; - -&ramoops { - status = "okay"; -}; - -&rk_rga { - status = "okay"; -}; - -&rkvenc { - status = "okay"; -}; - -&rkvenc_mmu { - status = "okay"; -}; - &saradc { status = "okay"; vref-supply = <&vcc_1v8>; @@ -491,14 +378,3 @@ vqmmc-supply = <&vccio_sd>; status = "okay"; }; - -&usbdrd { - status = "okay"; -}; - -&usbdrd_dwc3 { - status = "okay"; - /delete-property/ phys; - dr_mode = "peripheral"; -}; - diff --git a/arch/arm/boot/dts/rv11xx-ipc.dtsi b/arch/arm/boot/dts/rv11xx-ipc.dtsi new file mode 100644 index 000000000000..54fab59b8151 --- /dev/null +++ b/arch/arm/boot/dts/rv11xx-ipc.dtsi @@ -0,0 +1,202 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd. + */ + +/ { + chosen { + bootargs = "earlycon=uart8250,mmio32,0xff570000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_aloop.index=7"; + }; + + 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_npu: vdd-npu { + compatible = "pwm-regulator"; + pwms = <&pwm0 0 5000 1>; + regulator-name = "vdd_npu"; + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <950000>; + regulator-init-microvolt = <800000>; + regulator-always-on; + regulator-boot-on; + regulator-settling-time-up-us = <250>; + pwm-supply = <&vcc5v0_sys>; + status = "okay"; + }; + + vdd_vepu: vdd-vepu { + compatible = "pwm-regulator"; + pwms = <&pwm1 0 5000 1>; + regulator-name = "vdd_vepu"; + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <950000>; + regulator-init-microvolt = <800000>; + regulator-always-on; + regulator-boot-on; + regulator-settling-time-up-us = <250>; + pwm-supply = <&vcc5v0_sys>; + status = "okay"; + }; +}; + +&cpu0 { + cpu-supply = <&vdd_arm>; +}; + +&display_subsystem { + status = "okay"; +}; + +&fiq_debugger { + status = "okay"; +}; + +&mpp_srv { + status = "okay"; +}; + +&nandc { + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + + nand@0 { + reg = <0>; + nand-bus-width = <8>; + nand-ecc-mode = "hw"; + nand-ecc-strength = <16>; + nand-ecc-step-size = <1024>; + }; +}; + +&npu { + npu-supply = <&vdd_npu>; + status = "okay"; +}; + +&optee { + status = "disabled"; +}; + +&pinctrl { + pmic { + /omit-if-no-ref/ + pmic_int: pmic_int { + rockchip,pins = + <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + /omit-if-no-ref/ + soc_slppin_gpio: soc_slppin_gpio { + rockchip,pins = + <0 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; + }; + + /omit-if-no-ref/ + soc_slppin_slp: soc_slppin_slp { + rockchip,pins = + <0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>; + }; + + /omit-if-no-ref/ + soc_slppin_rst: soc_slppin_rst { + rockchip,pins = + <0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>; + }; + }; +}; + +&pwm0 { + status = "okay"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm0m0_pins_pull_down>; +}; + +&pwm1 { + status = "okay"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm1m0_pins_pull_down>; +}; + +&ramoops { + status = "okay"; +}; + +&rk_rga { + status = "okay"; +}; + +&rkisp { + status = "okay"; +}; + +&rkisp_mmu { + status = "okay"; +}; + +&rkispp { + status = "okay"; +}; + +&rkispp_mmu { + status = "okay"; +}; + +&rkvdec { + status = "okay"; +}; + +&rkvdec_mmu { + status = "okay"; +}; + +&rkvenc { + status = "okay"; +}; + +&rkvenc_mmu { + status = "okay"; +}; + +&rng { + status = "okay"; +}; + +&u2phy0 { + status = "okay"; + u2phy_otg: otg-port { + status = "okay"; + }; +}; + +&usbdrd { + status = "okay"; +}; + +&usbdrd_dwc3 { + status = "okay"; + extcon = <&u2phy0>; +}; + +&vdpu { + status = "okay"; +}; + +&vepu { + status = "okay"; +}; + +&vpu_mmu { + status = "okay"; +}; + +&vop { + status = "okay"; +};