arm64: dts: rockchip: add efuse device node for rk3328
[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3328.dtsi
index 0f4e094e1f4b96e527fefd11f24395673e89d45b..fd76037e75c4b9a8e5fc44456647a569bb74359a 100644 (file)
@@ -45,7 +45,9 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/rockchip.h>
-#include <dt-bindings/soc/rockchip_boot-mode.h>
+#include <dt-bindings/soc/rockchip,boot-mode.h>
+#include <dt-bindings/power/rk3328-power.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        compatible = "rockchip,rk3328";
@@ -73,7 +75,9 @@
                        compatible = "arm,cortex-a53", "arm,armv8";
                        reg = <0x0 0x0>;
                        enable-method = "psci";
-//                     clocks = <&cru ARMCLK>;
+                       clocks = <&cru ARMCLK>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <120>;
                        operating-points-v2 = <&cpu0_opp_table>;
                };
                cpu1: cpu@1 {
                        compatible = "arm,cortex-a53", "arm,armv8";
                        reg = <0x0 0x1>;
                        enable-method = "psci";
+                       operating-points-v2 = <&cpu0_opp_table>;
                };
                cpu2: cpu@2 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a53", "arm,armv8";
                        reg = <0x0 0x2>;
                        enable-method = "psci";
+                       operating-points-v2 = <&cpu0_opp_table>;
                };
                cpu3: cpu@3 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a53", "arm,armv8";
                        reg = <0x0 0x3>;
                        enable-method = "psci";
+                       operating-points-v2 = <&cpu0_opp_table>;
                };
        };
 
                status = "disabled";
        };
 
+       pdm: pdm@ff040000 {
+               compatible = "rockchip,pdm";
+               reg = <0x0 0xff040000 0x0 0x1000>;
+               clocks = <&cru SCLK_PDM>, <&cru HCLK_PDM>;
+               clock-names = "pdm_clk", "pdm_hclk";
+               dmas = <&dmac 16>;
+               #dma-cells = <1>;
+               dma-names = "rx";
+               pinctrl-names = "default", "sleep";
+               pinctrl-0 = <&pdmm0_clk
+                            &pdmm0_fsync
+                            &pdmm0_sdi0
+                            &pdmm0_sdi1
+                            &pdmm0_sdi2
+                            &pdmm0_sdi3>;
+               pinctrl-1 = <&pdmm0_sleep>;
+               status = "disabled";
+       };
+
        grf: syscon@ff100000 {
                compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
                reg = <0x0 0xff100000 0x0 0x1000>;
                        status = "disabled";
                };
 
+               power: power-controller {
+                       compatible = "rockchip,rk3328-power-controller";
+                       #power-domain-cells = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       pd_hevc@RK3328_PD_HEVC {
+                               reg = <RK3328_PD_HEVC>;
+                       };
+                       pd_video@RK3328_PD_VIDEO {
+                               reg = <RK3328_PD_VIDEO>;
+                       };
+                       pd_vpu@RK3328_PD_VPU {
+                               reg = <RK3328_PD_VPU>;
+                       };
+               };
+
                reboot-mode {
                        compatible = "syscon-reboot-mode";
                        offset = <0x5c8>;
-                       mode-bootloader = <BOOT_LOADER>;
+                       mode-bootloader = <BOOT_BL_DOWNLOAD>;
                        mode-charge = <BOOT_CHARGING>;
                        mode-fastboot = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-ums = <BOOT_UMS>;
                };
        };
 
+       thermal-zones {
+               soc_thermal: soc-thermal {
+                       polling-delay-passive = <20>; /* milliseconds */
+                       polling-delay = <1000>; /* milliseconds */
+                       sustainable-power = <1000>; /* milliwatts */
+
+                       thermal-sensors = <&tsadc 0>;
+
+                       trips {
+                               threshold: trip-point@0 {
+                                       temperature = <70000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "passive";
+                               };
+                               target: trip-point@1 {
+                                       temperature = <85000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "passive";
+                               };
+                               soc_crit: soc-crit {
+                                       temperature = <95000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&target>;
+                                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                       contribution = <4096>;
+                               };
+                       };
+               };
+
+       };
+
+       tsadc: tsadc@ff250000 {
+               compatible = "rockchip,rk3328-tsadc";
+               reg = <0x0 0xff250000 0x0 0x100>;
+               interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH 0>;
+               rockchip,grf = <&grf>;
+               clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
+               clock-names = "tsadc", "apb_pclk";
+               assigned-clocks = <&cru SCLK_TSADC>;
+               assigned-clock-rates = <50000>;
+               resets = <&cru SRST_TSADC>;
+               reset-names = "tsadc-apb";
+               pinctrl-names = "init", "default", "sleep";
+               pinctrl-0 = <&otp_gpio>;
+               pinctrl-1 = <&otp_out>;
+               pinctrl-2 = <&otp_gpio>;
+               #thermal-sensor-cells = <1>;
+               rockchip,hw-tshut-temp = <100000>;
+               status = "disabled";
+       };
+
        uart0: serial@ff110000 {
                compatible = "rockchip,rk3328-uart", "snps,dw-apb-uart";
                reg = <0x0 0xff110000 0x0 0x100>;
        };
 
        i2c0: i2c@ff150000 {
-               compatible = "rockchip,rk3328-i2c";
+               compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c";
                reg = <0x0 0xff150000 0x0 0x1000>;
                interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
        };
 
        i2c1: i2c@ff160000 {
-               compatible = "rockchip,rk3328-i2c";
+               compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c";
                reg = <0x0 0xff160000 0x0 0x1000>;
                interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
        };
 
        i2c2: i2c@ff170000 {
-               compatible = "rockchip,rk3328-i2c";
+               compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c";
                reg = <0x0 0xff170000 0x0 0x1000>;
                interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
        };
 
        i2c3: i2c@ff180000 {
-               compatible = "rockchip,rk3328-i2c";
+               compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c";
                reg = <0x0 0xff180000 0x0 0x1000>;
                interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                status = "disabled";
        };
 
