]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: px30/rk3326: Use soc dtsi files from dts/upstream
authorJonas Karlman <jonas@kwiboo.se>
Thu, 25 Jul 2024 09:46:03 +0000 (09:46 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Fri, 9 Aug 2024 10:35:23 +0000 (18:35 +0800)
The commit f087f7fd277d ("rockchip: px30/rk3326: migrate to
OF_UPSTREAM") migrated px30/rk3326 boards to use OF_UPSTREAM, however
the soc dtsi and dt-bindings files remained.

Remove the remaining px30/rk3326 soc dtsi and dt-bindings to ensure the
files from dts/upstream is used.

The gpio-ranges props is moved to u-boot.dtsi files and a ethernet0
alias is added to px30-firefly, they are missing in the dts/upstream
files. No changes are expected with this.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
arch/arm/dts/px30-firefly.dts
arch/arm/dts/px30-u-boot.dtsi
arch/arm/dts/px30.dtsi [deleted file]
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
arch/arm/dts/rk3326.dtsi [deleted file]
include/dt-bindings/clock/px30-cru.h [deleted file]
include/dt-bindings/power/px30-power.h [deleted file]

index c0a8e3009ad6632ae4f79d1ee2c17bc4366a7b08..e678d6a0b28d19ab7f941ebe52e6ce0897f8b350 100644 (file)
        model = "Firefly Core-PX30-JD4";
        compatible = "rockchip,px30-firefly", "rockchip,px30";
 
+       aliases {
+               ethernet0 = &gmac;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index 59fa9f43a9764eb4c14ddbe8b3685837f1a962f7..abc6b49e6663ccfbc5659f0467c511934832da67 100644 (file)
 
 &gpio0 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 0 32>;
 };
 
 &gpio1 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 32 32>;
 };
 
 &gpio2 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 64 32>;
 };
 
 &gpio3 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 96 32>;
 };
diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi
deleted file mode 100644 (file)
index 3152bf1..0000000
+++ /dev/null
@@ -1,2415 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/clock/px30-cru.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/rockchip.h>
-#include <dt-bindings/power/px30-power.h>
-#include <dt-bindings/soc/rockchip,boot-mode.h>
-#include <dt-bindings/thermal/thermal.h>
-
-/ {
-       compatible = "rockchip,px30";
-
-       interrupt-parent = <&gic>;
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       aliases {
-               ethernet0 = &gmac;
-               i2c0 = &i2c0;
-               i2c1 = &i2c1;
-               i2c2 = &i2c2;
-               i2c3 = &i2c3;
-               serial0 = &uart0;
-               serial1 = &uart1;
-               serial2 = &uart2;
-               serial3 = &uart3;
-               serial4 = &uart4;
-               serial5 = &uart5;
-               spi0 = &spi0;
-               spi1 = &spi1;
-       };
-
-       cpus {
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               cpu0: cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a35";
-                       reg = <0x0 0x0>;
-                       enable-method = "psci";
-                       clocks = <&cru ARMCLK>;
-                       #cooling-cells = <2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
-                       dynamic-power-coefficient = <90>;
-                       operating-points-v2 = <&cpu0_opp_table>;
-               };
-
-               cpu1: cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a35";
-                       reg = <0x0 0x1>;
-                       enable-method = "psci";
-                       clocks = <&cru ARMCLK>;
-                       #cooling-cells = <2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
-                       dynamic-power-coefficient = <90>;
-                       operating-points-v2 = <&cpu0_opp_table>;
-               };
-
-               cpu2: cpu@2 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a35";
-                       reg = <0x0 0x2>;
-                       enable-method = "psci";
-                       clocks = <&cru ARMCLK>;
-                       #cooling-cells = <2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
-                       dynamic-power-coefficient = <90>;
-                       operating-points-v2 = <&cpu0_opp_table>;
-               };
-
-               cpu3: cpu@3 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a35";
-                       reg = <0x0 0x3>;
-                       enable-method = "psci";
-                       clocks = <&cru ARMCLK>;
-                       #cooling-cells = <2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
-                       dynamic-power-coefficient = <90>;
-                       operating-points-v2 = <&cpu0_opp_table>;
-               };
-
-               idle-states {
-                       entry-method = "psci";
-
-                       CPU_SLEEP: cpu-sleep {
-                               compatible = "arm,idle-state";
-                               local-timer-stop;
-                               arm,psci-suspend-param = <0x0010000>;
-                               entry-latency-us = <120>;
-                               exit-latency-us = <250>;
-                               min-residency-us = <900>;
-                       };
-
-                       CLUSTER_SLEEP: cluster-sleep {
-                               compatible = "arm,idle-state";
-                               local-timer-stop;
-                               arm,psci-suspend-param = <0x1010000>;
-                               entry-latency-us = <400>;
-                               exit-latency-us = <500>;
-                               min-residency-us = <2000>;
-                       };
-               };
-       };
-
-       cpu0_opp_table: opp-table-0 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-600000000 {
-                       opp-hz = /bits/ 64 <600000000>;
-                       opp-microvolt = <950000 950000 1350000>;
-                       clock-latency-ns = <40000>;
-                       opp-suspend;
-               };
-               opp-816000000 {
-                       opp-hz = /bits/ 64 <816000000>;
-                       opp-microvolt = <1050000 1050000 1350000>;
-                       clock-latency-ns = <40000>;
-               };
-               opp-1008000000 {
-                       opp-hz = /bits/ 64 <1008000000>;
-                       opp-microvolt = <1175000 1175000 1350000>;
-                       clock-latency-ns = <40000>;
-               };
-               opp-1200000000 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <1300000 1300000 1350000>;
-                       clock-latency-ns = <40000>;
-               };
-               opp-1296000000 {
-                       opp-hz = /bits/ 64 <1296000000>;
-                       opp-microvolt = <1350000 1350000 1350000>;
-                       clock-latency-ns = <40000>;
-               };
-       };
-
-       arm-pmu {
-               compatible = "arm,cortex-a35-pmu";
-               interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
-       };
-
-       display_subsystem: display-subsystem {
-               compatible = "rockchip,display-subsystem";
-               ports = <&vopb_out>, <&vopl_out>;
-               status = "disabled";
-       };
-
-       gmac_clkin: external-gmac-clock {
-               compatible = "fixed-clock";
-               clock-frequency = <50000000>;
-               clock-output-names = "gmac_clkin";
-               #clock-cells = <0>;
-       };
-
-       psci {
-               compatible = "arm,psci-1.0";
-               method = "smc";
-       };
-
-       timer {
-               compatible = "arm,armv8-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-       };
-
-       thermal_zones: thermal-zones {
-               soc_thermal: soc-thermal {
-                       polling-delay-passive = <20>;
-                       polling-delay = <1000>;
-                       sustainable-power = <750>;
-                       thermal-sensors = <&tsadc 0>;
-
-                       trips {
-                               threshold: trip-point-0 {
-                                       temperature = <70000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               target: trip-point-1 {
-                                       temperature = <85000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               soc_crit: soc-crit {
-                                       temperature = <115000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-
-                       cooling-maps {
-                               map0 {
-                                       trip = <&target>;
-                                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-                                       contribution = <4096>;
-                               };
-
-                               map1 {
-                                       trip = <&target>;
-                                       cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-                                       contribution = <4096>;
-                               };
-                       };
-               };
-
-               gpu_thermal: gpu-thermal {
-                       polling-delay-passive = <100>; /* milliseconds */
-                       polling-delay = <1000>; /* milliseconds */
-                       thermal-sensors = <&tsadc 1>;
-               };
-       };
-
-       xin24m: xin24m {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <24000000>;
-               clock-output-names = "xin24m";
-       };
-
-       pmu: power-management@ff000000 {
-               compatible = "rockchip,px30-pmu", "syscon", "simple-mfd";
-               reg = <0x0 0xff000000 0x0 0x1000>;
-
-               power: power-controller {
-                       compatible = "rockchip,px30-power-controller";
-                       #power-domain-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       /* These power domains are grouped by VD_LOGIC */
-                       power-domain@PX30_PD_USB {
-                               reg = <PX30_PD_USB>;
-                               clocks = <&cru HCLK_HOST>,
-                                        <&cru HCLK_OTG>,
-                                        <&cru SCLK_OTG_ADP>;
-                               pm_qos = <&qos_usb_host>, <&qos_usb_otg>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_SDCARD {
-                               reg = <PX30_PD_SDCARD>;
-                               clocks = <&cru HCLK_SDMMC>,
-                                        <&cru SCLK_SDMMC>;
-                               pm_qos = <&qos_sdmmc>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_GMAC {
-                               reg = <PX30_PD_GMAC>;
-                               clocks = <&cru ACLK_GMAC>,
-                                        <&cru PCLK_GMAC>,
-                                        <&cru SCLK_MAC_REF>,
-                                        <&cru SCLK_GMAC_RX_TX>;
-                               pm_qos = <&qos_gmac>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_MMC_NAND {
-                               reg = <PX30_PD_MMC_NAND>;
-                               clocks =  <&cru HCLK_NANDC>,
-                                         <&cru HCLK_EMMC>,
-                                         <&cru HCLK_SDIO>,
-                                         <&cru HCLK_SFC>,
-                                         <&cru SCLK_EMMC>,
-                                         <&cru SCLK_NANDC>,
-                                         <&cru SCLK_SDIO>,
-                                         <&cru SCLK_SFC>;
-                               pm_qos = <&qos_emmc>, <&qos_nand>,
-                                        <&qos_sdio>, <&qos_sfc>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_VPU {
-                               reg = <PX30_PD_VPU>;
-                               clocks = <&cru ACLK_VPU>,
-                                        <&cru HCLK_VPU>,
-                                        <&cru SCLK_CORE_VPU>;
-                               pm_qos = <&qos_vpu>, <&qos_vpu_r128>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_VO {
-                               reg = <PX30_PD_VO>;
-                               clocks = <&cru ACLK_RGA>,
-                                        <&cru ACLK_VOPB>,
-                                        <&cru ACLK_VOPL>,
-                                        <&cru DCLK_VOPB>,
-                                        <&cru DCLK_VOPL>,
-                                        <&cru HCLK_RGA>,
-                                        <&cru HCLK_VOPB>,
-                                        <&cru HCLK_VOPL>,
-                                        <&cru PCLK_MIPI_DSI>,
-                                        <&cru SCLK_RGA_CORE>,
-                                        <&cru SCLK_VOPB_PWM>;
-                               pm_qos = <&qos_rga_rd>, <&qos_rga_wr>,
-                                        <&qos_vop_m0>, <&qos_vop_m1>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_VI {
-                               reg = <PX30_PD_VI>;
-                               clocks = <&cru ACLK_CIF>,
-                                        <&cru ACLK_ISP>,
-                                        <&cru HCLK_CIF>,
-                                        <&cru HCLK_ISP>,
-                                        <&cru SCLK_ISP>;
-                               pm_qos = <&qos_isp_128>, <&qos_isp_rd>,
-                                        <&qos_isp_wr>, <&qos_isp_m1>,
-                                        <&qos_vip>;
-                               #power-domain-cells = <0>;
-                       };
-                       power-domain@PX30_PD_GPU {
-                               reg = <PX30_PD_GPU>;
-                               clocks = <&cru SCLK_GPU>;
-                               pm_qos = <&qos_gpu>;
-                               #power-domain-cells = <0>;
-                       };
-               };
-       };
-
-       pmugrf: syscon@ff010000 {
-               compatible = "rockchip,px30-pmugrf", "syscon", "simple-mfd";
-               reg = <0x0 0xff010000 0x0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               pmu_io_domains: io-domains {
-                       compatible = "rockchip,px30-pmu-io-voltage-domain";
-                       status = "disabled";
-               };
-
-               reboot-mode {
-                       compatible = "syscon-reboot-mode";
-                       offset = <0x200>;
-                       mode-bootloader = <BOOT_BL_DOWNLOAD>;
-                       mode-fastboot = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_BL_DOWNLOAD>;
-                       mode-normal = <BOOT_NORMAL>;
-                       mode-recovery = <BOOT_RECOVERY>;
-               };
-       };
-
-       uart0: serial@ff030000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff030000 0x0 0x100>;
-               interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&pmucru SCLK_UART0_PMU>, <&pmucru PCLK_UART0_PMU>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 0>, <&dmac 1>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
-               status = "disabled";
-       };
-
-       i2s0_8ch: i2s@ff060000 {
-               compatible = "rockchip,px30-i2s-tdm";
-               reg = <0x0 0xff060000 0x0 0x1000>;
-               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_I2S0_TX>, <&cru SCLK_I2S0_RX>, <&cru HCLK_I2S0>;
-               clock-names = "mclk_tx", "mclk_rx", "hclk";
-               dmas = <&dmac 16>, <&dmac 17>;
-               dma-names = "tx", "rx";
-               rockchip,grf = <&grf>;
-               resets = <&cru SRST_I2S0_TX>, <&cru SRST_I2S0_RX>;
-               reset-names = "tx-m", "rx-m";
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2s0_8ch_sclktx &i2s0_8ch_sclkrx
-                            &i2s0_8ch_lrcktx &i2s0_8ch_lrckrx
-                            &i2s0_8ch_sdo0 &i2s0_8ch_sdi0
-                            &i2s0_8ch_sdo1 &i2s0_8ch_sdi1
-                            &i2s0_8ch_sdo2 &i2s0_8ch_sdi2
-                            &i2s0_8ch_sdo3 &i2s0_8ch_sdi3>;
-               #sound-dai-cells = <0>;
-               status = "disabled";
-       };
-
-       i2s1_2ch: i2s@ff070000 {
-               compatible = "rockchip,px30-i2s", "rockchip,rk3066-i2s";
-               reg = <0x0 0xff070000 0x0 0x1000>;
-               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1>;
-               clock-names = "i2s_clk", "i2s_hclk";
-               dmas = <&dmac 18>, <&dmac 19>;
-               dma-names = "tx", "rx";
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2s1_2ch_sclk &i2s1_2ch_lrck
-                            &i2s1_2ch_sdi &i2s1_2ch_sdo>;
-               #sound-dai-cells = <0>;
-               status = "disabled";
-       };
-
-       i2s2_2ch: i2s@ff080000 {
-               compatible = "rockchip,px30-i2s", "rockchip,rk3066-i2s";
-               reg = <0x0 0xff080000 0x0 0x1000>;
-               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2>;
-               clock-names = "i2s_clk", "i2s_hclk";
-               dmas = <&dmac 20>, <&dmac 21>;
-               dma-names = "tx", "rx";
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2s2_2ch_sclk &i2s2_2ch_lrck
-                            &i2s2_2ch_sdi &i2s2_2ch_sdo>;
-               #sound-dai-cells = <0>;
-               status = "disabled";
-       };
-
-       gic: interrupt-controller@ff131000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;
-               #address-cells = <0>;
-               interrupt-controller;
-               reg = <0x0 0xff131000 0 0x1000>,
-                     <0x0 0xff132000 0 0x2000>,
-                     <0x0 0xff134000 0 0x2000>,
-                     <0x0 0xff136000 0 0x2000>;
-               interrupts = <GIC_PPI 9
-                     (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-       };
-
-       grf: syscon@ff140000 {
-               compatible = "rockchip,px30-grf", "syscon", "simple-mfd";
-               reg = <0x0 0xff140000 0x0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               io_domains: io-domains {
-                       compatible = "rockchip,px30-io-voltage-domain";
-                       status = "disabled";
-               };
-
-               lvds: lvds {
-                       compatible = "rockchip,px30-lvds";
-                       phys = <&dsi_dphy>;
-                       phy-names = "dphy";
-                       rockchip,grf = <&grf>;
-                       rockchip,output = "lvds";
-                       status = "disabled";
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       lvds_vopb_in: endpoint@0 {
-                                               reg = <0>;
-                                               remote-endpoint = <&vopb_out_lvds>;
-                                       };
-
-                                       lvds_vopl_in: endpoint@1 {
-                                               reg = <1>;
-                                               remote-endpoint = <&vopl_out_lvds>;
-                                       };
-                               };
-                       };
-               };
-       };
-
-       uart1: serial@ff158000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff158000 0x0 0x100>;
-               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 2>, <&dmac 3>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;
-               status = "disabled";
-       };
-
-       uart2: serial@ff160000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff160000 0x0 0x100>;
-               interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 4>, <&dmac 5>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart2m0_xfer>;
-               status = "disabled";
-       };
-
-       uart3: serial@ff168000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff168000 0x0 0x100>;
-               interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 6>, <&dmac 7>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart3m1_xfer &uart3m1_cts &uart3m1_rts>;
-               status = "disabled";
-       };
-
-       uart4: serial@ff170000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff170000 0x0 0x100>;
-               interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 8>, <&dmac 9>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart4_xfer &uart4_cts &uart4_rts>;
-               status = "disabled";
-       };
-
-       uart5: serial@ff178000 {
-               compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
-               reg = <0x0 0xff178000 0x0 0x100>;
-               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_UART5>, <&cru PCLK_UART5>;
-               clock-names = "baudclk", "apb_pclk";
-               dmas = <&dmac 10>, <&dmac 11>;
-               dma-names = "tx", "rx";
-               reg-shift = <2>;
-               reg-io-width = <4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart5_xfer &uart5_cts &uart5_rts>;
-               status = "disabled";
-       };
-
-       i2c0: i2c@ff180000 {
-               compatible = "rockchip,px30-i2c", "rockchip,rk3399-i2c";
-               reg = <0x0 0xff180000 0x0 0x1000>;
-               clocks = <&cru SCLK_I2C0>, <&cru PCLK_I2C0>;
-               clock-names = "i2c", "pclk";
-               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c0_xfer>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       i2c1: i2c@ff190000 {
-               compatible = "rockchip,px30-i2c", "rockchip,rk3399-i2c";
-               reg = <0x0 0xff190000 0x0 0x1000>;
-               clocks = <&cru SCLK_I2C1>, <&cru PCLK_I2C1>;
-               clock-names = "i2c", "pclk";
-               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c1_xfer>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       i2c2: i2c@ff1a0000 {
-               compatible = "rockchip,px30-i2c", "rockchip,rk3399-i2c";
-               reg = <0x0 0xff1a0000 0x0 0x1000>;
-               clocks = <&cru SCLK_I2C2>, <&cru PCLK_I2C2>;
-               clock-names = "i2c", "pclk";
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c2_xfer>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       i2c3: i2c@ff1b0000 {
-               compatible = "rockchip,px30-i2c", "rockchip,rk3399-i2c";
-               reg = <0x0 0xff1b0000 0x0 0x1000>;
-               clocks = <&cru SCLK_I2C3>, <&cru PCLK_I2C3>;
-               clock-names = "i2c", "pclk";
-               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c3_xfer>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       spi0: spi@ff1d0000 {
-               compatible = "rockchip,px30-spi", "rockchip,rk3066-spi";
-               reg = <0x0 0xff1d0000 0x0 0x1000>;
-               interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
-               clock-names = "spiclk", "apb_pclk";
-               dmas = <&dmac 12>, <&dmac 13>;
-               dma-names = "tx", "rx";
-               pinctrl-names = "default";
-               pinctrl-0 = <&spi0_clk &spi0_csn &spi0_miso &spi0_mosi>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       spi1: spi@ff1d8000 {
-               compatible = "rockchip,px30-spi", "rockchip,rk3066-spi";
-               reg = <0x0 0xff1d8000 0x0 0x1000>;
-               interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>;
-               clock-names = "spiclk", "apb_pclk";
-               dmas = <&dmac 14>, <&dmac 15>;
-               dma-names = "tx", "rx";
-               pinctrl-names = "default";
-               pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       wdt: watchdog@ff1e0000 {
-               compatible = "rockchip,px30-wdt", "snps,dw-wdt";
-               reg = <0x0 0xff1e0000 0x0 0x100>;
-               clocks = <&cru PCLK_WDT_NS>;
-               interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-               status = "disabled";
-       };
-
-       pwm0: pwm@ff200000 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff200000 0x0 0x10>;
-               clocks = <&cru SCLK_PWM0>, <&cru PCLK_PWM0>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm0_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm1: pwm@ff200010 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff200010 0x0 0x10>;
-               clocks = <&cru SCLK_PWM0>, <&cru PCLK_PWM0>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm1_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm2: pwm@ff200020 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff200020 0x0 0x10>;
-               clocks = <&cru SCLK_PWM0>, <&cru PCLK_PWM0>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm2_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm3: pwm@ff200030 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff200030 0x0 0x10>;
-               clocks = <&cru SCLK_PWM0>, <&cru PCLK_PWM0>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm3_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm4: pwm@ff208000 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff208000 0x0 0x10>;
-               clocks = <&cru SCLK_PWM1>, <&cru PCLK_PWM1>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm4_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm5: pwm@ff208010 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff208010 0x0 0x10>;
-               clocks = <&cru SCLK_PWM1>, <&cru PCLK_PWM1>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm5_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm6: pwm@ff208020 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff208020 0x0 0x10>;
-               clocks = <&cru SCLK_PWM1>, <&cru PCLK_PWM1>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm6_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm7: pwm@ff208030 {
-               compatible = "rockchip,px30-pwm", "rockchip,rk3328-pwm";
-               reg = <0x0 0xff208030 0x0 0x10>;
-               clocks = <&cru SCLK_PWM1>, <&cru PCLK_PWM1>;
-               clock-names = "pwm", "pclk";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwm7_pin>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       rktimer: timer@ff210000 {
-               compatible = "rockchip,px30-timer", "rockchip,rk3288-timer";
-               reg = <0x0 0xff210000 0x0 0x1000>;
-               interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru PCLK_TIMER>, <&cru SCLK_TIMER0>;
-               clock-names = "pclk", "timer";
-       };
-
-       dmac: dma-controller@ff240000 {
-               compatible = "arm,pl330", "arm,primecell";
-               reg = <0x0 0xff240000 0x0 0x4000>;
-               interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
-               arm,pl330-periph-burst;
-               clocks = <&cru ACLK_DMAC>;
-               clock-names = "apb_pclk";
-               #dma-cells = <1>;
-       };
-
-       tsadc: tsadc@ff280000 {
-               compatible = "rockchip,px30-tsadc";
-               reg = <0x0 0xff280000 0x0 0x100>;
-               interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-               assigned-clocks = <&cru SCLK_TSADC>;
-               assigned-clock-rates = <50000>;
-               clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
-               clock-names = "tsadc", "apb_pclk";
-               resets = <&cru SRST_TSADC>;
-               reset-names = "tsadc-apb";
-               rockchip,grf = <&grf>;
-               rockchip,hw-tshut-temp = <120000>;
-               pinctrl-names = "init", "default", "sleep";
-               pinctrl-0 = <&tsadc_otp_pin>;
-               pinctrl-1 = <&tsadc_otp_out>;
-               pinctrl-2 = <&tsadc_otp_pin>;
-               #thermal-sensor-cells = <1>;
-               status = "disabled";
-       };
-
-       saradc: saradc@ff288000 {
-               compatible = "rockchip,px30-saradc", "rockchip,rk3399-saradc";
-               reg = <0x0 0xff288000 0x0 0x100>;
-               interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-               #io-channel-cells = <1>;
-               clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
-               clock-names = "saradc", "apb_pclk";
-               resets = <&cru SRST_SARADC_P>;
-               reset-names = "saradc-apb";
-               status = "disabled";
-       };
-
-       otp: nvmem@ff290000 {
-               compatible = "rockchip,px30-otp";
-               reg = <0x0 0xff290000 0x0 0x4000>;
-               clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>,
-                        <&cru PCLK_OTP_PHY>;
-               clock-names = "otp", "apb_pclk", "phy";
-               resets = <&cru SRST_OTP_PHY>;
-               reset-names = "phy";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               /* Data cells */
-               cpu_id: id@7 {
-                       reg = <0x07 0x10>;
-               };
-               cpu_leakage: cpu-leakage@17 {
-                       reg = <0x17 0x1>;
-               };
-               performance: performance@1e {
-                       reg = <0x1e 0x1>;
-                       bits = <4 3>;
-               };
-       };
-
-       cru: clock-controller@ff2b0000 {
-               compatible = "rockchip,px30-cru";
-               reg = <0x0 0xff2b0000 0x0 0x1000>;
-               clocks = <&xin24m>, <&pmucru PLL_GPLL>;
-               clock-names = "xin24m", "gpll";
-               rockchip,grf = <&grf>;
-               #clock-cells = <1>;
-               #reset-cells = <1>;
-
-               assigned-clocks = <&cru PLL_NPLL>,
-                       <&cru ACLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
-                       <&cru HCLK_BUS_PRE>, <&cru HCLK_PERI_PRE>,
-                       <&cru PCLK_BUS_PRE>, <&cru SCLK_GPU>;
-
-               assigned-clock-rates = <1188000000>,
-                       <200000000>, <200000000>,
-                       <150000000>, <150000000>,
-                       <100000000>, <200000000>;
-       };
-
-       pmucru: clock-controller@ff2bc000 {
-               compatible = "rockchip,px30-pmucru";
-               reg = <0x0 0xff2bc000 0x0 0x1000>;
-               clocks = <&xin24m>;
-               clock-names = "xin24m";
-               rockchip,grf = <&grf>;
-               #clock-cells = <1>;
-               #reset-cells = <1>;
-
-               assigned-clocks =
-                       <&pmucru PLL_GPLL>, <&pmucru PCLK_PMU_PRE>,
-                       <&pmucru SCLK_WIFI_PMU>;
-               assigned-clock-rates =
-                       <1200000000>, <100000000>,
-                       <26000000>;
-       };
-
-       usb2phy_grf: syscon@ff2c0000 {
-               compatible = "rockchip,px30-usb2phy-grf", "syscon",
-                            "simple-mfd";
-               reg = <0x0 0xff2c0000 0x0 0x10000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               u2phy: usb2phy@100 {
-                       compatible = "rockchip,px30-usb2phy";
-                       reg = <0x100 0x20>;
-                       clocks = <&pmucru SCLK_USBPHY_REF>;
-                       clock-names = "phyclk";
-                       #clock-cells = <0>;
-                       assigned-clocks = <&cru USB480M>;
-                       assigned-clock-parents = <&u2phy>;
-                       clock-output-names = "usb480m_phy";
-                       status = "disabled";
-
-                       u2phy_host: host-port {
-                               #phy-cells = <0>;
-                               interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-names = "linestate";
-                               status = "disabled";
-                       };
-
-                       u2phy_otg: otg-port {
-                               #phy-cells = <0>;
-                               interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-names = "otg-bvalid", "otg-id",
-                                                 "linestate";
-                               status = "disabled";
-                       };
-               };
-       };
-
-       dsi_dphy: phy@ff2e0000 {
-               compatible = "rockchip,px30-dsi-dphy";
-               reg = <0x0 0xff2e0000 0x0 0x10000>;
-               clocks = <&pmucru SCLK_MIPIDSIPHY_REF>, <&cru PCLK_MIPIDSIPHY>;
-               clock-names = "ref", "pclk";
-               resets = <&cru SRST_MIPIDSIPHY_P>;
-               reset-names = "apb";
-               #phy-cells = <0>;
-               power-domains = <&power PX30_PD_VO>;
-               status = "disabled";
-       };
-
-       csi_dphy: phy@ff2f0000 {
-               compatible = "rockchip,px30-csi-dphy";
-               reg = <0x0 0xff2f0000 0x0 0x4000>;
-               clocks = <&cru PCLK_MIPICSIPHY>;
-               clock-names = "pclk";
-               #phy-cells = <0>;
-               power-domains = <&power PX30_PD_VI>;
-               resets = <&cru SRST_MIPICSIPHY_P>;
-               reset-names = "apb";
-               rockchip,grf = <&grf>;
-               status = "disabled";
-       };
-
-       usb20_otg: usb@ff300000 {
-               compatible = "rockchip,px30-usb", "rockchip,rk3066-usb",
-                            "snps,dwc2";
-               reg = <0x0 0xff300000 0x0 0x40000>;
-               interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_OTG>;
-               clock-names = "otg";
-               dr_mode = "otg";
-               g-np-tx-fifo-size = <16>;
-               g-rx-fifo-size = <280>;
-               g-tx-fifo-size = <256 128 128 64 32 16>;
-               phys = <&u2phy_otg>;
-               phy-names = "usb2-phy";
-               power-domains = <&power PX30_PD_USB>;
-               status = "disabled";
-       };
-
-       usb_host0_ehci: usb@ff340000 {
-               compatible = "generic-ehci";
-               reg = <0x0 0xff340000 0x0 0x10000>;
-               interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_HOST>;
-               phys = <&u2phy_host>;
-               phy-names = "usb";
-               power-domains = <&power PX30_PD_USB>;
-               status = "disabled";
-       };
-
-       usb_host0_ohci: usb@ff350000 {
-               compatible = "generic-ohci";
-               reg = <0x0 0xff350000 0x0 0x10000>;
-               interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_HOST>;
-               phys = <&u2phy_host>;
-               phy-names = "usb";
-               power-domains = <&power PX30_PD_USB>;
-               status = "disabled";
-       };
-
-       gmac: ethernet@ff360000 {
-               compatible = "rockchip,px30-gmac";
-               reg = <0x0 0xff360000 0x0 0x10000>;
-               interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "macirq";
-               clocks = <&cru SCLK_GMAC>, <&cru SCLK_GMAC_RX_TX>,
-                        <&cru SCLK_GMAC_RX_TX>, <&cru SCLK_MAC_REF>,
-                        <&cru SCLK_MAC_REFOUT>, <&cru ACLK_GMAC>,
-                        <&cru PCLK_GMAC>, <&cru SCLK_GMAC_RMII>;
-               clock-names = "stmmaceth", "mac_clk_rx",
-                             "mac_clk_tx", "clk_mac_ref",
-                             "clk_mac_refout", "aclk_mac",
-                             "pclk_mac", "clk_mac_speed";
-               rockchip,grf = <&grf>;
-               phy-mode = "rmii";
-               pinctrl-names = "default";
-               pinctrl-0 = <&rmii_pins &mac_refclk_12ma>;
-               power-domains = <&power PX30_PD_GMAC>;
-               resets = <&cru SRST_GMAC_A>;
-               reset-names = "stmmaceth";
-               status = "disabled";
-       };
-
-       sdmmc: mmc@ff370000 {
-               compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";
-               reg = <0x0 0xff370000 0x0 0x4000>;
-               interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
-                        <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-               clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-               bus-width = <4>;
-               fifo-depth = <0x100>;
-               max-frequency = <150000000>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
-               power-domains = <&power PX30_PD_SDCARD>;
-               status = "disabled";
-       };
-
-       sdio: mmc@ff380000 {
-               compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";
-               reg = <0x0 0xff380000 0x0 0x4000>;
-               interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
-                        <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
-               clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-               bus-width = <4>;
-               fifo-depth = <0x100>;
-               max-frequency = <150000000>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&sdio_bus4 &sdio_cmd &sdio_clk>;
-               power-domains = <&power PX30_PD_MMC_NAND>;
-               status = "disabled";
-       };
-
-       emmc: mmc@ff390000 {
-               compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";
-               reg = <0x0 0xff390000 0x0 0x4000>;
-               interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
-                        <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-               clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-               bus-width = <8>;
-               fifo-depth = <0x100>;
-               max-frequency = <150000000>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
-               power-domains = <&power PX30_PD_MMC_NAND>;
-               status = "disabled";
-       };
-
-       sfc: spi@ff3a0000 {
-               compatible = "rockchip,sfc";
-               reg = <0x0 0xff3a0000 0x0 0x4000>;
-               interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>;
-               clock-names = "clk_sfc", "hclk_sfc";
-               pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus4>;
-               pinctrl-names = "default";
-               power-domains = <&power PX30_PD_MMC_NAND>;
-               status = "disabled";
-       };
-
-       nfc: nand-controller@ff3b0000 {
-               compatible = "rockchip,px30-nfc";
-               reg = <0x0 0xff3b0000 0x0 0x4000>;
-               interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru HCLK_NANDC>, <&cru SCLK_NANDC>;
-               clock-names = "ahb", "nfc";
-               assigned-clocks = <&cru SCLK_NANDC>;
-               assigned-clock-rates = <150000000>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&flash_ale &flash_bus8 &flash_cle &flash_cs0
-                            &flash_rdn &flash_rdy &flash_wrn &flash_dqs>;
-               power-domains = <&power PX30_PD_MMC_NAND>;
-               status = "disabled";
-       };
-
-       gpu_opp_table: opp-table-1 {
-               compatible = "operating-points-v2";
-
-               opp-200000000 {
-                       opp-hz = /bits/ 64 <200000000>;
-                       opp-microvolt = <950000>;
-               };
-               opp-300000000 {
-                       opp-hz = /bits/ 64 <300000000>;
-                       opp-microvolt = <975000>;
-               };
-               opp-400000000 {
-                       opp-hz = /bits/ 64 <400000000>;
-                       opp-microvolt = <1050000>;
-               };
-               opp-480000000 {
-                       opp-hz = /bits/ 64 <480000000>;
-                       opp-microvolt = <1125000>;
-               };
-       };
-
-       gpu: gpu@ff400000 {
-               compatible = "rockchip,px30-mali", "arm,mali-bifrost";
-               reg = <0x0 0xff400000 0x0 0x4000>;
-               interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "job", "mmu", "gpu";
-               clocks = <&cru SCLK_GPU>;
-               #cooling-cells = <2>;
-               power-domains = <&power PX30_PD_GPU>;
-               operating-points-v2 = <&gpu_opp_table>;
-               status = "disabled";
-       };
-
-       vpu: video-codec@ff442000 {
-               compatible = "rockchip,px30-vpu";
-               reg = <0x0 0xff442000 0x0 0x800>;
-               interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vepu", "vdpu";
-               clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-               clock-names = "aclk", "hclk";
-               iommus = <&vpu_mmu>;
-               power-domains = <&power PX30_PD_VPU>;
-       };
-
-       vpu_mmu: iommu@ff442800 {
-               compatible = "rockchip,iommu";
-               reg = <0x0 0xff442800 0x0 0x100>;
-               interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-               clock-names = "aclk", "iface";
-               #iommu-cells = <0>;
-               power-domains = <&power PX30_PD_VPU>;
-       };
-
-       dsi: dsi@ff450000 {
-               compatible = "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi";
-               reg = <0x0 0xff450000 0x0 0x10000>;
-               interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru PCLK_MIPI_DSI>;
-               clock-names = "pclk";
-               phys = <&dsi_dphy>;
-               phy-names = "dphy";
-               power-domains = <&power PX30_PD_VO>;
-               resets = <&cru SRST_MIPIDSI_HOST_P>;
-               reset-names = "apb";
-               rockchip,grf = <&grf>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               dsi_in_vopb: endpoint@0 {
-                                       reg = <0>;
-                                       remote-endpoint = <&vopb_out_dsi>;
-                               };
-
-                               dsi_in_vopl: endpoint@1 {
-                                       reg = <1>;
-                                       remote-endpoint = <&vopl_out_dsi>;
-                               };
-                       };
-               };
-       };
-
-       vopb: vop@ff460000 {
-               compatible = "rockchip,px30-vop-big";
-               reg = <0x0 0xff460000 0x0 0xefc>;
-               interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_VOPB>, <&cru DCLK_VOPB>,
-                        <&cru HCLK_VOPB>;
-               clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
-               resets = <&cru SRST_VOPB_A>, <&cru SRST_VOPB_H>, <&cru SRST_VOPB>;
-               reset-names = "axi", "ahb", "dclk";
-               iommus = <&vopb_mmu>;
-               power-domains = <&power PX30_PD_VO>;
-               status = "disabled";
-
-               vopb_out: port {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       vopb_out_dsi: endpoint@0 {
-                               reg = <0>;
-                               remote-endpoint = <&dsi_in_vopb>;
-                       };
-
-                       vopb_out_lvds: endpoint@1 {
-                               reg = <1>;
-                               remote-endpoint = <&lvds_vopb_in>;
-                       };
-               };
-       };
-
-       vopb_mmu: iommu@ff460f00 {
-               compatible = "rockchip,iommu";
-               reg = <0x0 0xff460f00 0x0 0x100>;
-               interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_VOPB>, <&cru HCLK_VOPB>;
-               clock-names = "aclk", "iface";
-               power-domains = <&power PX30_PD_VO>;
-               #iommu-cells = <0>;
-               status = "disabled";
-       };
-
-       vopl: vop@ff470000 {
-               compatible = "rockchip,px30-vop-lit";
-               reg = <0x0 0xff470000 0x0 0xefc>;
-               interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_VOPL>, <&cru DCLK_VOPL>,
-                        <&cru HCLK_VOPL>;
-               clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
-               resets = <&cru SRST_VOPL_A>, <&cru SRST_VOPL_H>, <&cru SRST_VOPL>;
-               reset-names = "axi", "ahb", "dclk";
-               iommus = <&vopl_mmu>;
-               power-domains = <&power PX30_PD_VO>;
-               status = "disabled";
-
-               vopl_out: port {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       vopl_out_dsi: endpoint@0 {
-                               reg = <0>;
-                               remote-endpoint = <&dsi_in_vopl>;
-                       };
-
-                       vopl_out_lvds: endpoint@1 {
-                               reg = <1>;
-                               remote-endpoint = <&lvds_vopl_in>;
-                       };
-               };
-       };
-
-       vopl_mmu: iommu@ff470f00 {
-               compatible = "rockchip,iommu";
-               reg = <0x0 0xff470f00 0x0 0x100>;
-               interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_VOPL>, <&cru HCLK_VOPL>;
-               clock-names = "aclk", "iface";
-               power-domains = <&power PX30_PD_VO>;
-               #iommu-cells = <0>;
-               status = "disabled";
-       };
-
-       isp: isp@ff4a0000 {
-               compatible = "rockchip,px30-cif-isp"; /*rk3326-rkisp1*/
-               reg = <0x0 0xff4a0000 0x0 0x8000>;
-               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "isp", "mi", "mipi";
-               clocks = <&cru SCLK_ISP>,
-                        <&cru ACLK_ISP>,
-                        <&cru HCLK_ISP>,
-                        <&cru PCLK_ISP>;
-               clock-names = "isp", "aclk", "hclk", "pclk";
-               iommus = <&isp_mmu>;
-               phys = <&csi_dphy>;
-               phy-names = "dphy";
-               power-domains = <&power PX30_PD_VI>;
-               status = "disabled";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
-               };
-       };
-
-       isp_mmu: iommu@ff4a8000 {
-               compatible = "rockchip,iommu";
-               reg = <0x0 0xff4a8000 0x0 0x100>;
-               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
-               clock-names = "aclk", "iface";
-               power-domains = <&power PX30_PD_VI>;
-               rockchip,disable-mmu-reset;
-               #iommu-cells = <0>;
-       };
-
-       qos_gmac: qos@ff518000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff518000 0x0 0x20>;
-       };
-
-       qos_gpu: qos@ff520000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff520000 0x0 0x20>;
-       };
-
-       qos_sdmmc: qos@ff52c000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff52c000 0x0 0x20>;
-       };
-
-       qos_emmc: qos@ff538000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff538000 0x0 0x20>;
-       };
-
-       qos_nand: qos@ff538080 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff538080 0x0 0x20>;
-       };
-
-       qos_sdio: qos@ff538100 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff538100 0x0 0x20>;
-       };
-
-       qos_sfc: qos@ff538180 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff538180 0x0 0x20>;
-       };
-
-       qos_usb_host: qos@ff540000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff540000 0x0 0x20>;
-       };
-
-       qos_usb_otg: qos@ff540080 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff540080 0x0 0x20>;
-       };
-
-       qos_isp_128: qos@ff548000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff548000 0x0 0x20>;
-       };
-
-       qos_isp_rd: qos@ff548080 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff548080 0x0 0x20>;
-       };
-
-       qos_isp_wr: qos@ff548100 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff548100 0x0 0x20>;
-       };
-
-       qos_isp_m1: qos@ff548180 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff548180 0x0 0x20>;
-       };
-
-       qos_vip: qos@ff548200 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff548200 0x0 0x20>;
-       };
-
-       qos_rga_rd: qos@ff550000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff550000 0x0 0x20>;
-       };
-
-       qos_rga_wr: qos@ff550080 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff550080 0x0 0x20>;
-       };
-
-       qos_vop_m0: qos@ff550100 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff550100 0x0 0x20>;
-       };
-
-       qos_vop_m1: qos@ff550180 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff550180 0x0 0x20>;
-       };
-
-       qos_vpu: qos@ff558000 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff558000 0x0 0x20>;
-       };
-
-       qos_vpu_r128: qos@ff558080 {
-               compatible = "rockchip,px30-qos", "syscon";
-               reg = <0x0 0xff558080 0x0 0x20>;
-       };
-
-       pinctrl: pinctrl {
-               compatible = "rockchip,px30-pinctrl";
-               rockchip,grf = <&grf>;
-               rockchip,pmu = <&pmugrf>;
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               gpio0: gpio@ff040000 {
-                       compatible = "rockchip,gpio-bank";
-                       reg = <0x0 0xff040000 0x0 0x100>;
-                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&pmucru PCLK_GPIO0_PMU>;
-                       gpio-controller;
-                       gpio-ranges = <&pinctrl 0 0 32>;
-                       #gpio-cells = <2>;
-
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               gpio1: gpio@ff250000 {
-                       compatible = "rockchip,gpio-bank";
-                       reg = <0x0 0xff250000 0x0 0x100>;
-                       interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cru PCLK_GPIO1>;
-                       gpio-controller;
-                       gpio-ranges = <&pinctrl 0 32 32>;
-                       #gpio-cells = <2>;
-
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               gpio2: gpio@ff260000 {
-                       compatible = "rockchip,gpio-bank";
-                       reg = <0x0 0xff260000 0x0 0x100>;
-                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cru PCLK_GPIO2>;
-                       gpio-controller;
-                       gpio-ranges = <&pinctrl 0 64 32>;
-                       #gpio-cells = <2>;
-
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               gpio3: gpio@ff270000 {
-                       compatible = "rockchip,gpio-bank";
-                       reg = <0x0 0xff270000 0x0 0x100>;
-                       interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cru PCLK_GPIO3>;
-                       gpio-controller;
-                       gpio-ranges = <&pinctrl 0 96 32>;
-                       #gpio-cells = <2>;
-
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pcfg_pull_up: pcfg-pull-up {
-                       bias-pull-up;
-               };
-
-               pcfg_pull_down: pcfg-pull-down {
-                       bias-pull-down;
-               };
-
-               pcfg_pull_none: pcfg-pull-none {
-                       bias-disable;
-               };
-
-               pcfg_pull_none_2ma: pcfg-pull-none-2ma {
-                       bias-disable;
-                       drive-strength = <2>;
-               };
-
-               pcfg_pull_up_2ma: pcfg-pull-up-2ma {
-                       bias-pull-up;
-                       drive-strength = <2>;
-               };
-
-               pcfg_pull_up_4ma: pcfg-pull-up-4ma {
-                       bias-pull-up;
-                       drive-strength = <4>;
-               };
-
-               pcfg_pull_none_4ma: pcfg-pull-none-4ma {
-                       bias-disable;
-                       drive-strength = <4>;
-               };
-
-               pcfg_pull_down_4ma: pcfg-pull-down-4ma {
-                       bias-pull-down;
-                       drive-strength = <4>;
-               };
-
-               pcfg_pull_none_8ma: pcfg-pull-none-8ma {
-                       bias-disable;
-                       drive-strength = <8>;
-               };
-
-               pcfg_pull_up_8ma: pcfg-pull-up-8ma {
-                       bias-pull-up;
-                       drive-strength = <8>;
-               };
-
-               pcfg_pull_none_12ma: pcfg-pull-none-12ma {
-                       bias-disable;
-                       drive-strength = <12>;
-               };
-
-               pcfg_pull_up_12ma: pcfg-pull-up-12ma {
-                       bias-pull-up;
-                       drive-strength = <12>;
-               };
-
-               pcfg_pull_none_smt: pcfg-pull-none-smt {
-                       bias-disable;
-                       input-schmitt-enable;
-               };
-
-               pcfg_output_high: pcfg-output-high {
-                       output-high;
-               };
-
-               pcfg_output_low: pcfg-output-low {
-                       output-low;
-               };
-
-               pcfg_input_high: pcfg-input-high {
-                       bias-pull-up;
-                       input-enable;
-               };
-
-               pcfg_input: pcfg-input {
-                       input-enable;
-               };
-
-               i2c0 {
-                       i2c0_xfer: i2c0-xfer {
-                               rockchip,pins =
-                                       <0 RK_PB0 1 &pcfg_pull_none_smt>,
-                                       <0 RK_PB1 1 &pcfg_pull_none_smt>;
-                       };
-               };
-
-               i2c1 {
-                       i2c1_xfer: i2c1-xfer {
-                               rockchip,pins =
-                                       <0 RK_PC2 1 &pcfg_pull_none_smt>,
-                                       <0 RK_PC3 1 &pcfg_pull_none_smt>;
-                       };
-               };
-
-               i2c2 {
-                       i2c2_xfer: i2c2-xfer {
-                               rockchip,pins =
-                                       <2 RK_PB7 2 &pcfg_pull_none_smt>,
-                                       <2 RK_PC0 2 &pcfg_pull_none_smt>;
-                       };
-               };
-
-               i2c3 {
-                       i2c3_xfer: i2c3-xfer {
-                               rockchip,pins =
-                                       <1 RK_PB4 4 &pcfg_pull_none_smt>,
-                                       <1 RK_PB5 4 &pcfg_pull_none_smt>;
-                       };
-               };
-
-               tsadc {
-                       tsadc_otp_pin: tsadc-otp-pin {
-                               rockchip,pins =
-                                       <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-                       };
-
-                       tsadc_otp_out: tsadc-otp-out {
-                               rockchip,pins =
-                                       <0 RK_PA6 1 &pcfg_pull_none>;
-                       };
-               };
-
-               uart0 {
-                       uart0_xfer: uart0-xfer {
-                               rockchip,pins =
-                                       <0 RK_PB2 1 &pcfg_pull_up>,
-                                       <0 RK_PB3 1 &pcfg_pull_up>;
-                       };
-
-                       uart0_cts: uart0-cts {
-                               rockchip,pins =
-                                       <0 RK_PB4 1 &pcfg_pull_none>;
-                       };
-
-                       uart0_rts: uart0-rts {
-                               rockchip,pins =
-                                       <0 RK_PB5 1 &pcfg_pull_none>;
-                       };
-               };
-
-               uart1 {
-                       uart1_xfer: uart1-xfer {
-                               rockchip,pins =
-                                       <1 RK_PC1 1 &pcfg_pull_up>,
-                                       <1 RK_PC0 1 &pcfg_pull_up>;
-                       };
-
-                       uart1_cts: uart1-cts {
-                               rockchip,pins =
-                                       <1 RK_PC2 1 &pcfg_pull_none>;
-                       };
-
-                       uart1_rts: uart1-rts {
-                               rockchip,pins =
-                                       <1 RK_PC3 1 &pcfg_pull_none>;
-                       };
-               };
-
-               uart2-m0 {
-                       uart2m0_xfer: uart2m0-xfer {
-                               rockchip,pins =
-                                       <1 RK_PD2 2 &pcfg_pull_up>,
-                                       <1 RK_PD3 2 &pcfg_pull_up>;
-                       };
-               };
-
-               uart2-m1 {
-                       uart2m1_xfer: uart2m1-xfer {
-                               rockchip,pins =
-                                       <2 RK_PB4 2 &pcfg_pull_up>,
-                                       <2 RK_PB6 2 &pcfg_pull_up>;
-                       };
-               };
-
-               uart3-m0 {
-                       uart3m0_xfer: uart3m0-xfer {
-                               rockchip,pins =
-                                       <0 RK_PC0 2 &pcfg_pull_up>,
-                                       <0 RK_PC1 2 &pcfg_pull_up>;
-                       };
-
-                       uart3m0_cts: uart3m0-cts {
-                               rockchip,pins =
-                                       <0 RK_PC2 2 &pcfg_pull_none>;
-                       };
-
-                       uart3m0_rts: uart3m0-rts {
-                               rockchip,pins =
-                                       <0 RK_PC3 2 &pcfg_pull_none>;
-                       };
-               };
-
-               uart3-m1 {
-                       uart3m1_xfer: uart3m1-xfer {
-                               rockchip,pins =
-                                       <1 RK_PB6 2 &pcfg_pull_up>,
-                                       <1 RK_PB7 2 &pcfg_pull_up>;
-                       };
-
-                       uart3m1_cts: uart3m1-cts {
-                               rockchip,pins =
-                                       <1 RK_PB4 2 &pcfg_pull_none>;
-                       };
-
-                       uart3m1_rts: uart3m1-rts {
-                               rockchip,pins =
-                                       <1 RK_PB5 2 &pcfg_pull_none>;
-                       };
-               };
-
-               uart4 {
-                       uart4_xfer: uart4-xfer {
-                               rockchip,pins =
-                                       <1 RK_PD4 2 &pcfg_pull_up>,
-                                       <1 RK_PD5 2 &pcfg_pull_up>;
-                       };
-
-                       uart4_cts: uart4-cts {
-                               rockchip,pins =
-                                       <1 RK_PD6 2 &pcfg_pull_none>;
-                       };
-
-                       uart4_rts: uart4-rts {
-                               rockchip,pins =
-                                       <1 RK_PD7 2 &pcfg_pull_none>;
-                       };
-               };
-
-               uart5 {
-                       uart5_xfer: uart5-xfer {
-                               rockchip,pins =
-                                       <3 RK_PA2 4 &pcfg_pull_up>,
-                                       <3 RK_PA1 4 &pcfg_pull_up>;
-                       };
-
-                       uart5_cts: uart5-cts {
-                               rockchip,pins =
-                                       <3 RK_PA3 4 &pcfg_pull_none>;
-                       };
-
-                       uart5_rts: uart5-rts {
-                               rockchip,pins =
-                                       <3 RK_PA5 4 &pcfg_pull_none>;
-                       };
-               };
-
-               spi0 {
-                       spi0_clk: spi0-clk {
-                               rockchip,pins =
-                                       <1 RK_PB7 3 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi0_csn: spi0-csn {
-                               rockchip,pins =
-                                       <1 RK_PB6 3 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi0_miso: spi0-miso {
-                               rockchip,pins =
-                                       <1 RK_PB5 3 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi0_mosi: spi0-mosi {
-                               rockchip,pins =
-                                       <1 RK_PB4 3 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi0_clk_hs: spi0-clk-hs {
-                               rockchip,pins =
-                                       <1 RK_PB7 3 &pcfg_pull_up_8ma>;
-                       };
-
-                       spi0_miso_hs: spi0-miso-hs {
-                               rockchip,pins =
-                                       <1 RK_PB5 3 &pcfg_pull_up_8ma>;
-                       };
-
-                       spi0_mosi_hs: spi0-mosi-hs {
-                               rockchip,pins =
-                                       <1 RK_PB4 3 &pcfg_pull_up_8ma>;
-                       };
-               };
-
-               spi1 {
-                       spi1_clk: spi1-clk {
-                               rockchip,pins =
-                                       <3 RK_PB7 4 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi1_csn0: spi1-csn0 {
-                               rockchip,pins =
-                                       <3 RK_PB1 4 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi1_csn1: spi1-csn1 {
-                               rockchip,pins =
-                                       <3 RK_PB2 2 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi1_miso: spi1-miso {
-                               rockchip,pins =
-                                       <3 RK_PB6 4 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi1_mosi: spi1-mosi {
-                               rockchip,pins =
-                                       <3 RK_PB4 4 &pcfg_pull_up_4ma>;
-                       };
-
-                       spi1_clk_hs: spi1-clk-hs {
-                               rockchip,pins =
-                                       <3 RK_PB7 4 &pcfg_pull_up_8ma>;
-                       };
-
-                       spi1_miso_hs: spi1-miso-hs {
-                               rockchip,pins =
-                                       <3 RK_PB6 4 &pcfg_pull_up_8ma>;
-                       };
-
-                       spi1_mosi_hs: spi1-mosi-hs {
-                               rockchip,pins =
-                                       <3 RK_PB4 4 &pcfg_pull_up_8ma>;
-                       };
-               };
-
-               pdm {
-                       pdm_clk0m0: pdm-clk0m0 {
-                               rockchip,pins =
-                                       <3 RK_PC6 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_clk0m1: pdm-clk0m1 {
-                               rockchip,pins =
-                                       <2 RK_PC6 1 &pcfg_pull_none>;
-                       };
-
-                       pdm_clk1: pdm-clk1 {
-                               rockchip,pins =
-                                       <3 RK_PC7 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_sdi0m0: pdm-sdi0m0 {
-                               rockchip,pins =
-                                       <3 RK_PD3 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_sdi0m1: pdm-sdi0m1 {
-                               rockchip,pins =
-                                       <2 RK_PC5 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_sdi1: pdm-sdi1 {
-                               rockchip,pins =
-                                       <3 RK_PD0 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_sdi2: pdm-sdi2 {
-                               rockchip,pins =
-                                       <3 RK_PD1 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_sdi3: pdm-sdi3 {
-                               rockchip,pins =
-                                       <3 RK_PD2 2 &pcfg_pull_none>;
-                       };
-
-                       pdm_clk0m0_sleep: pdm-clk0m0-sleep {
-                               rockchip,pins =
-                                       <3 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_clk0m_sleep1: pdm-clk0m1-sleep {
-                               rockchip,pins =
-                                       <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_clk1_sleep: pdm-clk1-sleep {
-                               rockchip,pins =
-                                       <3 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_sdi0m0_sleep: pdm-sdi0m0-sleep {
-                               rockchip,pins =
-                                       <3 RK_PD3 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_sdi0m1_sleep: pdm-sdi0m1-sleep {
-                               rockchip,pins =
-                                       <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_sdi1_sleep: pdm-sdi1-sleep {
-                               rockchip,pins =
-                                       <3 RK_PD0 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_sdi2_sleep: pdm-sdi2-sleep {
-                               rockchip,pins =
-                                       <3 RK_PD1 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-
-                       pdm_sdi3_sleep: pdm-sdi3-sleep {
-                               rockchip,pins =
-                                       <3 RK_PD2 RK_FUNC_GPIO &pcfg_input_high>;
-                       };
-               };
-
-               i2s0 {
-                       i2s0_8ch_mclk: i2s0-8ch-mclk {
-                               rockchip,pins =
-                                       <3 RK_PC1 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sclktx: i2s0-8ch-sclktx {
-                               rockchip,pins =
-                                       <3 RK_PC3 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sclkrx: i2s0-8ch-sclkrx {
-                               rockchip,pins =
-                                       <3 RK_PB4 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_lrcktx: i2s0-8ch-lrcktx {
-                               rockchip,pins =
-                                       <3 RK_PC2 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_lrckrx: i2s0-8ch-lrckrx {
-                               rockchip,pins =
-                                       <3 RK_PB5 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdo0: i2s0-8ch-sdo0 {
-                               rockchip,pins =
-                                       <3 RK_PC4 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdo1: i2s0-8ch-sdo1 {
-                               rockchip,pins =
-                                       <3 RK_PC0 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdo2: i2s0-8ch-sdo2 {
-                               rockchip,pins =
-                                       <3 RK_PB7 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdo3: i2s0-8ch-sdo3 {
-                               rockchip,pins =
-                                       <3 RK_PB6 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdi0: i2s0-8ch-sdi0 {
-                               rockchip,pins =
-                                       <3 RK_PC5 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdi1: i2s0-8ch-sdi1 {
-                               rockchip,pins =
-                                       <3 RK_PB3 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdi2: i2s0-8ch-sdi2 {
-                               rockchip,pins =
-                                       <3 RK_PB1 2 &pcfg_pull_none>;
-                       };
-
-                       i2s0_8ch_sdi3: i2s0-8ch-sdi3 {
-                               rockchip,pins =
-                                       <3 RK_PB0 2 &pcfg_pull_none>;
-                       };
-               };
-
-               i2s1 {
-                       i2s1_2ch_mclk: i2s1-2ch-mclk {
-                               rockchip,pins =
-                                       <2 RK_PC3 1 &pcfg_pull_none>;
-                       };
-
-                       i2s1_2ch_sclk: i2s1-2ch-sclk {
-                               rockchip,pins =
-                                       <2 RK_PC2 1 &pcfg_pull_none>;
-                       };
-
-                       i2s1_2ch_lrck: i2s1-2ch-lrck {
-                               rockchip,pins =
-                                       <2 RK_PC1 1 &pcfg_pull_none>;
-                       };
-
-                       i2s1_2ch_sdi: i2s1-2ch-sdi {
-                               rockchip,pins =
-                                       <2 RK_PC5 1 &pcfg_pull_none>;
-                       };
-
-                       i2s1_2ch_sdo: i2s1-2ch-sdo {
-                               rockchip,pins =
-                                       <2 RK_PC4 1 &pcfg_pull_none>;
-                       };
-               };
-
-               i2s2 {
-                       i2s2_2ch_mclk: i2s2-2ch-mclk {
-                               rockchip,pins =
-                                       <3 RK_PA1 2 &pcfg_pull_none>;
-                       };
-
-                       i2s2_2ch_sclk: i2s2-2ch-sclk {
-                               rockchip,pins =
-                                       <3 RK_PA2 2 &pcfg_pull_none>;
-                       };
-
-                       i2s2_2ch_lrck: i2s2-2ch-lrck {
-                               rockchip,pins =
-                                       <3 RK_PA3 2 &pcfg_pull_none>;
-                       };
-
-                       i2s2_2ch_sdi: i2s2-2ch-sdi {
-                               rockchip,pins =
-                                       <3 RK_PA5 2 &pcfg_pull_none>;
-                       };
-
-                       i2s2_2ch_sdo: i2s2-2ch-sdo {
-                               rockchip,pins =
-                                       <3 RK_PA7 2 &pcfg_pull_none>;
-                       };
-               };
-
-               sdmmc {
-                       sdmmc_clk: sdmmc-clk {
-                               rockchip,pins =
-                                       <1 RK_PD6 1 &pcfg_pull_none_8ma>;
-                       };
-
-                       sdmmc_cmd: sdmmc-cmd {
-                               rockchip,pins =
-                                       <1 RK_PD7 1 &pcfg_pull_up_8ma>;
-                       };
-
-                       sdmmc_det: sdmmc-det {
-                               rockchip,pins =
-                                       <0 RK_PA3 1 &pcfg_pull_up_8ma>;
-                       };
-
-                       sdmmc_bus1: sdmmc-bus1 {
-                               rockchip,pins =
-                                       <1 RK_PD2 1 &pcfg_pull_up_8ma>;
-                       };
-
-                       sdmmc_bus4: sdmmc-bus4 {
-                               rockchip,pins =
-                                       <1 RK_PD2 1 &pcfg_pull_up_8ma>,
-                                       <1 RK_PD3 1 &pcfg_pull_up_8ma>,
-                                       <1 RK_PD4 1 &pcfg_pull_up_8ma>,
-                                       <1 RK_PD5 1 &pcfg_pull_up_8ma>;
-                       };
-               };
-
-               sdio {
-                       sdio_clk: sdio-clk {
-                               rockchip,pins =
-                                       <1 RK_PC5 1 &pcfg_pull_none>;
-                       };
-
-                       sdio_cmd: sdio-cmd {
-                               rockchip,pins =
-                                       <1 RK_PC4 1 &pcfg_pull_up>;
-                       };
-
-                       sdio_bus4: sdio-bus4 {
-                               rockchip,pins =
-                                       <1 RK_PC6 1 &pcfg_pull_up>,
-                                       <1 RK_PC7 1 &pcfg_pull_up>,
-                                       <1 RK_PD0 1 &pcfg_pull_up>,
-                                       <1 RK_PD1 1 &pcfg_pull_up>;
-                       };
-               };
-
-               emmc {
-                       emmc_clk: emmc-clk {
-                               rockchip,pins =
-                                       <1 RK_PB1 2 &pcfg_pull_none_8ma>;
-                       };
-
-                       emmc_cmd: emmc-cmd {
-                               rockchip,pins =
-                                       <1 RK_PB2 2 &pcfg_pull_up_8ma>;
-                       };
-
-                       emmc_rstnout: emmc-rstnout {
-                               rockchip,pins =
-                                       <1 RK_PB3 2 &pcfg_pull_none>;
-                       };
-
-                       emmc_bus1: emmc-bus1 {
-                               rockchip,pins =
-                                       <1 RK_PA0 2 &pcfg_pull_up_8ma>;
-                       };
-
-                       emmc_bus4: emmc-bus4 {
-                               rockchip,pins =
-                                       <1 RK_PA0 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA1 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA2 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA3 2 &pcfg_pull_up_8ma>;
-                       };
-
-                       emmc_bus8: emmc-bus8 {
-                               rockchip,pins =
-                                       <1 RK_PA0 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA1 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA2 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA3 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA4 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA5 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA6 2 &pcfg_pull_up_8ma>,
-                                       <1 RK_PA7 2 &pcfg_pull_up_8ma>;
-                       };
-               };
-
-               flash {
-                       flash_cs0: flash-cs0 {
-                               rockchip,pins =
-                                       <1 RK_PB0 1 &pcfg_pull_none>;
-                       };
-
-                       flash_rdy: flash-rdy {
-                               rockchip,pins =
-                                       <1 RK_PB1 1 &pcfg_pull_none>;
-                       };
-
-                       flash_dqs: flash-dqs {
-                               rockchip,pins =
-                                       <1 RK_PB2 1 &pcfg_pull_none>;
-                       };
-
-                       flash_ale: flash-ale {
-                               rockchip,pins =
-                                       <1 RK_PB3 1 &pcfg_pull_none>;
-                       };
-
-                       flash_cle: flash-cle {
-                               rockchip,pins =
-                                       <1 RK_PB4 1 &pcfg_pull_none>;
-                       };
-
-                       flash_wrn: flash-wrn {
-                               rockchip,pins =
-                                       <1 RK_PB5 1 &pcfg_pull_none>;
-                       };
-
-                       flash_csl: flash-csl {
-                               rockchip,pins =
-                                       <1 RK_PB6 1 &pcfg_pull_none>;
-                       };
-
-                       flash_rdn: flash-rdn {
-                               rockchip,pins =
-                                       <1 RK_PB7 1 &pcfg_pull_none>;
-                       };
-
-                       flash_bus8: flash-bus8 {
-                               rockchip,pins =
-                                       <1 RK_PA0 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA1 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA2 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA3 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA4 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA5 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA6 1 &pcfg_pull_up_12ma>,
-                                       <1 RK_PA7 1 &pcfg_pull_up_12ma>;
-                       };
-               };
-
-               sfc {
-                       sfc_bus4: sfc-bus4 {
-                               rockchip,pins =
-                                       <1 RK_PA0 3 &pcfg_pull_none>,
-                                       <1 RK_PA1 3 &pcfg_pull_none>,
-                                       <1 RK_PA2 3 &pcfg_pull_none>,
-                                       <1 RK_PA3 3 &pcfg_pull_none>;
-                       };
-
-                       sfc_bus2: sfc-bus2 {
-                               rockchip,pins =
-                                       <1 RK_PA0 3 &pcfg_pull_none>,
-                                       <1 RK_PA1 3 &pcfg_pull_none>;
-                       };
-
-                       sfc_cs0: sfc-cs0 {
-                               rockchip,pins =
-                                       <1 RK_PA4 3 &pcfg_pull_none>;
-                       };
-
-                       sfc_clk: sfc-clk {
-                               rockchip,pins =
-                                       <1 RK_PB1 3 &pcfg_pull_none>;
-                       };
-               };
-
-               lcdc {
-                       lcdc_rgb_dclk_pin: lcdc-rgb-dclk-pin {
-                               rockchip,pins =
-                                       <3 RK_PA0 1 &pcfg_pull_none_12ma>;
-                       };
-
-                       lcdc_rgb_m0_hsync_pin: lcdc-rgb-m0-hsync-pin {
-                               rockchip,pins =
-                                       <3 RK_PA1 1 &pcfg_pull_none_12ma>;
-                       };
-
-                       lcdc_rgb_m0_vsync_pin: lcdc-rgb-m0-vsync-pin {
-                               rockchip,pins =
-                                       <3 RK_PA2 1 &pcfg_pull_none_12ma>;
-                       };
-
-                       lcdc_rgb_m0_den_pin: lcdc-rgb-m0-den-pin {
-                               rockchip,pins =
-                                       <3 RK_PA3 1 &pcfg_pull_none_12ma>;
-                       };
-
-                       lcdc_rgb888_m0_data_pins: lcdc-rgb888-m0-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA7 1 &pcfg_pull_none_8ma>, /* lcdc_d3 */
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA5 1 &pcfg_pull_none_8ma>, /* lcdc_d1 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB1 1 &pcfg_pull_none_8ma>, /* lcdc_d5 */
-                                       <3 RK_PB0 1 &pcfg_pull_none_8ma>, /* lcdc_d4 */
-                                       <3 RK_PB7 1 &pcfg_pull_none_8ma>, /* lcdc_d11 */
-                                       <3 RK_PB6 1 &pcfg_pull_none_8ma>, /* lcdc_d10 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PB4 1 &pcfg_pull_none_8ma>, /* lcdc_d8 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>, /* lcdc_d12 */
-                                       <3 RK_PC7 1 &pcfg_pull_none_8ma>, /* lcdc_d19 */
-                                       <3 RK_PC6 1 &pcfg_pull_none_8ma>, /* lcdc_d18 */
-                                       <3 RK_PC5 1 &pcfg_pull_none_8ma>, /* lcdc_d17 */
-                                       <3 RK_PC4 1 &pcfg_pull_none_8ma>, /* lcdc_d16 */
-                                       <3 RK_PD3 1 &pcfg_pull_none_8ma>, /* lcdc_d23 */
-                                       <3 RK_PD2 1 &pcfg_pull_none_8ma>, /* lcdc_d22 */
-                                       <3 RK_PD1 1 &pcfg_pull_none_8ma>, /* lcdc_d21 */
-                                       <3 RK_PD0 1 &pcfg_pull_none_8ma>; /* lcdc_d20 */
-                       };
-
-                       lcdc_rgb666_m0_data_pins: lcdc-rgb666-m0-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA7 1 &pcfg_pull_none_8ma>, /* lcdc_d3 */
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA5 1 &pcfg_pull_none_8ma>, /* lcdc_d1 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB1 1 &pcfg_pull_none_8ma>, /* lcdc_d5 */
-                                       <3 RK_PB0 1 &pcfg_pull_none_8ma>, /* lcdc_d4 */
-                                       <3 RK_PB7 1 &pcfg_pull_none_8ma>, /* lcdc_d11 */
-                                       <3 RK_PB6 1 &pcfg_pull_none_8ma>, /* lcdc_d10 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PB4 1 &pcfg_pull_none_8ma>, /* lcdc_d8 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>, /* lcdc_d12 */
-                                       <3 RK_PC5 1 &pcfg_pull_none_8ma>, /* lcdc_d17 */
-                                       <3 RK_PC4 1 &pcfg_pull_none_8ma>; /* lcdc_d16 */
-                       };
-
-                       lcdc_rgb565_m0_data_pins: lcdc-rgb565-m0-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA7 1 &pcfg_pull_none_8ma>, /* lcdc_d3 */
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA5 1 &pcfg_pull_none_8ma>, /* lcdc_d1 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB1 1 &pcfg_pull_none_8ma>, /* lcdc_d5 */
-                                       <3 RK_PB0 1 &pcfg_pull_none_8ma>, /* lcdc_d4 */
-                                       <3 RK_PB7 1 &pcfg_pull_none_8ma>, /* lcdc_d11 */
-                                       <3 RK_PB6 1 &pcfg_pull_none_8ma>, /* lcdc_d10 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PB4 1 &pcfg_pull_none_8ma>, /* lcdc_d8 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>; /* lcdc_d12 */
-                       };
-
-                       lcdc_rgb888_m1_data_pins: lcdc-rgb888-m1-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>, /* lcdc_d12 */
-                                       <3 RK_PC7 1 &pcfg_pull_none_8ma>, /* lcdc_d19 */
-                                       <3 RK_PC6 1 &pcfg_pull_none_8ma>, /* lcdc_d18 */
-                                       <3 RK_PC5 1 &pcfg_pull_none_8ma>, /* lcdc_d17 */
-                                       <3 RK_PC4 1 &pcfg_pull_none_8ma>, /* lcdc_d16 */
-                                       <3 RK_PD3 1 &pcfg_pull_none_8ma>, /* lcdc_d23 */
-                                       <3 RK_PD2 1 &pcfg_pull_none_8ma>, /* lcdc_d22 */
-                                       <3 RK_PD1 1 &pcfg_pull_none_8ma>, /* lcdc_d21 */
-                                       <3 RK_PD0 1 &pcfg_pull_none_8ma>; /* lcdc_d20 */
-                       };
-
-                       lcdc_rgb666_m1_data_pins: lcdc-rgb666-m1-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>, /* lcdc_d12 */
-                                       <3 RK_PC5 1 &pcfg_pull_none_8ma>, /* lcdc_d17 */
-                                       <3 RK_PC4 1 &pcfg_pull_none_8ma>; /* lcdc_d16 */
-                       };
-
-                       lcdc_rgb565_m1_data_pins: lcdc-rgb565-m1-data-pins {
-                               rockchip,pins =
-                                       <3 RK_PA6 1 &pcfg_pull_none_8ma>, /* lcdc_d2 */
-                                       <3 RK_PA4 1 &pcfg_pull_none_8ma>, /* lcdc_d0 */
-                                       <3 RK_PB3 1 &pcfg_pull_none_8ma>, /* lcdc_d7 */
-                                       <3 RK_PB2 1 &pcfg_pull_none_8ma>, /* lcdc_d6 */
-                                       <3 RK_PB5 1 &pcfg_pull_none_8ma>, /* lcdc_d9 */
-                                       <3 RK_PC3 1 &pcfg_pull_none_8ma>, /* lcdc_d15 */
-                                       <3 RK_PC2 1 &pcfg_pull_none_8ma>, /* lcdc_d14 */
-                                       <3 RK_PC1 1 &pcfg_pull_none_8ma>, /* lcdc_d13 */
-                                       <3 RK_PC0 1 &pcfg_pull_none_8ma>; /* lcdc_d12 */
-                       };
-               };
-
-               pwm0 {
-                       pwm0_pin: pwm0-pin {
-                               rockchip,pins =
-                                       <0 RK_PB7 1 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm1 {
-                       pwm1_pin: pwm1-pin {
-                               rockchip,pins =
-                                       <0 RK_PC0 1 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm2 {
-                       pwm2_pin: pwm2-pin {
-                               rockchip,pins =
-                                       <2 RK_PB5 1 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm3 {
-                       pwm3_pin: pwm3-pin {
-                               rockchip,pins =
-                                       <0 RK_PC1 1 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm4 {
-                       pwm4_pin: pwm4-pin {
-                               rockchip,pins =
-                                       <3 RK_PC2 3 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm5 {
-                       pwm5_pin: pwm5-pin {
-                               rockchip,pins =
-                                       <3 RK_PC3 3 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm6 {
-                       pwm6_pin: pwm6-pin {
-                               rockchip,pins =
-                                       <3 RK_PC4 3 &pcfg_pull_none>;
-                       };
-               };
-
-               pwm7 {
-                       pwm7_pin: pwm7-pin {
-                               rockchip,pins =
-                                       <3 RK_PC5 3 &pcfg_pull_none>;
-                       };
-               };
-
-               gmac {
-                       rmii_pins: rmii-pins {
-                               rockchip,pins =
-                                       <2 RK_PA0 2 &pcfg_pull_none_12ma>, /* mac_txen */
-                                       <2 RK_PA1 2 &pcfg_pull_none_12ma>, /* mac_txd1 */
-                                       <2 RK_PA2 2 &pcfg_pull_none_12ma>, /* mac_txd0 */
-                                       <2 RK_PA3 2 &pcfg_pull_none>, /* mac_rxd0 */
-                                       <2 RK_PA4 2 &pcfg_pull_none>, /* mac_rxd1 */
-                                       <2 RK_PA5 2 &pcfg_pull_none>, /* mac_rxer */
-                                       <2 RK_PA6 2 &pcfg_pull_none>, /* mac_rxdv */
-                                       <2 RK_PA7 2 &pcfg_pull_none>, /* mac_mdio */
-                                       <2 RK_PB1 2 &pcfg_pull_none>; /* mac_mdc */
-                       };
-
-                       mac_refclk_12ma: mac-refclk-12ma {
-                               rockchip,pins =
-                                       <2 RK_PB2 2 &pcfg_pull_none_12ma>;
-                       };
-
-                       mac_refclk: mac-refclk {
-                               rockchip,pins =
-                                       <2 RK_PB2 2 &pcfg_pull_none>;
-                       };
-               };
-
-               cif-m0 {
-                       cif_clkout_m0: cif-clkout-m0 {
-                               rockchip,pins =
-                                       <2 RK_PB3 1 &pcfg_pull_none>;
-                       };
-
-                       dvp_d2d9_m0: dvp-d2d9-m0 {
-                               rockchip,pins =
-                                       <2 RK_PA0 1 &pcfg_pull_none>, /* cif_data2 */
-                                       <2 RK_PA1 1 &pcfg_pull_none>, /* cif_data3 */
-                                       <2 RK_PA2 1 &pcfg_pull_none>, /* cif_data4 */
-                                       <2 RK_PA3 1 &pcfg_pull_none>, /* cif_data5 */
-                                       <2 RK_PA4 1 &pcfg_pull_none>, /* cif_data6 */
-                                       <2 RK_PA5 1 &pcfg_pull_none>, /* cif_data7 */
-                                       <2 RK_PA6 1 &pcfg_pull_none>, /* cif_data8 */
-                                       <2 RK_PA7 1 &pcfg_pull_none>, /* cif_data9 */
-                                       <2 RK_PB0 1 &pcfg_pull_none>, /* cif_sync */
-                                       <2 RK_PB1 1 &pcfg_pull_none>, /* cif_href */
-                                       <2 RK_PB2 1 &pcfg_pull_none>, /* cif_clkin */
-                                       <2 RK_PB3 1 &pcfg_pull_none>; /* cif_clkout */
-                       };
-
-                       dvp_d0d1_m0: dvp-d0d1-m0 {
-                               rockchip,pins =
-                                       <2 RK_PB4 1 &pcfg_pull_none>, /* cif_data0 */
-                                       <2 RK_PB6 1 &pcfg_pull_none>; /* cif_data1 */
-                       };
-
-                       dvp_d10d11_m0:d10-d11-m0 {
-                               rockchip,pins =
-                                       <2 RK_PB7 1 &pcfg_pull_none>, /* cif_data10 */
-                                       <2 RK_PC0 1 &pcfg_pull_none>; /* cif_data11 */
-                       };
-               };
-
-               cif-m1 {
-                       cif_clkout_m1: cif-clkout-m1 {
-                               rockchip,pins =
-                                       <3 RK_PD0 3 &pcfg_pull_none>;
-                       };
-
-                       dvp_d2d9_m1: dvp-d2d9-m1 {
-                               rockchip,pins =
-                                       <3 RK_PA3 3 &pcfg_pull_none>, /* cif_data2 */
-                                       <3 RK_PA5 3 &pcfg_pull_none>, /* cif_data3 */
-                                       <3 RK_PA7 3 &pcfg_pull_none>, /* cif_data4 */
-                                       <3 RK_PB0 3 &pcfg_pull_none>, /* cif_data5 */
-                                       <3 RK_PB1 3 &pcfg_pull_none>, /* cif_data6 */
-                                       <3 RK_PB4 3 &pcfg_pull_none>, /* cif_data7 */
-                                       <3 RK_PB6 3 &pcfg_pull_none>, /* cif_data8 */
-                                       <3 RK_PB7 3 &pcfg_pull_none>, /* cif_data9 */
-                                       <3 RK_PD1 3 &pcfg_pull_none>, /* cif_sync */
-                                       <3 RK_PD2 3 &pcfg_pull_none>, /* cif_href */
-                                       <3 RK_PD3 3 &pcfg_pull_none>, /* cif_clkin */
-                                       <3 RK_PD0 3 &pcfg_pull_none>; /* cif_clkout */
-                       };
-
-                       dvp_d0d1_m1: dvp-d0d1-m1 {
-                               rockchip,pins =
-                                       <3 RK_PA1 3 &pcfg_pull_none>, /* cif_data0 */
-                                       <3 RK_PA2 3 &pcfg_pull_none>; /* cif_data1 */
-                       };
-
-                       dvp_d10d11_m1:d10-d11-m1 {
-                               rockchip,pins =
-                                       <3 RK_PC6 3 &pcfg_pull_none>, /* cif_data10 */
-                                       <3 RK_PC7 3 &pcfg_pull_none>; /* cif_data11 */
-                       };
-               };
-
-               isp {
-                       isp_prelight: isp-prelight {
-                               rockchip,pins =
-                                       <3 RK_PD1 4 &pcfg_pull_none>;
-                       };
-               };
-       };
-};
index a31dea8db3e9f9ac1843d0c8e431387b65099a19..a0ab8b69f2e4d09affe5114d157afa16739d9ba0 100644 (file)
 
 &gpio0 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 0 32>;
 };
 
 &gpio1 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 32 32>;
 };
 
 &gpio2 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 64 32>;
 };
 
 &gpio3 {
        bootph-all;
+       gpio-ranges = <&pinctrl 0 96 32>;
 };
 
 &grf {
diff --git a/arch/arm/dts/rk3326.dtsi b/arch/arm/dts/rk3326.dtsi
deleted file mode 100644 (file)
index 2ba6da1..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include "px30.dtsi"
-
-&display_subsystem {
-       ports = <&vopb_out>;
-};
-
-/delete-node/ &dsi_in_vopl;
-/delete-node/ &lvds_vopl_in;
-/delete-node/ &vopl;
-/delete-node/ &vopl_mmu;
diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h
deleted file mode 100644 (file)
index e5e5969..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2017 Rockchip Electronics Co. Ltd.
- * Author: Elaine <zhangqing@rock-chips.com>
- */
-
-#ifndef _DT_BINDINGS_CLK_ROCKCHIP_PX30_H
-#define _DT_BINDINGS_CLK_ROCKCHIP_PX30_H
-
-/* core clocks */
-#define PLL_APLL               1
-#define PLL_DPLL               2
-#define PLL_CPLL               3
-#define PLL_NPLL               4
-#define APLL_BOOST_H           5
-#define APLL_BOOST_L           6
-#define ARMCLK                 7
-
-/* sclk gates (special clocks) */
-#define USB480M                        14
-#define SCLK_PDM               15
-#define SCLK_I2S0_TX           16
-#define SCLK_I2S0_TX_OUT       17
-#define SCLK_I2S0_RX           18
-#define SCLK_I2S0_RX_OUT       19
-#define SCLK_I2S1              20
-#define SCLK_I2S1_OUT          21
-#define SCLK_I2S2              22
-#define SCLK_I2S2_OUT          23
-#define SCLK_UART1             24
-#define SCLK_UART2             25
-#define SCLK_UART3             26
-#define SCLK_UART4             27
-#define SCLK_UART5             28
-#define SCLK_I2C0              29
-#define SCLK_I2C1              30
-#define SCLK_I2C2              31
-#define SCLK_I2C3              32
-#define SCLK_I2C4              33
-#define SCLK_PWM0              34
-#define SCLK_PWM1              35
-#define SCLK_SPI0              36
-#define SCLK_SPI1              37
-#define SCLK_TIMER0            38
-#define SCLK_TIMER1            39
-#define SCLK_TIMER2            40
-#define SCLK_TIMER3            41
-#define SCLK_TIMER4            42
-#define SCLK_TIMER5            43
-#define SCLK_TSADC             44
-#define SCLK_SARADC            45
-#define SCLK_OTP               46
-#define SCLK_OTP_USR           47
-#define SCLK_CRYPTO            48
-#define SCLK_CRYPTO_APK                49
-#define SCLK_DDRC              50
-#define SCLK_ISP               51
-#define SCLK_CIF_OUT           52
-#define SCLK_RGA_CORE          53
-#define SCLK_VOPB_PWM          54
-#define SCLK_NANDC             55
-#define SCLK_SDIO              56
-#define SCLK_EMMC              57
-#define SCLK_SFC               58
-#define SCLK_SDMMC             59
-#define SCLK_OTG_ADP           60
-#define SCLK_GMAC_SRC          61
-#define SCLK_GMAC              62
-#define SCLK_GMAC_RX_TX                63
-#define SCLK_MAC_REF           64
-#define SCLK_MAC_REFOUT                65
-#define SCLK_MAC_OUT           66
-#define SCLK_SDMMC_DRV         67
-#define SCLK_SDMMC_SAMPLE      68
-#define SCLK_SDIO_DRV          69
-#define SCLK_SDIO_SAMPLE       70
-#define SCLK_EMMC_DRV          71
-#define SCLK_EMMC_SAMPLE       72
-#define SCLK_GPU               73
-#define SCLK_PVTM              74
-#define SCLK_CORE_VPU          75
-#define SCLK_GMAC_RMII         76
-#define SCLK_UART2_SRC         77
-#define SCLK_NANDC_DIV         78
-#define SCLK_NANDC_DIV50       79
-#define SCLK_SDIO_DIV          80
-#define SCLK_SDIO_DIV50                81
-#define SCLK_EMMC_DIV          82
-#define SCLK_EMMC_DIV50                83
-
-/* dclk gates */
-#define DCLK_VOPB              150
-#define DCLK_VOPL              151
-
-/* aclk gates */
-#define ACLK_GPU               170
-#define ACLK_BUS_PRE           171
-#define ACLK_CRYPTO            172
-#define ACLK_VI_PRE            173
-#define ACLK_VO_PRE            174
-#define ACLK_VPU               175
-#define ACLK_PERI_PRE          176
-#define ACLK_GMAC              178
-#define ACLK_CIF               179
-#define ACLK_ISP               180
-#define ACLK_VOPB              181
-#define ACLK_VOPL              182
-#define ACLK_RGA               183
-#define ACLK_GIC               184
-#define ACLK_DCF               186
-#define ACLK_DMAC              187
-
-/* hclk gates */
-#define HCLK_BUS_PRE           240
-#define HCLK_CRYPTO            241
-#define HCLK_VI_PRE            242
-#define HCLK_VO_PRE            243
-#define HCLK_VPU               244
-#define HCLK_PERI_PRE          245
-#define HCLK_MMC_NAND          246
-#define HCLK_SDMMC             247
-#define HCLK_USB               248
-#define HCLK_CIF               249
-#define HCLK_ISP               250
-#define HCLK_VOPB              251
-#define HCLK_VOPL              252
-#define HCLK_RGA               253
-#define HCLK_NANDC             254
-#define HCLK_SDIO              255
-#define HCLK_EMMC              256
-#define HCLK_SFC               257
-#define HCLK_OTG               258
-#define HCLK_HOST              259
-#define HCLK_HOST_ARB          260
-#define HCLK_PDM               261
-#define HCLK_I2S0              262
-#define HCLK_I2S1              263
-#define HCLK_I2S2              264
-
-/* pclk gates */
-#define PCLK_BUS_PRE           320
-#define PCLK_DDR               321
-#define PCLK_VO_PRE            322
-#define PCLK_GMAC              323
-#define PCLK_MIPI_DSI          324
-#define PCLK_MIPIDSIPHY                325
-#define PCLK_MIPICSIPHY                326
-#define PCLK_USB_GRF           327
-#define PCLK_DCF               328
-#define PCLK_UART1             329
-#define PCLK_UART2             330
-#define PCLK_UART3             331
-#define PCLK_UART4             332
-#define PCLK_UART5             333
-#define PCLK_I2C0              334
-#define PCLK_I2C1              335
-#define PCLK_I2C2              336
-#define PCLK_I2C3              337
-#define PCLK_I2C4              338
-#define PCLK_PWM0              339
-#define PCLK_PWM1              340
-#define PCLK_SPI0              341
-#define PCLK_SPI1              342
-#define PCLK_SARADC            343
-#define PCLK_TSADC             344
-#define PCLK_TIMER             345
-#define PCLK_OTP_NS            346
-#define PCLK_WDT_NS            347
-#define PCLK_GPIO1             348
-#define PCLK_GPIO2             349
-#define PCLK_GPIO3             350
-#define PCLK_ISP               351
-#define PCLK_CIF               352
-#define PCLK_OTP_PHY           353
-
-#define CLK_NR_CLKS            (PCLK_OTP_PHY + 1)
-
-/* pmu-clocks indices */
-
-#define PLL_GPLL               1
-
-#define SCLK_RTC32K_PMU                4
-#define SCLK_WIFI_PMU          5
-#define SCLK_UART0_PMU         6
-#define SCLK_PVTM_PMU          7
-#define PCLK_PMU_PRE           8
-#define SCLK_REF24M_PMU                9
-#define SCLK_USBPHY_REF                10
-#define SCLK_MIPIDSIPHY_REF    11
-
-#define XIN24M_DIV             12
-
-#define PCLK_GPIO0_PMU         20
-#define PCLK_UART0_PMU         21
-
-#define CLKPMU_NR_CLKS         (PCLK_UART0_PMU + 1)
-
-/* soft-reset indices */
-#define SRST_CORE0_PO          0
-#define SRST_CORE1_PO          1
-#define SRST_CORE2_PO          2
-#define SRST_CORE3_PO          3
-#define SRST_CORE0             4
-#define SRST_CORE1             5
-#define SRST_CORE2             6
-#define SRST_CORE3             7
-#define SRST_CORE0_DBG         8
-#define SRST_CORE1_DBG         9
-#define SRST_CORE2_DBG         10
-#define SRST_CORE3_DBG         11
-#define SRST_TOPDBG            12
-#define SRST_CORE_NOC          13
-#define SRST_STRC_A            14
-#define SRST_L2C               15
-
-#define SRST_DAP               16
-#define SRST_CORE_PVTM         17
-#define SRST_GPU               18
-#define SRST_GPU_NIU           19
-#define SRST_UPCTL2            20
-#define SRST_UPCTL2_A          21
-#define SRST_UPCTL2_P          22
-#define SRST_MSCH              23
-#define SRST_MSCH_P            24
-#define SRST_DDRMON_P          25
-#define SRST_DDRSTDBY_P                26
-#define SRST_DDRSTDBY          27
-#define SRST_DDRGRF_p          28
-#define SRST_AXI_SPLIT_A       29
-#define SRST_AXI_CMD_A         30
-#define SRST_AXI_CMD_P         31
-
-#define SRST_DDRPHY            32
-#define SRST_DDRPHYDIV         33
-#define SRST_DDRPHY_P          34
-#define SRST_VPU_A             36
-#define SRST_VPU_NIU_A         37
-#define SRST_VPU_H             38
-#define SRST_VPU_NIU_H         39
-#define SRST_VI_NIU_A          40
-#define SRST_VI_NIU_H          41
-#define SRST_ISP_H             42
-#define SRST_ISP               43
-#define SRST_CIF_A             44
-#define SRST_CIF_H             45
-#define SRST_CIF_PCLKIN                46
-#define SRST_MIPICSIPHY_P      47
-
-#define SRST_VO_NIU_A          48
-#define SRST_VO_NIU_H          49
-#define SRST_VO_NIU_P          50
-#define SRST_VOPB_A            51
-#define SRST_VOPB_H            52
-#define SRST_VOPB              53
-#define SRST_PWM_VOPB          54
-#define SRST_VOPL_A            55
-#define SRST_VOPL_H            56
-#define SRST_VOPL              57
-#define SRST_RGA_A             58
-#define SRST_RGA_H             59
-#define SRST_RGA               60
-#define SRST_MIPIDSI_HOST_P    61
-#define SRST_MIPIDSIPHY_P      62
-#define SRST_VPU_CORE          63
-
-#define SRST_PERI_NIU_A                64
-#define SRST_USB_NIU_H         65
-#define SRST_USB2OTG_H         66
-#define SRST_USB2OTG           67
-#define SRST_USB2OTG_ADP       68
-#define SRST_USB2HOST_H                69
-#define SRST_USB2HOST_ARB_H    70
-#define SRST_USB2HOST_AUX_H    71
-#define SRST_USB2HOST_EHCI     72
-#define SRST_USB2HOST          73
-#define SRST_USBPHYPOR         74
-#define SRST_USBPHY_OTG_PORT   75
-#define SRST_USBPHY_HOST_PORT  76
-#define SRST_USBPHY_GRF                77
-#define SRST_CPU_BOOST_P       78
-#define SRST_CPU_BOOST         79
-
-#define SRST_MMC_NAND_NIU_H    80
-#define SRST_SDIO_H            81
-#define SRST_EMMC_H            82
-#define SRST_SFC_H             83
-#define SRST_SFC               84
-#define SRST_SDCARD_NIU_H      85
-#define SRST_SDMMC_H           86
-#define SRST_NANDC_H           89
-#define SRST_NANDC             90
-#define SRST_GMAC_NIU_A                92
-#define SRST_GMAC_NIU_P                93
-#define SRST_GMAC_A            94
-
-#define SRST_PMU_NIU_P         96
-#define SRST_PMU_SGRF_P                97
-#define SRST_PMU_GRF_P         98
-#define SRST_PMU               99
-#define SRST_PMU_MEM_P         100
-#define SRST_PMU_GPIO0_P       101
-#define SRST_PMU_UART0_P       102
-#define SRST_PMU_CRU_P         103
-#define SRST_PMU_PVTM          104
-#define SRST_PMU_UART          105
-#define SRST_PMU_NIU_H         106
-#define SRST_PMU_DDR_FAIL_SAVE 107
-#define SRST_PMU_CORE_PERF_A   108
-#define SRST_PMU_CORE_GRF_P    109
-#define SRST_PMU_GPU_PERF_A    110
-#define SRST_PMU_GPU_GRF_P     111
-
-#define SRST_CRYPTO_NIU_A      112
-#define SRST_CRYPTO_NIU_H      113
-#define SRST_CRYPTO_A          114
-#define SRST_CRYPTO_H          115
-#define SRST_CRYPTO            116
-#define SRST_CRYPTO_APK                117
-#define SRST_BUS_NIU_H         120
-#define SRST_USB_NIU_P         121
-#define SRST_BUS_TOP_NIU_P     122
-#define SRST_INTMEM_A          123
-#define SRST_GIC_A             124
-#define SRST_ROM_H             126
-#define SRST_DCF_A             127
-
-#define SRST_DCF_P             128
-#define SRST_PDM_H             129
-#define SRST_PDM               130
-#define SRST_I2S0_H            131
-#define SRST_I2S0_TX           132
-#define SRST_I2S1_H            133
-#define SRST_I2S1              134
-#define SRST_I2S2_H            135
-#define SRST_I2S2              136
-#define SRST_UART1_P           137
-#define SRST_UART1             138
-#define SRST_UART2_P           139
-#define SRST_UART2             140
-#define SRST_UART3_P           141
-#define SRST_UART3             142
-#define SRST_UART4_P           143
-
-#define SRST_UART4             144
-#define SRST_UART5_P           145
-#define SRST_UART5             146
-#define SRST_I2C0_P            147
-#define SRST_I2C0              148
-#define SRST_I2C1_P            149
-#define SRST_I2C1              150
-#define SRST_I2C2_P            151
-#define SRST_I2C2              152
-#define SRST_I2C3_P            153
-#define SRST_I2C3              154
-#define SRST_PWM0_P            157
-#define SRST_PWM0              158
-#define SRST_PWM1_P            159
-
-#define SRST_PWM1              160
-#define SRST_SPI0_P            161
-#define SRST_SPI0              162
-#define SRST_SPI1_P            163
-#define SRST_SPI1              164
-#define SRST_SARADC_P          165
-#define SRST_SARADC            166
-#define SRST_TSADC_P           167
-#define SRST_TSADC             168
-#define SRST_TIMER_P           169
-#define SRST_TIMER0            170
-#define SRST_TIMER1            171
-#define SRST_TIMER2            172
-#define SRST_TIMER3            173
-#define SRST_TIMER4            174
-#define SRST_TIMER5            175
-
-#define SRST_OTP_NS_P          176
-#define SRST_OTP_NS_SBPI       177
-#define SRST_OTP_NS_USR                178
-#define SRST_OTP_PHY_P         179
-#define SRST_OTP_PHY           180
-#define SRST_WDT_NS_P          181
-#define SRST_GPIO1_P           182
-#define SRST_GPIO2_P           183
-#define SRST_GPIO3_P           184
-#define SRST_SGRF_P            185
-#define SRST_GRF_P             186
-#define SRST_I2S0_RX           191
-
-#endif
diff --git a/include/dt-bindings/power/px30-power.h b/include/dt-bindings/power/px30-power.h
deleted file mode 100644 (file)
index 30917a9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __DT_BINDINGS_POWER_PX30_POWER_H__
-#define __DT_BINDINGS_POWER_PX30_POWER_H__
-
-/* VD_CORE */
-#define PX30_PD_A35_0          0
-#define PX30_PD_A35_1          1
-#define PX30_PD_A35_2          2
-#define PX30_PD_A35_3          3
-#define PX30_PD_SCU            4
-
-/* VD_LOGIC */
-#define PX30_PD_USB            5
-#define PX30_PD_DDR            6
-#define PX30_PD_SDCARD         7
-#define PX30_PD_CRYPTO         8
-#define PX30_PD_GMAC           9
-#define PX30_PD_MMC_NAND       10
-#define PX30_PD_VPU            11
-#define PX30_PD_VO             12
-#define PX30_PD_VI             13
-#define PX30_PD_GPU            14
-
-/* VD_PMU */
-#define PX30_PD_PMU            15
-
-#endif