+       pwm0: pwm@ff1b0000 {
+               compatible = "rockchip,rk3328-pwm";
+               reg = <0x0 0xff1b0000 0x0 0x10>;
+               #pwm-cells = <3>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pwm0_pin>;
+               clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>;
+               clock-names = "pwm", "pclk";
+               status = "disabled";
+       };
+
+       pwm1: pwm@ff1b0010 {
+               compatible = "rockchip,rk3328-pwm";
+               reg = <0x0 0xff1b0010 0x0 0x10>;
+               #pwm-cells = <3>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pwm1_pin>;
+               clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>;
+               clock-names = "pwm", "pclk";
+               status = "disabled";
+       };
+
+       pwm2: pwm@ff1b0020 {
+               compatible = "rockchip,rk3328-pwm";
+               reg = <0x0 0xff1b0020 0x0 0x10>;
+               #pwm-cells = <3>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pwm2_pin>;
+               clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>;
+               clock-names = "pwm", "pclk";
+               status = "disabled";
+       };
+
+       pwm3: pwm@ff1b0030 {
+               compatible = "rockchip,rk3328-pwm";
+               reg = <0x0 0xff1b0030 0x0 0x10>;
+               interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+               #pwm-cells = <3>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pwmir_pin>;
+               clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>;
+               clock-names = "pwm", "pclk";
+               status = "disabled";
+       };
+
        amba {
                compatible = "simple-bus";
                #address-cells = <2>;
                };
        };
 
+       efuse: efuse@ff260000 {
+               compatible = "rockchip,rk3328-efuse";
+               reg = <0x0 0xff260000 0x0 0x50>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               clocks = <&cru SCLK_EFUSE>;
+               clock-names = "pclk_efuse";
+               rockchip,efuse-size = <0x20>;
+
+               /* Data cells */
+               efuse_id: id@7 {
+                       reg = <0x07 0x10>;
+               };
+               cpu_leakage: cpu-leakage@17 {
+                       reg = <0x17 0x1>;
+               };
+               logic_leakage: logic-leakage@19 {
+                       reg = <0x19 0x1>;
+               };
+       };
+
        saradc: saradc@ff280000 {
-               compatible = "rockchip,rk3328-saradc", "rockchip,saradc";
+               compatible = "rockchip,rk3328-saradc", "rockchip,rk3399-saradc";
                reg = <0x0 0xff280000 0x0 0x100>;
                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                #io-channel-cells = <1>;
                status = "disabled";
        };
 
+       gpu: gpu@ff300000 {
+               compatible = "arm,mali-450";
+               /* first item of 'reg' is dummy, to fit src code. */
+               reg = <0x0 0xff300000 0x0 0x40000>,
+                     <0x0 0xff300000 0x0 0x40000>;
+               interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "Mali_GP_IRQ",
+                                 "Mali_GP_MMU_IRQ",
+                                 "IRQPP",
+                                 "Mali_PP0_IRQ",
+                                 "Mali_PP0_MMU_IRQ",
+                                 "Mali_PP1_IRQ",
+                                 "Mali_PP1_MMU_IRQ";
+               clocks = <&cru ACLK_GPU>;
+               clock-names = "clk_mali";
+               operating-points-v2 = <&gpu_opp_table>;
+               status = "disabled";
+       };
+
+       gpu_opp_table: opp-table2 {
+               compatible = "operating-points-v2";
+
+               opp@200000000 {
+                       opp-hz = /bits/ 64 <200000000>;
+                       opp-microvolt = <1050000>;
+               };
+               opp@300000000 {
+                       opp-hz = /bits/ 64 <300000000>;
+                       opp-microvolt = <1050000>;
+               };
+               opp@400000000 {
+                       opp-hz = /bits/ 64 <400000000>;
+                       opp-microvolt = <1050000>;
+               };
+               opp@500000000 {
+                       opp-hz = /bits/ 64 <500000000>;
+                       opp-microvolt = <1100000>;
+               };
+       };
+
+       vop: vop@ff370000 {
+               compatible = "rockchip,rk3328-vop";
+               reg = <0x0 0xff370000 0x0 0x3efc>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+               clocks = <&cru ACLK_VOP>, <&cru DCLK_LCDC>, <&cru HCLK_VOP>;
+               clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+               resets = <&cru SRST_VOP_A>, <&cru SRST_VOP_H>, <&cru SRST_VOP_D>;
+               reset-names = "axi", "ahb", "dclk";
+               iommus = <&vop_mmu>;
+               status = "disabled";
+
+               vop_out: port {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+       };
+
+       vop_mmu: iommu@ff373f00 {
+               compatible = "rockchip,iommu";
+               reg = <0x0 0xff373f00 0x0 0x100>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+               interrupt-names = "vop_mmu";
+               #iommu-cells = <0>;
+               status = "disabled";
+       };
+
+       display_subsystem: display-subsystem {
+               compatible = "rockchip,display-subsystem";
+               ports = <&vop_out>;
+               status = "disabled";
+       };
+
        cru: clock-controller@ff440000 {
                compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
                reg = <0x0 0xff440000 0x0 0x1000>;
                        <32768>, <32768>;
        };
 
-       gic: interrupt-controller@ffb70000 {
+       usb2phy_grf: syscon@ff450000 {
+               compatible = "rockchip,rk3328-usb2phy-grf", "syscon",
+                            "simple-mfd";
+               reg = <0x0 0xff450000 0x0 0x10000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               u2phy: usb2-phy@100 {
+                       compatible = "rockchip,rk3328-usb2phy";
+                       reg = <0x100 0x10>;
+                       clocks = <&xin24m>;
+                       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 62 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-names = "linestate";
+                               status = "disabled";
+                       };
+
+                       u2phy_otg: otg-port {
+                               #phy-cells = <0>;
+                               interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-names = "otg-bvalid", "otg-id",
+                                                 "linestate";
+                               status = "disabled";
+                       };
+               };
+       };
+
+       usb3phy_grf: syscon@ff460000 {
+               compatible = "rockchip,usb3phy-grf", "syscon";
+               reg = <0x0 0xff460000 0x0 0x1000>;
+       };
+
+       u3phy: usb3-phy@ff470000 {
+               compatible = "rockchip,rk3328-u3phy";
+               reg = <0x0 0xff470000 0x0 0x0>;
+               rockchip,u3phygrf = <&usb3phy_grf>;
+               rockchip,grf = <&grf>;
+               interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "linestate";
+               clocks = <&cru PCLK_USB3PHY_OTG>, <&cru PCLK_USB3PHY_PIPE>;
+               clock-names = "u3phy-otg", "u3phy-pipe";
+               resets = <&cru SRST_USB3PHY_U2>,
+                        <&cru SRST_USB3PHY_U3>,
+                        <&cru SRST_USB3PHY_PIPE>,
+                        <&cru SRST_USB3OTG_UTMI>,
+                        <&cru SRST_USB3PHY_OTG_P>,
+                        <&cru SRST_USB3PHY_PIPE_P>;
+               reset-names = "u3phy-u2-por", "u3phy-u3-por",
+                             "u3phy-pipe-mac", "u3phy-utmi-mac",
+                             "u3phy-utmi-apb", "u3phy-pipe-apb";
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               status = "disabled";
+
+               u3phy_utmi: utmi@ff470000 {
+                       reg = <0x0 0xff470000 0x0 0x8000>;
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+
+               u3phy_pipe: pipe@ff478000 {
+                       reg = <0x0 0xff478000 0x0 0x8000>;
+                       #phy-cells = <0>;
+                       status = "disabled";
+               };
+       };
+
+       sdmmc: rksdmmc@ff500000 {
+               compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
+               reg = <0x0 0xff500000 0x0 0x4000>;
+               clock-freq-min-max = <400000 150000000>;
+               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
+               clock-names = "biu", "ciu";
+               fifo-depth = <0x100>;
+               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+               status = "disabled";
+       };
+
+       sdio: dwmmc@ff510000 {
+               compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
+               reg = <0x0 0xff510000 0x0 0x4000>;
+               clock-freq-min-max = <400000 150000000>;
+               clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
+                        <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
+               clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+               fifo-depth = <0x100>;
+               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+               status = "disabled";
+       };
+
+       emmc: rksdmmc@ff520000 {
+               compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
+               reg = <0x0 0xff520000 0x0 0x4000>;
+               clock-freq-min-max = <400000 150000000>;
+               clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
+               clock-names = "biu", "ciu";
+               fifo-depth = <0x100>;
+               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+               status = "disabled";
+       };
+
+       gmac2io: eth@ff540000 {
+               compatible = "rockchip,rk3328-gmac";
+               reg = <0x0 0xff540000 0x0 0x10000>;
+               rockchip,grf = <&grf>;
+               interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "macirq";
+               clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_RX>,
+                        <&cru SCLK_MAC2IO_TX>, <&cru SCLK_MAC2IO_REF>,
+                        <&cru SCLK_MAC2IO_REFOUT>, <&cru ACLK_MAC2IO>,
+                        <&cru PCLK_MAC2IO>;
+               clock-names = "stmmaceth", "mac_clk_rx",
+                             "mac_clk_tx", "clk_mac_ref",
+                             "clk_mac_refout", "aclk_mac",
+                             "pclk_mac";
+               resets = <&cru SRST_GMAC2IO_A>;
+               reset-names = "stmmaceth";
+               status = "disabled";
+       };
+
+       usb20_otg: usb@ff580000 {
+               compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb",
+                            "snps,dwc2";
+               reg = <0x0 0xff580000 0x0 0x40000>;
+               interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_OTG>, <&cru HCLK_OTG_PMU>;
+               clock-names = "otg", "otg_pmu";
+               dr_mode = "otg";
+               g-np-tx-fifo-size = <16>;
+               g-rx-fifo-size = <275>;
+               g-tx-fifo-size = <256 128 128 64 64 32>;
+               g-use-dma;
+               phys = <&u2phy_otg>;
+               phy-names = "usb2-phy";
+               status = "disabled";
+       };
+
+       usb_host0_ehci: usb@ff5c0000 {
+               compatible = "generic-ehci";
+               reg = <0x0 0xff5c0000 0x0 0x10000>;
+               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+                        <&u2phy>;
+               clock-names = "usbhost", "arbiter", "utmi";
+               phys = <&u2phy_host>;
+               phy-names = "usb";
+               status = "disabled";
+       };
+
+       usb_host0_ohci: usb@ff5d0000 {
+               compatible = "generic-ohci";
+               reg = <0x0 0xff5d0000 0x0 0x10000>;
+               interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+                        <&u2phy>;
+               clock-names = "usbhost", "arbiter", "utmi";
+               phys = <&u2phy_host>;
+               phy-names = "usb";
+               status = "disabled";
+       };
+
+       sdmmc_ext: rksdmmc@ff5f0000 {
+               compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
+               reg = <0x0 0xff5f0000 0x0 0x4000>;
+               clock-freq-min-max = <400000 150000000>;
+               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
+               clock-names = "biu", "ciu";
+               fifo-depth = <0x100>;
+               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+               status = "disabled";
+       };
+
+       usbdrd3: usb@ff600000 {
+               compatible = "rockchip,rk3328-dwc3";
+               clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
+                        <&cru ACLK_USB3OTG>;
+               clock-names = "ref_clk", "suspend_clk",
+                             "bus_clk";
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               status = "disabled";
+
+               usbdrd_dwc3: dwc3@ff600000 {
+                       compatible = "snps,dwc3";
+                       reg = <0x0 0xff600000 0x0 0x100000>;
+                       interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+                       dr_mode = "host";
+                       phys = <&u3phy_utmi>, <&u3phy_pipe>;
+                       phy-names = "usb2-phy", "usb3-phy";
+                       phy_type = "utmi_wide";
+                       snps,dis_enblslpm_quirk;
+                       snps,dis-u2-freeclk-exists-quirk;
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis-u3-autosuspend-quirk;
+                       snps,dis_u3_susphy_quirk;
+                       snps,dis-del-phy-power-chg-quirk;
+                       status = "disabled";
+               };
+       };
+
+       gic: interrupt-controller@ff811000 {
                compatible = "arm,gic-400";
                #interrupt-cells = <3>;
                #address-cells = <0>;
                i2c0 {
                        i2c0_xfer: i2c0-xfer {
                                rockchip,pins =
-                                       <2 24 RK_FUNC_1 &pcfg_pull_none>,
-                                       <2 25 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
+                                       <2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                i2c1 {
                        i2c1_xfer: i2c1-xfer {
                                rockchip,pins =
-                                       <2 4 RK_FUNC_2 &pcfg_pull_none>,
-                                       <2 5 RK_FUNC_2 &pcfg_pull_none>;
+                                       <2 RK_PA4 RK_FUNC_2 &pcfg_pull_none>,
+                                       <2 RK_PA5 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                i2c2 {
                        i2c2_xfer: i2c2-xfer {
                                rockchip,pins =
-                                       <2 13 RK_FUNC_1 &pcfg_pull_none>,
-                                       <2 14 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PB5 RK_FUNC_1 &pcfg_pull_none>,
+                                       <2 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                i2c3 {
                        i2c3_xfer: i2c3-xfer {
                                rockchip,pins =
-                                       <0 5 RK_FUNC_2 &pcfg_pull_none>,
-                                       <0 6 RK_FUNC_2 &pcfg_pull_none>;
+                                       <0 RK_PA5 RK_FUNC_2 &pcfg_pull_none>,
+                                       <0 RK_PA6 RK_FUNC_2 &pcfg_pull_none>;
                        };
                        i2c3_gpio: i2c3-gpio {
                                rockchip,pins =
-                                       <0 5 RK_FUNC_GPIO &pcfg_pull_none>,
-                                       <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
+                                       <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
+                                       <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
                        };
                };
 
                hdmi_i2c {
                        hdmii2c_xfer: hdmii2c-xfer {
                                rockchip,pins =
-                                       <0 5 RK_FUNC_1 &pcfg_pull_none>,
-                                       <0 6 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               tsadc {
+                       otp_gpio: otp-gpio {
+                               rockchip,pins =
+                                       <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+                       };
+
+                       otp_out: otp-out {
+                               rockchip,pins =
+                                       <2 RK_PB5 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                uart0 {
                        uart0_xfer: uart0-xfer {
                                rockchip,pins =
-                                       <1 9 RK_FUNC_1 &pcfg_pull_up>,
-                                       <1 8 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PB1 RK_FUNC_1 &pcfg_pull_up>,
+                                       <1 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        uart0_cts: uart0-cts {
                                rockchip,pins =
-                                       <1 11 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PB3 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        uart0_rts: uart0-rts {
                                rockchip,pins =
-                                       <1 10 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        uart0_rts_gpio: uart0-rts-gpio {
                                rockchip,pins =
-                                       <1 10 RK_FUNC_GPIO &pcfg_pull_none>;
+                                       <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
                        };
                };
 
                uart1 {
                        uart1_xfer: uart1-xfer {
                                rockchip,pins =
-                                       <3 4 RK_FUNC_4 &pcfg_pull_up>,
-                                       <3 6 RK_FUNC_4 &pcfg_pull_none>;
+                                       <3 RK_PA4 RK_FUNC_4 &pcfg_pull_up>,
+                                       <3 RK_PA6 RK_FUNC_4 &pcfg_pull_none>;
                        };
 
                        uart1_cts: uart1-cts {
                                rockchip,pins =
-                                       <3 7 RK_FUNC_4 &pcfg_pull_none>;
+                                       <3 RK_PA7 RK_FUNC_4 &pcfg_pull_none>;
                        };
 
                        uart1_rts: uart1-rts {
                                rockchip,pins =
-                                       <3 5 RK_FUNC_4 &pcfg_pull_none>;
+                                       <3 RK_PA5 RK_FUNC_4 &pcfg_pull_none>;
                        };
 
                        uart1_rts_gpio: uart1-rts-gpio {
                                rockchip,pins =
-                                       <3 5 RK_FUNC_GPIO &pcfg_pull_none>;
+                                       <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
                        };
                };
 
                uart2-0 {
                        uart2m0_xfer: uart2m0-xfer {
                                rockchip,pins =
-                                       <1 0 RK_FUNC_2 &pcfg_pull_up>,
-                                       <1 1 RK_FUNC_2 &pcfg_pull_none>;
+                                       <1 RK_PA0 RK_FUNC_2 &pcfg_pull_up>,
+                                       <1 RK_PA1 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                uart2-1 {
                        uart2m1_xfer: uart2m1-xfer {
                                rockchip,pins =
-                                       <2 0 RK_FUNC_1 &pcfg_pull_up>,
-                                       <2 1 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PA0 RK_FUNC_1 &pcfg_pull_up>,
+                                       <2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                spi0-0 {
                        spi0m0_clk: spi0m0-clk {
                                rockchip,pins =
-                                       <2 8 RK_FUNC_1 &pcfg_pull_up>;
+                                       <2 RK_PB0 RK_FUNC_1 &pcfg_pull_up>;
                        };
 
                        spi0m0_cs0: spi0m0-cs0 {
                                rockchip,pins =
-                                       <2 11 RK_FUNC_1 &pcfg_pull_up>;
+                                       <2 RK_PB3 RK_FUNC_1 &pcfg_pull_up>;
                        };
 
                        spi0m0_tx: spi0m0-tx {
                                rockchip,pins =
-                                       <2 9 RK_FUNC_1 &pcfg_pull_up>;
+                                       <2 RK_PB1 RK_FUNC_1 &pcfg_pull_up>;
                        };
 
                        spi0m0_rx: spi0m0-rx {
                                rockchip,pins =
-                                       <2 10 RK_FUNC_1 &pcfg_pull_up>;
+                                       <2 RK_PB2 RK_FUNC_1 &pcfg_pull_up>;
                        };
 
                        spi0m0_cs1: spi0m0-cs1 {
                                rockchip,pins =
-                                       <2 12 RK_FUNC_1 &pcfg_pull_up>;
+                                       <2 RK_PB4 RK_FUNC_1 &pcfg_pull_up>;
                        };
                };
 
                spi0-1 {
                        spi0m1_clk: spi0m1-clk {
                                rockchip,pins =
-                                       <3 23 RK_FUNC_2 &pcfg_pull_up>;
+                                       <3 RK_PC7 RK_FUNC_2 &pcfg_pull_up>;
                        };
 
                        spi0m1_cs0: spi0m1-cs0 {
                                rockchip,pins =
-                                       <3 26 RK_FUNC_2 &pcfg_pull_up>;
+                                       <3 RK_PD2 RK_FUNC_2 &pcfg_pull_up>;
                        };
 
                        spi0m1_tx: spi0m1-tx {
                                rockchip,pins =
-                                       <3 25 RK_FUNC_2 &pcfg_pull_up>;
+                                       <3 RK_PD1 RK_FUNC_2 &pcfg_pull_up>;
                        };
 
                        spi0m1_rx: spi0m1-rx {
                                rockchip,pins =
-                                       <3 24 RK_FUNC_2 &pcfg_pull_up>;
+                                       <3 RK_PD0 RK_FUNC_2 &pcfg_pull_up>;
                        };
 
                        spi0m1_cs1: spi0m1-cs1 {
                                rockchip,pins =
-                                       <3 27 RK_FUNC_2 &pcfg_pull_up>;
+                                       <3 RK_PD3 RK_FUNC_2 &pcfg_pull_up>;
                        };
                };
 
                spi0-2 {
                        spi0m2_clk: spi0m2-clk {
                                rockchip,pins =
-                                       <3 0 RK_FUNC_4 &pcfg_pull_up>;
+                                       <3 RK_PA0 RK_FUNC_4 &pcfg_pull_up>;
                        };
 
                        spi0m2_cs0: spi0m2-cs0 {
                                rockchip,pins =
-                                       <3 8 RK_FUNC_3 &pcfg_pull_up>;
+                                       <3 RK_PB0 RK_FUNC_3 &pcfg_pull_up>;
                        };
 
                        spi0m2_tx: spi0m2-tx {
                                rockchip,pins =
-                                       <3 1 RK_FUNC_4 &pcfg_pull_up>;
+                                       <3 RK_PA1 RK_FUNC_4 &pcfg_pull_up>;
                        };
 
                        spi0m2_rx: spi0m2-rx {
                                rockchip,pins =
-                                       <3 2 RK_FUNC_4 &pcfg_pull_up>;
+                                       <3 RK_PA2 RK_FUNC_4 &pcfg_pull_up>;
+                       };
+               };
+
+               pdm-0 {
+                       pdmm0_clk: pdmm0-clk {
+                               rockchip,pins =
+                                       <2 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_fsync: pdmm0-fsync {
+                               rockchip,pins =
+                                       <2 RK_PC7 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_sdi0: pdmm0-sdi0 {
+                               rockchip,pins =
+                                       <2 RK_PC3 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_sdi1: pdmm0-sdi1 {
+                               rockchip,pins =
+                                       <2 RK_PC4 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_sdi2: pdmm0-sdi2 {
+                               rockchip,pins =
+                                       <2 RK_PC5 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_sdi3: pdmm0-sdi3 {
+                               rockchip,pins =
+                                       <2 RK_PC6 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       pdmm0_sleep: pdmm0-sleep {
+                               rockchip,pins =
+                                       <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>;
                        };
                };
 
                i2s1 {
                        i2s1_mclk: i2s1-mclk {
                                rockchip,pins =
-                                       <2 15 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PB7 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sclk: i2s1-sclk {
                                rockchip,pins =
-                                       <2 18 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_lrckrx: i2s1-lrckrx {
                                rockchip,pins =
-                                       <2 16 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC0 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_lrcktx: i2s1-lrcktx {
                                rockchip,pins =
-                                       <2 17 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sdi: i2s1-sdi {
                                rockchip,pins =
-                                       <2 19 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sdo: i2s1-sdo {
                                rockchip,pins =
-                                       <2 23 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC7 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sdio1: i2s1-sdio1 {
                                rockchip,pins =
-                                       <2 20 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC4 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sdio2: i2s1-sdio2 {
                                rockchip,pins =
-                                       <2 21 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sdio3: i2s1-sdio3 {
                                rockchip,pins =
-                                       <2 22 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s1_sleep: i2s1-sleep {
                                rockchip,pins =
-                                       <2 15 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 16 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 17 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 18 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 19 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 20 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 21 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 22 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <2 23 RK_FUNC_GPIO &pcfg_input_high>;
+                                       <2 RK_PB7 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC0 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC1 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>;
                        };
                };
 
                i2s2-0 {
                        i2s2m0_mclk: i2s2m0-mclk {
                                rockchip,pins =
-                                       <1 21 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_sclk: i2s2m0-sclk {
                                rockchip,pins =
-                                       <1 22 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_lrckrx: i2s2m0-lrckrx {
                                rockchip,pins =
-                                       <1 26 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PD2 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_lrcktx: i2s2m0-lrcktx {
                                rockchip,pins =
-                                       <1 23 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PC7 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_sdi: i2s2m0-sdi {
                                rockchip,pins =
-                                       <1 24 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PD0 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_sdo: i2s2m0-sdo {
                                rockchip,pins =
-                                       <1 25 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m0_sleep: i2s2m0-sleep {
                                rockchip,pins =
-                                       <1 21 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <1 22 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <1 26 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <1 23 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <1 24 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <1 25 RK_FUNC_GPIO &pcfg_input_high>;
+                                       <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <1 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <1 RK_PD2 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <1 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <1 RK_PD0 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <1 RK_PD1 RK_FUNC_GPIO &pcfg_input_high>;
                        };
                };
 
                i2s2-1 {
                        i2s2m1_mclk: i2s2m1-mclk {
                                rockchip,pins =
-                                       <1 21 RK_FUNC_1 &pcfg_pull_none>;
+                                       <1 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        i2s2m1_sclk: i2s2m1-sclk {
                                rockchip,pins =
-                                       <3 0 RK_FUNC_6 &pcfg_pull_none>;
+                                       <3 RK_PA0 RK_FUNC_6 &pcfg_pull_none>;
                        };
 
                        i2s2m1_lrckrx: i2sm1-lrckrx {
                                rockchip,pins =
-                                       <3 8 RK_FUNC_6 &pcfg_pull_none>;
+                                       <3 RK_PB0 RK_FUNC_6 &pcfg_pull_none>;
                        };
 
                        i2s2m1_lrcktx: i2s2m1-lrcktx {
                                rockchip,pins =
-                                       <3 8 RK_FUNC_4 &pcfg_pull_none>;
+                                       <3 RK_PB0 RK_FUNC_4 &pcfg_pull_none>;
                        };
 
                        i2s2m1_sdi: i2s2m1-sdi {
                                rockchip,pins =
-                                       <3 2 RK_FUNC_6 &pcfg_pull_none>;
+                                       <3 RK_PA2 RK_FUNC_6 &pcfg_pull_none>;
                        };
 
                        i2s2m1_sdo: i2s2m1-sdo {
                                rockchip,pins =
-                                       <3 1 RK_FUNC_6 &pcfg_pull_none>;
+                                       <3 RK_PA1 RK_FUNC_6 &pcfg_pull_none>;
                        };
 
                        i2s2m1_sleep: i2s2m1-sleep {
                                rockchip,pins =
-                                       <1 21 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <3 0 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <3 8 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <3 2 RK_FUNC_GPIO &pcfg_input_high>,
-                                       <3 1 RK_FUNC_GPIO &pcfg_input_high>;
+                                       <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <3 RK_PA0 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <3 RK_PB0 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <3 RK_PA2 RK_FUNC_GPIO &pcfg_input_high>,
+                                       <3 RK_PA1 RK_FUNC_GPIO &pcfg_input_high>;
                        };
                };
 
                spdif-0 {
                        spdifm0_tx: spdifm0-tx {
                                rockchip,pins =
-                                       <0 27 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PD3 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                spdif-1 {
                        spdifm1_tx: spdifm1-tx {
                                rockchip,pins =
-                                       <2 17 RK_FUNC_2 &pcfg_pull_none>;
+                                       <2 RK_PC1 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                spdif-2 {
                        spdifm2_tx: spdifm2-tx {
                                rockchip,pins =
-                                       <0 2 RK_FUNC_2 &pcfg_pull_none>;
+                                       <0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                sdmmc0-0 {
                        sdmmc0m0_pwren: sdmmc0m0-pwren {
                                rockchip,pins =
-                                       <2 7 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <2 RK_PA7 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0m0_gpio: sdmmc0m0-gpio {
                                rockchip,pins =
-                                       <2 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
+                                       <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
                        };
                };
 
                sdmmc0-1 {
                        sdmmc0m1_pwren: sdmmc0m1-pwren {
                                rockchip,pins =
-                                       <0 30 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <0 RK_PD6 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0m1_gpio: sdmmc0m1-gpio {
                                rockchip,pins =
-                                       <0 30 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
+                                       <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
                        };
                };
 
                sdmmc0 {
                        sdmmc0_clk: sdmmc0-clk {
                                rockchip,pins =
-                                       <1 6 RK_FUNC_1 &pcfg_pull_none_4ma>;
+                                       <1 RK_PA6 RK_FUNC_1 &pcfg_pull_none_4ma>;
                        };
 
                        sdmmc0_cmd: sdmmc0-cmd {
                                rockchip,pins =
-                                       <1 4 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <1 RK_PA4 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0_dectn: sdmmc0-dectn {
                                rockchip,pins =
-                                       <1 5 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <1 RK_PA5 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0_wrprt: sdmmc0-wrprt {
                                rockchip,pins =
-                                       <1 7 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <1 RK_PA7 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0_bus1: sdmmc0-bus1 {
                                rockchip,pins =
-                                       <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <1 RK_PA0 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0_bus4: sdmmc0-bus4 {
                                rockchip,pins =
-                                       <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>,
-                                       <1 1 RK_FUNC_1 &pcfg_pull_up_4ma>,
-                                       <1 2 RK_FUNC_1 &pcfg_pull_up_4ma>,
-                                       <1 3 RK_FUNC_1 &pcfg_pull_up_4ma>;
+                                       <1 RK_PA0 RK_FUNC_1 &pcfg_pull_up_4ma>,
+                                       <1 RK_PA1 RK_FUNC_1 &pcfg_pull_up_4ma>,
+                                       <1 RK_PA2 RK_FUNC_1 &pcfg_pull_up_4ma>,
+                                       <1 RK_PA3 RK_FUNC_1 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0_gpio: sdmmc0-gpio {
                                rockchip,pins =
-                                       <1 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
+                                       <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
                        };
                };
 
                sdmmc0ext {
                        sdmmc0ext_clk: sdmmc0ext-clk {
                                rockchip,pins =
-                                       <3 2 RK_FUNC_3 &pcfg_pull_none_4ma>;
+                                       <3 RK_PA2 RK_FUNC_3 &pcfg_pull_none_4ma>;
                        };
 
                        sdmmc0ext_cmd: sdmmc0ext-cmd {
                                rockchip,pins =
-                                       <3 0 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <3 RK_PA0 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0ext_wrprt: sdmmc0ext-wrprt {
                                rockchip,pins =
-                                       <3 3 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <3 RK_PA3 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0ext_dectn: sdmmc0ext-dectn {
                                rockchip,pins =
-                                       <3 1 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <3 RK_PA1 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0ext_bus1: sdmmc0ext-bus1 {
                                rockchip,pins =
-                                       <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <3 RK_PA4 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0ext_bus4: sdmmc0ext-bus4 {
                                rockchip,pins =
-                                       <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>,
-                                       <3 5 RK_FUNC_3 &pcfg_pull_up_4ma>,
-                                       <3 6 RK_FUNC_3 &pcfg_pull_up_4ma>,
-                                       <3 7 RK_FUNC_3 &pcfg_pull_up_4ma>;
+                                       <3 RK_PA4 RK_FUNC_3 &pcfg_pull_up_4ma>,
+                                       <3 RK_PA5 RK_FUNC_3 &pcfg_pull_up_4ma>,
+                                       <3 RK_PA6 RK_FUNC_3 &pcfg_pull_up_4ma>,
+                                       <3 RK_PA7 RK_FUNC_3 &pcfg_pull_up_4ma>;
                        };
 
                        sdmmc0ext_gpio: sdmmc0ext-gpio {
                                rockchip,pins =
-                                       <3 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <3 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
+                                       <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
                        };
                };
 
                sdmmc1 {
                        sdmmc1_clk: sdmmc1-clk {
                                rockchip,pins =
-                                       <1 12 RK_FUNC_1 &pcfg_pull_none_8ma>;
+                                       <1 RK_PB4 RK_FUNC_1 &pcfg_pull_none_8ma>;
                        };
 
                        sdmmc1_cmd: sdmmc1-cmd {
                                rockchip,pins =
-                                       <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PB5 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_pwren: sdmmc1-pwren {
                                rockchip,pins =
-                                       <1 18 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PC2 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_wrprt: sdmmc1-wrprt {
                                rockchip,pins =
-                                       <1 20 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PC4 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_dectn: sdmmc1-dectn {
                                rockchip,pins =
-                                       <1 19 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PC3 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_bus1: sdmmc1-bus1 {
                                rockchip,pins =
-                                       <1 14 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PB6 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_bus4: sdmmc1-bus4 {
                                rockchip,pins =
-                                       <1 12 RK_FUNC_1 &pcfg_pull_up_8ma>,
-                                       <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>,
-                                       <1 16 RK_FUNC_1 &pcfg_pull_up_8ma>,
-                                       <1 17 RK_FUNC_1 &pcfg_pull_up_8ma>;
+                                       <1 RK_PB6 RK_FUNC_1 &pcfg_pull_up_8ma>,
+                                       <1 RK_PB7 RK_FUNC_1 &pcfg_pull_up_8ma>,
+                                       <1 RK_PC0 RK_FUNC_1 &pcfg_pull_up_8ma>,
+                                       <1 RK_PC1 RK_FUNC_1 &pcfg_pull_up_8ma>;
                        };
 
                        sdmmc1_gpio: sdmmc1-gpio {
                                rockchip,pins =
-                                       <1 12 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 13 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 14 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 15 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 16 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 17 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 18 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 19 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
-                                       <1 20 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
+                                       <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+                                       <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
                        };
                };
 
                emmc {
                        emmc_clk: emmc-clk {
                                rockchip,pins =
-                                       <3 21 RK_FUNC_2 &pcfg_pull_none_12ma>;
+                                       <3 RK_PC5 RK_FUNC_2 &pcfg_pull_none_12ma>;
                        };
 
                        emmc_cmd: emmc-cmd {
                                rockchip,pins =
-                                       <3 19 RK_FUNC_2 &pcfg_pull_up_12ma>;
+                                       <3 RK_PC3 RK_FUNC_2 &pcfg_pull_up_12ma>;
                        };
 
                        emmc_pwren: emmc-pwren {
                                rockchip,pins =
-                                       <3 22 RK_FUNC_2 &pcfg_pull_none>;
+                                       <3 RK_PC6 RK_FUNC_2 &pcfg_pull_none>;
                        };
 
                        emmc_rstnout: emmc-rstnout {
                                rockchip,pins =
-                                       <3 20 RK_FUNC_2 &pcfg_pull_none>;
+                                       <3 RK_PC4 RK_FUNC_2 &pcfg_pull_none>;
                        };
 
                        emmc_bus1: emmc-bus1 {
                                rockchip,pins =
-                                       <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>;
+                                       <0 RK_PA7 RK_FUNC_2 &pcfg_pull_up_12ma>;
                        };
 
                        emmc_bus4: emmc-bus4 {
                                rockchip,pins =
-                                       <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>;
+                                       <0 RK_PA7 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD4 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD5 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD6 RK_FUNC_2 &pcfg_pull_up_12ma>;
                        };
 
                        emmc_bus8: emmc-bus8 {
                                rockchip,pins =
-                                       <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <2 31 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <3 16 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <3 17 RK_FUNC_2 &pcfg_pull_up_12ma>,
-                                       <3 18 RK_FUNC_2 &pcfg_pull_up_12ma>;
+                                       <0 RK_PA7 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD4 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD5 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD6 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <2 RK_PD7 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <3 RK_PC0 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <3 RK_PC1 RK_FUNC_2 &pcfg_pull_up_12ma>,
+                                       <3 RK_PC2 RK_FUNC_2 &pcfg_pull_up_12ma>;
                        };
                };
 
                pwm0 {
                        pwm0_pin: pwm0-pin {
                                rockchip,pins =
-                                       <2 4 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                pwm1 {
                        pwm1_pin: pwm1-pin {
                                rockchip,pins =
-                                       <2 5 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                pwm2 {
                        pwm2_pin: pwm2-pin {
                                rockchip,pins =
-                                       <2 6 RK_FUNC_1 &pcfg_pull_none>;
+                                       <2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                pwmir {
                        pwmir_pin: pwmir-pin {
                                rockchip,pins =
-                                       <2 2 RK_FUNC_1 &pcfg_pull_none>;
-                       };
-               };
-
-               gmac-0 {
-                       rgmiim0_pins: rgmiim0-pins {
-                               rockchip,pins =
-                                       /* mac_txclk */
-                                       <0 8 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_rxclk */
-                                       <0 10 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_mdio */
-                                       <0 11 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_txen */
-                                       <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_clk */
-                                       <0 24 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxdv */
-                                       <0 25 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_mdc */
-                                       <0 19 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxd1 */
-                                       <0 14 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxd0 */
-                                       <0 15 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_txd1 */
-                                       <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_txd0 */
-                                       <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_rxd3 */
-                                       <0 20 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxd2 */
-                                       <0 21 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_txd3 */
-                                       <0 23 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_txd2 */
-                                       <0 22 RK_FUNC_1 &pcfg_pull_none_12ma>;
-                       };
-
-                       rmiim0_pins: rmiim0-pins {
-                               rockchip,pins =
-                                       /* mac_mdio */
-                                       <0 11 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_txen */
-                                       <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_clk */
-                                       <0 24 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxer */
-                                       <0 13 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxdv */
-                                       <0 25 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_mdc */
-                                       <0 19 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxd1 */
-                                       <0 14 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_rxd0 */
-                                       <0 15 RK_FUNC_1 &pcfg_pull_none>,
-                                       /* mac_txd1 */
-                                       <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>,
-                                       /* mac_txd0 */
-                                       <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>;
+                                       <2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                        rgmiim1_pins: rgmiim1-pins {
                                rockchip,pins =
                                        /* mac_txclk */
-                                       <1 12 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PB4 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_rxclk */
-                                       <1 13 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB5 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_mdio */
-                                       <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC3 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_txen */
-                                       <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PD1 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_clk */
-                                       <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC5 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxdv */
-                                       <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC6 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_mdc */
-                                       <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC7 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxd1 */
-                                       <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB2 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxd0 */
-                                       <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB3 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_txd1 */
-                                       <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PB0 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_txd0 */
-                                       <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PB1 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_rxd3 */
-                                       <1 14 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB6 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxd2 */
-                                       <1 15 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB7 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_txd3 */
-                                       <1 16 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PC0 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_txd2 */
-                                       <1 17 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PC1 RK_FUNC_2 &pcfg_pull_none_12ma>,
 
                                        /* mac_txclk */
-                                       <0 8 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txen */
-                                       <0 12 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_clk */
-                                       <0 24 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd1 */
-                                       <0 16 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PC0 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd0 */
-                                       <0 17 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PC1 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd3 */
-                                       <0 23 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PC7 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd2 */
-                                       <0 22 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        rmiim1_pins: rmiim1-pins {
                                rockchip,pins =
                                        /* mac_mdio */
-                                       <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC3 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_txen */
-                                       <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PD1 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_clk */
-                                       <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC5 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxer */
-                                       <1 24 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PD0 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxdv */
-                                       <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC6 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_mdc */
-                                       <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PC7 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxd1 */
-                                       <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB2 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_rxd0 */
-                                       <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>,
+                                       <1 RK_PB3 RK_FUNC_2 &pcfg_pull_none_2ma>,
                                        /* mac_txd1 */
-                                       <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PB0 RK_FUNC_2 &pcfg_pull_none_12ma>,
                                        /* mac_txd0 */
-                                       <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>,
+                                       <1 RK_PB1 RK_FUNC_2 &pcfg_pull_none_12ma>,
 
                                        /* mac_mdio */
-                                       <0 11 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PB3 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txen */
-                                       <0 12 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_clk */
-                                       <0 24 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_mdc */
-                                       <0 19 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PC3 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd1 */
-                                       <0 16 RK_FUNC_1 &pcfg_pull_none>,
+                                       <0 RK_PC0 RK_FUNC_1 &pcfg_pull_none>,
                                        /* mac_txd0 */
-                                       <0 17 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
                        };
                };
 
                gmac2phy {
                        fephyled_speed100: fephyled-speed100 {
                                rockchip,pins =
-                                       <0 31 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PD7 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        fephyled_speed10: fephyled-speed10 {
                                rockchip,pins =
-                                       <0 30 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PD6 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        fephyled_duplex: fephyled-duplex {
                                rockchip,pins =
-                                       <0 30 RK_FUNC_2 &pcfg_pull_none>;
+                                       <0 RK_PD6 RK_FUNC_2 &pcfg_pull_none>;
                        };
 
                        fephyled_rxm0: fephyled-rxm0 {
                                rockchip,pins =
-                                       <0 29 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PD5 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        fephyled_txm0: fephyled-txm0 {
                                rockchip,pins =
-                                       <0 29 RK_FUNC_2 &pcfg_pull_none>;
+                                       <0 RK_PD5 RK_FUNC_2 &pcfg_pull_none>;
                        };
 
                        fephyled_linkm0: fephyled-linkm0 {
                                rockchip,pins =
-                                       <0 28 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PD4 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        fephyled_rxm1: fephyled-rxm1 {
                                rockchip,pins =
-                                       <2 25 RK_FUNC_2 &pcfg_pull_none>;
+                                       <2 RK_PD1 RK_FUNC_2 &pcfg_pull_none>;
                        };
 
                        fephyled_txm1: fephyled-txm1 {
                                rockchip,pins =
-                                       <2 25 RK_FUNC_3 &pcfg_pull_none>;
+                                       <2 RK_PD1 RK_FUNC_3 &pcfg_pull_none>;
                        };
 
                        fephyled_linkm1: fephyled-linkm1 {
                                rockchip,pins =
-                                       <2 24 RK_FUNC_2 &pcfg_pull_none>;
+                                       <2 RK_PD0 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                tsadc_pin {
                        tsadc_int: tsadc-int {
                                rockchip,pins =
-                                       <2 13 RK_FUNC_2 &pcfg_pull_none>;
+                                       <2 RK_PB5 RK_FUNC_2 &pcfg_pull_none>;
                        };
                        tsadc_gpio: tsadc-gpio {
                                rockchip,pins =
-                                       <2 13 RK_FUNC_GPIO &pcfg_pull_none>;
+                                       <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
                        };
                };
 
                hdmi_pin {
                        hdmi_cec: hdmi-cec {
                                rockchip,pins =
-                                       <0 3 RK_FUNC_1 &pcfg_pull_none>;
+                                       <0 RK_PA3 RK_FUNC_1 &pcfg_pull_none>;
                        };
 
                        hdmi_hpd: hdmi-hpd {
                                rockchip,pins =
-                                       <0 4 RK_FUNC_1 &pcfg_pull_down>;
+                                       <0 RK_PA4 RK_FUNC_1 &pcfg_pull_down>;
                        };
                };
 
                        dvp_d2d9_m0:dvp-d2d9-m0 {
                                rockchip,pins =
                                        /* cif_d0 */
-                                       <3 4 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA4 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d1 */
-                                       <3 5 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA5 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d2 */
-                                       <3 6 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA6 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d3 */
-                                       <3 7 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA7 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d4 */
-                                       <3 8 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PB0 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d5m0 */
-                                       <3 9 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PB1 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d6m0 */
-                                       <3 10 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PB2 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d7m0 */
-                                       <3 11 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PB3 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_href */
-                                       <3 1 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA1 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_vsync */
-                                       <3 0 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA0 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_clkoutm0 */
-                                       <3 3 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA3 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_clkin */
-                                       <3 2 RK_FUNC_2 &pcfg_pull_none>;
+                                       <3 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 
                        dvp_d2d9_m1:dvp-d2d9-m1 {
                                rockchip,pins =
                                        /* cif_d0 */
-                                       <3 4 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA4 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d1 */
-                                       <3 5 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA5 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d2 */
-                                       <3 6 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA6 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d3 */
-                                       <3 7 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA7 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d4 */
-                                       <3 8 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PB0 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_d5m1 */
-                                       <2 16 RK_FUNC_4 &pcfg_pull_none>,
+                                       <2 RK_PC0 RK_FUNC_4 &pcfg_pull_none>,
                                        /* cif_d6m1 */
-                                       <2 17 RK_FUNC_4 &pcfg_pull_none>,
+                                       <2 RK_PC1 RK_FUNC_4 &pcfg_pull_none>,
                                        /* cif_d7m1 */
-                                       <2 18 RK_FUNC_4 &pcfg_pull_none>,
+                                       <2 RK_PC2 RK_FUNC_4 &pcfg_pull_none>,
                                        /* cif_href */
-                                       <3 1 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA1 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_vsync */
-                                       <3 0 RK_FUNC_2 &pcfg_pull_none>,
+                                       <3 RK_PA0 RK_FUNC_2 &pcfg_pull_none>,
                                        /* cif_clkoutm1 */
-                                       <2 15 RK_FUNC_4 &pcfg_pull_none>,
+                                       <2 RK_PB7 RK_FUNC_4 &pcfg_pull_none>,
                                        /* cif_clkin */
-                                       <3 2 RK_FUNC_2 &pcfg_pull_none>;
+                                       <3 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
        };