Hi Philipp,

    I didn't search the history of kernel about the "clock-freq-min-max"

when I find the regression.

You patch for rockchip_dw_mmc would be better if it can apply.


Hi Simon,

You can decide which version to use. If using V2, should pull with Philipp's

patch for remove 'clock-freq-min-max'.


Thanks,
- Kever
On 04/26/2017 06:30 PM, Dr. Philipp Tomsich wrote:
Kever & Simon,

I’d prefer if we can remove ‘clock-freq-min-max’, as it’s deprecated upstream.
A patch to adapt the rockchip_dw_mmc driver glue is already on patchworks:
https://patchwork.ozlabs.org/patch/754607/

I.e. I’d prefer v2 of the patch to be merged and v3 to be ignored.

Regards,
Philipp.

On 26 Apr 2017, at 12:23, Kever Yang <kever.y...@rock-chips.com <mailto:kever.y...@rock-chips.com>> wrote:

Hi Simon,


   Please don't merge this V2 patch, there is a regression on dw-mmc,

a property 'clock-freq-min-max' is missing after sync with kernel driver,

I will send a new version.


Thanks,
- Kever
On 04/19/2017 06:17 PM, Kever Yang wrote:
The kernel dts has update a lot since the first time we commit rk3399.dtsi,
sync with kernel for further development.

Signed-off-by: Kever Yang <kever.y...@rock-chips.com <mailto:kever.y...@rock-chips.com>>
Acked-by: Simon Glass <s...@chromium.org <mailto:s...@chromium.org>>
---

Changes in v2: None

arch/arm/dts/rk3399.dtsi | 1274 +++++++++++++++++++++++++-----
 include/dt-bindings/pinctrl/rockchip.h   |   35 +-
 include/dt-bindings/power/rk3399-power.h |   53 ++
 3 files changed, 1157 insertions(+), 205 deletions(-)
 create mode 100644 include/dt-bindings/power/rk3399-power.h

diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi
index a51015f..5d37a1e 100644
--- a/arch/arm/dts/rk3399.dtsi
+++ b/arch/arm/dts/rk3399.dtsi
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd.
  *
  * SPDX-License-Identifier:GPL-2.0+
  */
@@ -9,6 +9,8 @@
 #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/rk3399-power.h>
+#include <dt-bindings/thermal/thermal.h>
 #define USB_CLASS_HUB9
   / {
@@ -19,6 +21,15 @@
#size-cells = <2>;
aliases {
+i2c0 = &i2c0;
+i2c1 = &i2c1;
+i2c2 = &i2c2;
+i2c3 = &i2c3;
+i2c4 = &i2c4;
+i2c5 = &i2c5;
+i2c6 = &i2c6;
+i2c7 = &i2c7;
+i2c8 = &i2c8;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
@@ -26,7 +37,6 @@
serial4 = &uart4;
mmc0 = &sdhci;
mmc1 = &sdmmc;
-i2c0 = &i2c0;
};
cpus {
@@ -110,6 +120,16 @@
};
};
 +pmu_a53 {
+compatible = "arm,cortex-a53-pmu";
+interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
+};
+
+pmu_a72 {
+compatible = "arm,cortex-a72-pmu";
+interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster1>;
+};
+
psci {
compatible = "arm,psci-1.0";
method = "smc";
@@ -117,10 +137,11 @@
timer {
compatible = "arm,armv8-timer";
-interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
-    <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
-    <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
-    <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW 0>,
+    <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW 0>,
+    <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW 0>,
+    <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW 0>;
+arm,no-tick-in-suspend;
};
xin24m: xin24m {
@@ -139,8 +160,8 @@
dmac_bus: dma-controller@ff6d0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x0 0xff6d0000 0x0 0x4000>;
-interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
-    <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH 0>;
#dma-cells = <1>;
clocks = <&cru ACLK_DMAC0_PERILP>;
clock-names = "apb_pclk";
@@ -149,24 +170,92 @@
dmac_peri: dma-controller@ff6e0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x0 0xff6e0000 0x0 0x4000>;
-interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-    <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH 0>;
#dma-cells = <1>;
clocks = <&cru ACLK_DMAC1_PERILP>;
clock-names = "apb_pclk";
};
};
 +pcie0: pcie@f8000000 {
+compatible = "rockchip,rk3399-pcie";
+reg = <0x0 0xf8000000 0x0 0x2000000>,
+     <0x0 0xfd000000 0x0 0x1000000>;
+reg-names = "axi-base", "apb-base";
+#address-cells = <3>;
+#size-cells = <2>;
+#interrupt-cells = <1>;
+aspm-no-l0s;
+bus-range = <0x0 0x1>;
+clocks = <&cru ACLK_PCIE>, <&cru ACLK_PERF_PCIE>,
+<&cru PCLK_PCIE>, <&cru SCLK_PCIE_PM>;
+clock-names = "aclk", "aclk-perf",
+     "hclk", "pm";
+interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "sys", "legacy", "client";
+interrupt-map-mask = <0 0 0 7>;
+interrupt-map = <0 0 0 1 &pcie0_intc 0>,
+<0 0 0 2 &pcie0_intc 1>,
+<0 0 0 3 &pcie0_intc 2>,
+<0 0 0 4 &pcie0_intc 3>;
+linux,pci-domain = <0>;
+max-link-speed = <1>;
+msi-map = <0x0 &its 0x0 0x1000>;
+phys = <&pcie_phy>;
+phy-names = "pcie-phy";
+ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x600000
+ 0x81000000 0x0 0xfa600000 0x0 0xfa600000 0x0 0x100000>;
+resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>,
+<&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>,
+<&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>,
+<&cru SRST_A_PCIE>;
+reset-names = "core", "mgmt", "mgmt-sticky", "pipe",
+     "pm", "pclk", "aclk";
+status = "disabled";
+
+pcie0_intc: interrupt-controller {
+interrupt-controller;
+#address-cells = <0>;
+#interrupt-cells = <1>;
+};
+};
+
+gmac: ethernet@fe300000 {
+compatible = "rockchip,rk3399-gmac";
+reg = <0x0 0xfe300000 0x0 0x10000>;
+interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "macirq";
+clocks = <&cru SCLK_MAC>, <&cru SCLK_MAC_RX>,
+<&cru SCLK_MAC_TX>, <&cru SCLK_MACREF>,
+<&cru SCLK_MACREF_OUT>, <&cru ACLK_GMAC>,
+<&cru PCLK_GMAC>;
+clock-names = "stmmaceth", "mac_clk_rx",
+     "mac_clk_tx", "clk_mac_ref",
+     "clk_mac_refout", "aclk_mac",
+     "pclk_mac";
+power-domains = <&power RK3399_PD_GMAC>;
+resets = <&cru SRST_A_GMAC>;
+reset-names = "stmmaceth";
+rockchip,grf = <&grf>;
+status = "disabled";
+};
+
sdio0: dwmmc@fe310000 {
compatible = "rockchip,rk3399-dw-mshc",
    "rockchip,rk3288-dw-mshc";
reg = <0x0 0xfe310000 0x0 0x4000>;
-interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-clock-freq-min-max = <400000 150000000>;
+interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH 0>;
+max-frequency = <150000000>;
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
+power-domains = <&power RK3399_PD_SDIOAUDIO>;
+resets = <&cru SRST_SDIO0>;
+reset-names = "reset";
status = "disabled";
};
 @@ -174,14 +263,15 @@
compatible = "rockchip,rk3399-dw-mshc",
    "rockchip,rk3288-dw-mshc";
reg = <0x0 0xfe320000 0x0 0x4000>;
-interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-clock-freq-min-max = <400000 150000000>;
-clocks = <&cru SCLK_SDMMC>, <&cru HCLK_SDMMC>,
+interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH 0>;
+max-frequency = <150000000>;
+clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-clock-names = "ciu", "biu", "ciu-drive", "ciu-sample";
-pinctrl-names = "default";
-pinctrl-0 = <&sdmmc_clk>;
+clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
+power-domains = <&power RK3399_PD_SD>;
+resets = <&cru SRST_SDMMC>;
+reset-names = "reset";
status = "disabled";
};
 @@ -189,50 +279,74 @@
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
reg = <0x0 0xfe330000 0x0 0x10000>;
-interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;
+arasan,soc-ctl-syscon = <&grf>;
assigned-clocks = <&cru SCLK_EMMC>;
assigned-clock-rates = <200000000>;
max-frequency = <200000000>;
clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;
clock-names = "clk_xin", "clk_ahb";
+clock-output-names = "emmc_cardclock";
+#clock-cells = <0>;
phys = <&emmc_phy>;
phy-names = "phy_arasan";
+power-domains = <&power RK3399_PD_EMMC>;
status = "disabled";
};
usb_host0_ehci: usb@fe380000 {
compatible = "generic-ehci";
reg = <0x0 0xfe380000 0x0 0x20000>;
-interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>;
-clock-names = "hclk_host0", "hclk_host0_arb";
+interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>;
+clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+<&u2phy0>;
+clock-names = "usbhost", "arbiter",
+     "utmi";
+phys = <&u2phy0_host>;
+phy-names = "usb";
+power-domains = <&power RK3399_PD_PERIHP>;
status = "disabled";
};
usb_host0_ohci: usb@fe3a0000 {
compatible = "generic-ohci";
reg = <0x0 0xfe3a0000 0x0 0x20000>;
-interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
-clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>;
-clock-names = "hclk_host0", "hclk_host0_arb";
+interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>;
+clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+<&u2phy0>;
+clock-names = "usbhost", "arbiter",
+     "utmi";
+phys = <&u2phy0_host>;
+phy-names = "usb";
+power-domains = <&power RK3399_PD_PERIHP>;
status = "disabled";
};
usb_host1_ehci: usb@fe3c0000 {
compatible = "generic-ehci";
reg = <0x0 0xfe3c0000 0x0 0x20000>;
-interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>;
-clock-names = "hclk_host1", "hclk_host1_arb";
+interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>;
+clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>,
+<&u2phy1>;
+clock-names = "usbhost", "arbiter",
+     "utmi";
+phys = <&u2phy1_host>;
+phy-names = "usb";
+power-domains = <&power RK3399_PD_PERIHP>;
status = "disabled";
};
usb_host1_ohci: usb@fe3e0000 {
compatible = "generic-ohci";
reg = <0x0 0xfe3e0000 0x0 0x20000>;
-interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>;
-clock-names = "hclk_host1", "hclk_host1_arb";
+interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>,
+<&u2phy1>;
+clock-names = "usbhost", "arbiter",
+     "utmi";
+phys = <&u2phy1_host>;
+phy-names = "usb";
+power-domains = <&power RK3399_PD_PERIHP>;
status = "disabled";
};
 @@ -280,7 +394,7 @@
gic: interrupt-controller@fee00000 {
compatible = "arm,gic-v3";
-#interrupt-cells = <3>;
+#interrupt-cells = <4>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
@@ -291,12 +405,124 @@
     <0x0 0xfff00000 0 0x10000>, /* GICC */
     <0x0 0xfff10000 0 0x10000>, /* GICH */
     <0x0 0xfff20000 0 0x10000>; /* GICV */
-interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
its: interrupt-controller@fee20000 {
compatible = "arm,gic-v3-its";
msi-controller;
reg = <0x0 0xfee20000 0x0 0x20000>;
};
+
+ppi-partitions {
+ppi_cluster0: interrupt-partition-0 {
+affinity = <&cpu_l0 &cpu_l1 &cpu_l2 &cpu_l3>;
+};
+
+ppi_cluster1: interrupt-partition-1 {
+affinity = <&cpu_b0 &cpu_b1>;
+};
+};
+};
+
+saradc: saradc@ff100000 {
+compatible = "rockchip,rk3399-saradc";
+reg = <0x0 0xff100000 0x0 0x100>;
+interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH 0>;
+#io-channel-cells = <1>;
+clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
+clock-names = "saradc", "apb_pclk";
+resets = <&cru SRST_P_SARADC>;
+reset-names = "saradc-apb";
+status = "disabled";
+};
+
+i2c1: i2c@ff110000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff110000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C1>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C1>, <&cru PCLK_I2C1>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c1_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c2: i2c@ff120000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff120000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C2>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C2>, <&cru PCLK_I2C2>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c2_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c3: i2c@ff130000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff130000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C3>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C3>, <&cru PCLK_I2C3>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c3_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c5: i2c@ff140000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff140000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C5>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C5>, <&cru PCLK_I2C5>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c5_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c6: i2c@ff150000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff150000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C6>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C6>, <&cru PCLK_I2C6>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c6_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c7: i2c@ff160000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff160000 0x0 0x1000>;
+assigned-clocks = <&cru SCLK_I2C7>;
+assigned-clock-rates = <200000000>;
+clocks = <&cru SCLK_I2C7>, <&cru PCLK_I2C7>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c7_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
};
uart0: serial@ff180000 {
@@ -304,7 +530,7 @@
reg = <0x0 0xff180000 0x0 0x100>;
clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
clock-names = "baudclk", "apb_pclk";
-interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH 0>;
reg-shift = <2>;
reg-io-width = <4>;
pinctrl-names = "default";
@@ -317,7 +543,7 @@
reg = <0x0 0xff190000 0x0 0x100>;
clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
clock-names = "baudclk", "apb_pclk";
-interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH 0>;
reg-shift = <2>;
reg-io-width = <4>;
pinctrl-names = "default";
@@ -330,7 +556,7 @@
reg = <0x0 0xff1a0000 0x0 0x100>;
clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
clock-names = "baudclk", "apb_pclk";
-interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH 0>;
clock-frequency = <24000000>;
reg-shift = <2>;
reg-io-width = <4>;
@@ -344,7 +570,7 @@
reg = <0x0 0xff1b0000 0x0 0x100>;
clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
clock-names = "baudclk", "apb_pclk";
-interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH 0>;
reg-shift = <2>;
reg-io-width = <4>;
pinctrl-names = "default";
@@ -357,7 +583,7 @@
reg = <0x0 0xff1c0000 0x0 0x1000>;
clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;
#address-cells = <1>;
@@ -370,7 +596,7 @@
reg = <0x0 0xff1d0000 0x0 0x1000>;
clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;
#address-cells = <1>;
@@ -383,7 +609,7 @@
reg = <0x0 0xff1e0000 0x0 0x1000>;
clocks = <&cru SCLK_SPI2>, <&cru PCLK_SPI2>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;
#address-cells = <1>;
@@ -396,7 +622,7 @@
reg = <0x0 0xff1f0000 0x0 0x1000>;
clocks = <&cru SCLK_SPI4>, <&cru PCLK_SPI4>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi4_clk &spi4_tx &spi4_rx &spi4_cs0>;
#address-cells = <1>;
@@ -409,7 +635,7 @@
reg = <0x0 0xff200000 0x0 0x1000>;
clocks = <&cru SCLK_SPI5>, <&cru PCLK_SPI5>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi5_clk &spi5_tx &spi5_rx &spi5_cs0>;
#address-cells = <1>;
@@ -417,6 +643,375 @@
status = "disabled";
};
 +thermal_zones: thermal-zones {
+cpu_thermal: cpu {
+polling-delay-passive = <100>;
+polling-delay = <1000>;
+
+thermal-sensors = <&tsadc 0>;
+
+trips {
+cpu_alert0: cpu_alert0 {
+temperature = <70000>;
+hysteresis = <2000>;
+type = "passive";
+};
+cpu_alert1: cpu_alert1 {
+temperature = <75000>;
+hysteresis = <2000>;
+type = "passive";
+};
+cpu_crit: cpu_crit {
+temperature = <95000>;
+hysteresis = <2000>;
+type = "critical";
+};
+};
+
+cooling-maps {
+map0 {
+trip = <&cpu_alert0>;
+cooling-device =
+<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+};
+map1 {
+trip = <&cpu_alert1>;
+cooling-device =
+<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+};
+};
+};
+
+gpu_thermal: gpu {
+polling-delay-passive = <100>;
+polling-delay = <1000>;
+
+thermal-sensors = <&tsadc 1>;
+
+trips {
+gpu_alert0: gpu_alert0 {
+temperature = <75000>;
+hysteresis = <2000>;
+type = "passive";
+};
+gpu_crit: gpu_crit {
+temperature = <95000>;
+hysteresis = <2000>;
+type = "critical";
+};
+};
+
+cooling-maps {
+map0 {
+trip = <&gpu_alert0>;
+cooling-device =
+<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+};
+};
+};
+};
+
+tsadc: tsadc@ff260000 {
+compatible = "rockchip,rk3399-tsadc";
+reg = <0x0 0xff260000 0x0 0x100>;
+interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>;
+assigned-clocks = <&cru SCLK_TSADC>;
+assigned-clock-rates = <750000>;
+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 = <95000>;
+pinctrl-names = "init", "default", "sleep";
+pinctrl-0 = <&otp_gpio>;
+pinctrl-1 = <&otp_out>;
+pinctrl-2 = <&otp_gpio>;
+#thermal-sensor-cells = <1>;
+status = "disabled";
+};
+
+qos_emmc: qos@ffa58000 {
+compatible = "syscon";
+reg = <0x0 0xffa58000 0x0 0x20>;
+};
+
+qos_gmac: qos@ffa5c000 {
+compatible = "syscon";
+reg = <0x0 0xffa5c000 0x0 0x20>;
+};
+
+qos_pcie: qos@ffa60080 {
+compatible = "syscon";
+reg = <0x0 0xffa60080 0x0 0x20>;
+};
+
+qos_usb_host0: qos@ffa60100 {
+compatible = "syscon";
+reg = <0x0 0xffa60100 0x0 0x20>;
+};
+
+qos_usb_host1: qos@ffa60180 {
+compatible = "syscon";
+reg = <0x0 0xffa60180 0x0 0x20>;
+};
+
+qos_usb_otg0: qos@ffa70000 {
+compatible = "syscon";
+reg = <0x0 0xffa70000 0x0 0x20>;
+};
+
+qos_usb_otg1: qos@ffa70080 {
+compatible = "syscon";
+reg = <0x0 0xffa70080 0x0 0x20>;
+};
+
+qos_sd: qos@ffa74000 {
+compatible = "syscon";
+reg = <0x0 0xffa74000 0x0 0x20>;
+};
+
+qos_sdioaudio: qos@ffa76000 {
+compatible = "syscon";
+reg = <0x0 0xffa76000 0x0 0x20>;
+};
+
+qos_hdcp: qos@ffa90000 {
+compatible = "syscon";
+reg = <0x0 0xffa90000 0x0 0x20>;
+};
+
+qos_iep: qos@ffa98000 {
+compatible = "syscon";
+reg = <0x0 0xffa98000 0x0 0x20>;
+};
+
+qos_isp0_m0: qos@ffaa0000 {
+compatible = "syscon";
+reg = <0x0 0xffaa0000 0x0 0x20>;
+};
+
+qos_isp0_m1: qos@ffaa0080 {
+compatible = "syscon";
+reg = <0x0 0xffaa0080 0x0 0x20>;
+};
+
+qos_isp1_m0: qos@ffaa8000 {
+compatible = "syscon";
+reg = <0x0 0xffaa8000 0x0 0x20>;
+};
+
+qos_isp1_m1: qos@ffaa8080 {
+compatible = "syscon";
+reg = <0x0 0xffaa8080 0x0 0x20>;
+};
+
+qos_rga_r: qos@ffab0000 {
+compatible = "syscon";
+reg = <0x0 0xffab0000 0x0 0x20>;
+};
+
+qos_rga_w: qos@ffab0080 {
+compatible = "syscon";
+reg = <0x0 0xffab0080 0x0 0x20>;
+};
+
+qos_video_m0: qos@ffab8000 {
+compatible = "syscon";
+reg = <0x0 0xffab8000 0x0 0x20>;
+};
+
+qos_video_m1_r: qos@ffac0000 {
+compatible = "syscon";
+reg = <0x0 0xffac0000 0x0 0x20>;
+};
+
+qos_video_m1_w: qos@ffac0080 {
+compatible = "syscon";
+reg = <0x0 0xffac0080 0x0 0x20>;
+};
+
+qos_vop_big_r: qos@ffac8000 {
+compatible = "syscon";
+reg = <0x0 0xffac8000 0x0 0x20>;
+};
+
+qos_vop_big_w: qos@ffac8080 {
+compatible = "syscon";
+reg = <0x0 0xffac8080 0x0 0x20>;
+};
+
+qos_vop_little: qos@ffad0000 {
+compatible = "syscon";
+reg = <0x0 0xffad0000 0x0 0x20>;
+};
+
+qos_perihp: qos@ffad8080 {
+compatible = "syscon";
+reg = <0x0 0xffad8080 0x0 0x20>;
+};
+
+qos_gpu: qos@ffae0000 {
+compatible = "syscon";
+reg = <0x0 0xffae0000 0x0 0x20>;
+};
+
+pmu: power-management@ff310000 {
+compatible = "rockchip,rk3399-pmu", "syscon", "simple-mfd";
+reg = <0x0 0xff310000 0x0 0x1000>;
+
+/*
+* Note: RK3399 supports 6 voltage domains including VD_CORE_L,
+* VD_CORE_B, VD_CENTER, VD_GPU, VD_LOGIC and VD_PMU.
+* Some of the power domains are grouped together for every
+* voltage domain.
+* The detail contents as below.
+*/
+power: power-controller {
+compatible = "rockchip,rk3399-power-controller";
+#power-domain-cells = <1>;
+#address-cells = <1>;
+#size-cells = <0>;
+
+/* These power domains are grouped by VD_CENTER */
+pd_iep@RK3399_PD_IEP {
+reg = <RK3399_PD_IEP>;
+clocks = <&cru ACLK_IEP>,
+<&cru HCLK_IEP>;
+pm_qos = <&qos_iep>;
+};
+pd_rga@RK3399_PD_RGA {
+reg = <RK3399_PD_RGA>;
+clocks = <&cru ACLK_RGA>,
+<&cru HCLK_RGA>;
+pm_qos = <&qos_rga_r>,
+<&qos_rga_w>;
+};
+pd_vcodec@RK3399_PD_VCODEC {
+reg = <RK3399_PD_VCODEC>;
+clocks = <&cru ACLK_VCODEC>,
+<&cru HCLK_VCODEC>;
+pm_qos = <&qos_video_m0>;
+};
+pd_vdu@RK3399_PD_VDU {
+reg = <RK3399_PD_VDU>;
+clocks = <&cru ACLK_VDU>,
+<&cru HCLK_VDU>;
+pm_qos = <&qos_video_m1_r>,
+<&qos_video_m1_w>;
+};
+
+/* These power domains are grouped by VD_GPU */
+pd_gpu@RK3399_PD_GPU {
+reg = <RK3399_PD_GPU>;
+clocks = <&cru ACLK_GPU>;
+pm_qos = <&qos_gpu>;
+};
+
+/* These power domains are grouped by VD_LOGIC */
+pd_edp@RK3399_PD_EDP {
+reg = <RK3399_PD_EDP>;
+clocks = <&cru PCLK_EDP_CTRL>;
+};
+pd_emmc@RK3399_PD_EMMC {
+reg = <RK3399_PD_EMMC>;
+clocks = <&cru ACLK_EMMC>;
+pm_qos = <&qos_emmc>;
+};
+pd_gmac@RK3399_PD_GMAC {
+reg = <RK3399_PD_GMAC>;
+clocks = <&cru ACLK_GMAC>,
+<&cru PCLK_GMAC>;
+pm_qos = <&qos_gmac>;
+};
+pd_perihp@RK3399_PD_PERIHP {
+reg = <RK3399_PD_PERIHP>;
+#address-cells = <1>;
+#size-cells = <0>;
+clocks = <&cru ACLK_PERIHP>;
+pm_qos = <&qos_perihp>,
+<&qos_pcie>,
+<&qos_usb_host0>,
+<&qos_usb_host1>;
+
+pd_sd@RK3399_PD_SD {
+reg = <RK3399_PD_SD>;
+clocks = <&cru HCLK_SDMMC>,
+<&cru SCLK_SDMMC>;
+pm_qos = <&qos_sd>;
+};
+};
+pd_sdioaudio@RK3399_PD_SDIOAUDIO {
+reg = <RK3399_PD_SDIOAUDIO>;
+clocks = <&cru HCLK_SDIO>;
+pm_qos = <&qos_sdioaudio>;
+};
+pd_usb3@RK3399_PD_USB3 {
+reg = <RK3399_PD_USB3>;
+clocks = <&cru ACLK_USB3>;
+pm_qos = <&qos_usb_otg0>,
+<&qos_usb_otg1>;
+};
+pd_vio@RK3399_PD_VIO {
+reg = <RK3399_PD_VIO>;
+#address-cells = <1>;
+#size-cells = <0>;
+
+pd_hdcp@RK3399_PD_HDCP {
+reg = <RK3399_PD_HDCP>;
+clocks = <&cru ACLK_HDCP>,
+<&cru HCLK_HDCP>,
+<&cru PCLK_HDCP>;
+pm_qos = <&qos_hdcp>;
+};
+pd_isp0@RK3399_PD_ISP0 {
+reg = <RK3399_PD_ISP0>;
+clocks = <&cru ACLK_ISP0>,
+<&cru HCLK_ISP0>;
+pm_qos = <&qos_isp0_m0>,
+<&qos_isp0_m1>;
+};
+pd_isp1@RK3399_PD_ISP1 {
+reg = <RK3399_PD_ISP1>;
+clocks = <&cru ACLK_ISP1>,
+<&cru HCLK_ISP1>;
+pm_qos = <&qos_isp1_m0>,
+<&qos_isp1_m1>;
+};
+pd_tcpc0@RK3399_PD_TCPC0 {
+reg = <RK3399_PD_TCPD0>;
+clocks = <&cru SCLK_UPHY0_TCPDCORE>,
+<&cru SCLK_UPHY0_TCPDPHY_REF>;
+};
+pd_tcpc1@RK3399_PD_TCPC1 {
+reg = <RK3399_PD_TCPD1>;
+clocks = <&cru SCLK_UPHY1_TCPDCORE>,
+<&cru SCLK_UPHY1_TCPDPHY_REF>;
+};
+pd_vo@RK3399_PD_VO {
+reg = <RK3399_PD_VO>;
+#address-cells = <1>;
+#size-cells = <0>;
+
+pd_vopb@RK3399_PD_VOPB {
+reg = <RK3399_PD_VOPB>;
+clocks = <&cru ACLK_VOP0>,
+<&cru HCLK_VOP0>;
+pm_qos = <&qos_vop_big_r>,
+<&qos_vop_big_w>;
+};
+pd_vopl@RK3399_PD_VOPL {
+reg = <RK3399_PD_VOPL>;
+clocks = <&cru ACLK_VOP1>,
+<&cru HCLK_VOP1>;
+pm_qos = <&qos_vop_little>;
+};
+};
+};
+};
+};
+
pmugrf: syscon@ff320000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
@@ -441,7 +1036,7 @@
reg = <0x0 0xff350000 0x0 0x1000>;
clocks = <&pmucru SCLK_SPI3_PMU>, <&pmucru PCLK_SPI3_PMU>;
clock-names = "spiclk", "apb_pclk";
-interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
pinctrl-0 = <&spi3_clk &spi3_tx &spi3_rx &spi3_cs0>;
#address-cells = <1>;
@@ -454,7 +1049,7 @@
reg = <0x0 0xff370000 0x0 0x100>;
clocks = <&pmucru SCLK_UART4_PMU>, <&pmucru PCLK_UART4_PMU>;
clock-names = "baudclk", "apb_pclk";
-interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH 0>;
reg-shift = <2>;
reg-io-width = <4>;
pinctrl-names = "default";
@@ -477,6 +1072,36 @@
status = "disabled";
};
 +i2c4: i2c@ff3d0000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff3d0000 0x0 0x1000>;
+assigned-clocks = <&pmucru SCLK_I2C4_PMU>;
+assigned-clock-rates = <200000000>;
+clocks = <&pmucru SCLK_I2C4_PMU>, <&pmucru PCLK_I2C4_PMU>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c4_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
+i2c8: i2c@ff3e0000 {
+compatible = "rockchip,rk3399-i2c";
+reg = <0x0 0xff3e0000 0x0 0x1000>;
+assigned-clocks = <&pmucru SCLK_I2C8_PMU>;
+assigned-clock-rates = <200000000>;
+clocks = <&pmucru SCLK_I2C8_PMU>, <&pmucru PCLK_I2C8_PMU>;
+clock-names = "i2c", "pclk";
+interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH 0>;
+pinctrl-names = "default";
+pinctrl-0 = <&i2c8_xfer>;
+#address-cells = <1>;
+#size-cells = <0>;
+status = "disabled";
+};
+
pwm0: pwm@ff420000 {
compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm";
reg = <0x0 0xff420000 0x0 0x10>;
@@ -553,10 +1178,43 @@
      0x0 0xffa8c000 0x0 0x1000>;
};
 +efuse0: efuse@ff690000 {
+compatible = "rockchip,rk3399-efuse";
+reg = <0x0 0xff690000 0x0 0x80>;
+#address-cells = <1>;
+#size-cells = <1>;
+clocks = <&cru PCLK_EFUSE1024NS>;
+clock-names = "pclk_efuse";
+
+/* Data cells */
+cpu_id: cpu-id@7 {
+reg = <0x07 0x10>;
+};
+cpub_leakage: cpu-leakage@17 {
+reg = <0x17 0x1>;
+};
+gpu_leakage: gpu-leakage@18 {
+reg = <0x18 0x1>;
+};
+center_leakage: center-leakage@19 {
+reg = <0x19 0x1>;
+};
+cpul_leakage: cpu-leakage@1a {
+reg = <0x1a 0x1>;
+};
+logic_leakage: logic-leakage@1b {
+reg = <0x1b 0x1>;
+};
+wafer_info: wafer-info@1c {
+reg = <0x1c 0x1>;
+};
+};
+
pmucru: pmu-clock-controller@ff750000 {
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3399-pmucru";
reg = <0x0 0xff750000 0x0 0x1000>;
+rockchip,grf = <&pmugrf>;
#clock-cells = <1>;
#reset-cells = <1>;
assigned-clocks = <&pmucru PLL_PPLL>;
@@ -567,6 +1225,7 @@
u-boot,dm-pre-reloc;
compatible = "rockchip,rk3399-cru";
reg = <0x0 0xff760000 0x0 0x1000>;
+rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;
assigned-clocks =
@@ -575,7 +1234,7 @@
<&cru ACLK_PERIHP>, <&cru HCLK_PERIHP>,
<&cru PCLK_PERIHP>,
<&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
-<&cru PCLK_PERILP0>,
+<&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
<&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
assigned-clock-rates =
<594000000>,  <800000000>,
@@ -583,7 +1242,7 @@
<150000000>,   <75000000>,
 <37500000>,
<100000000>,  <100000000>,
- <50000000>,
+ <50000000>, <600000000>,
<100000000>,   <50000000>;
};
 @@ -599,50 +1258,106 @@
status = "disabled";
};
 +u2phy0: usb2-phy@e450 {
+compatible = "rockchip,rk3399-usb2phy";
+reg = <0xe450 0x10>;
+clocks = <&cru SCLK_USB2PHY0_REF>;
+clock-names = "phyclk";
+#clock-cells = <0>;
+clock-output-names = "clk_usbphy0_480m";
+status = "disabled";
+
+u2phy0_host: host-port {
+#phy-cells = <0>;
+interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "linestate";
+status = "disabled";
+};
+
+u2phy0_otg: otg-port {
+#phy-cells = <0>;
+interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "otg-bvalid", "otg-id",
+ "linestate";
+status = "disabled";
+};
+};
+
+u2phy1: usb2-phy@e460 {
+compatible = "rockchip,rk3399-usb2phy";
+reg = <0xe460 0x10>;
+clocks = <&cru SCLK_USB2PHY1_REF>;
+clock-names = "phyclk";
+#clock-cells = <0>;
+clock-output-names = "clk_usbphy1_480m";
+status = "disabled";
+
+u2phy1_host: host-port {
+#phy-cells = <0>;
+interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "linestate";
+status = "disabled";
+};
+
+u2phy1_otg: otg-port {
+#phy-cells = <0>;
+interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0>,
+    <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>;
+interrupt-names = "otg-bvalid", "otg-id",
+ "linestate";
+status = "disabled";
+};
+};
+
emmc_phy: phy@f780 {
compatible = "rockchip,rk3399-emmc-phy";
reg = <0xf780 0x24>;
+clocks = <&sdhci>;
+clock-names = "emmcclk";
#phy-cells = <0>;
status = "disabled";
};
+
+pcie_phy: pcie-phy {
+compatible = "rockchip,rk3399-pcie-phy";
+clocks = <&cru SCLK_PCIEPHY_REF>;
+clock-names = "refclk";
+#phy-cells = <0>;
+resets = <&cru SRST_PCIEPHY>;
+reset-names = "phy";
+status = "disabled";
+};
};
 -watchdog@ff840000 {
+watchdog@ff848000 {
compatible = "snps,dw-wdt";
-reg = <0x0 0xff840000 0x0 0x100>;
+reg = <0x0 0xff848000 0x0 0x100>;
clocks = <&cru PCLK_WDT>;
-interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-};
-
-        gmac: eth@fe300000 {
-                compatible = "rockchip,rk3399-gmac";
-                reg = <0x0 0xfe300000 0x0 0x10000>;
-                rockchip,grf = <&grf>;
-                interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH 0>;
-                interrupt-names = "macirq";
-                clocks = <&cru SCLK_MAC>, <&cru SCLK_MAC_RX>,
-                         <&cru SCLK_MAC_TX>, <&cru SCLK_MACREF>,
-                         <&cru SCLK_MACREF_OUT>, <&cru ACLK_GMAC>,
-                         <&cru PCLK_GMAC>;
-                clock-names = "stmmaceth", "mac_clk_rx",
-                              "mac_clk_tx", "clk_mac_ref",
-                              "clk_mac_refout", "aclk_mac",
-                              "pclk_mac";
-                resets = <&cru SRST_A_GMAC>;
-                reset-names = "stmmaceth";
-                status = "disabled";
-        };
+interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH 0>;
+};
+
+rktimer: rktimer@ff850000 {
+compatible = "rockchip,rk3399-timer";
+reg = <0x0 0xff850000 0x0 0x1000>;
+interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH 0>;
+clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER00>;
+clock-names = "pclk", "timer";
+};
spdif: spdif@ff870000 {
compatible = "rockchip,rk3399-spdif";
reg = <0x0 0xff870000 0x0 0x1000>;
-interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_bus 7>;
dma-names = "tx";
clock-names = "mclk", "hclk";
clocks = <&cru SCLK_SPDIF_8CH>, <&cru HCLK_SPDIF>;
pinctrl-names = "default";
pinctrl-0 = <&spdif_bus>;
+power-domains = <&power RK3399_PD_SDIOAUDIO>;
status = "disabled";
};
 @@ -650,37 +1365,40 @@
compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s";
reg = <0x0 0xff880000 0x0 0x1000>;
rockchip,grf = <&grf>;
-interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_bus 0>, <&dmac_bus 1>;
dma-names = "tx", "rx";
clock-names = "i2s_clk", "i2s_hclk";
clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>;
pinctrl-names = "default";
pinctrl-0 = <&i2s0_8ch_bus>;
+power-domains = <&power RK3399_PD_SDIOAUDIO>;
status = "disabled";
};
i2s1: i2s@ff890000 {
compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s";
reg = <0x0 0xff890000 0x0 0x1000>;
-interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_bus 2>, <&dmac_bus 3>;
dma-names = "tx", "rx";
clock-names = "i2s_clk", "i2s_hclk";
clocks = <&cru SCLK_I2S1_8CH>, <&cru HCLK_I2S1_8CH>;
pinctrl-names = "default";
pinctrl-0 = <&i2s1_2ch_bus>;
+power-domains = <&power RK3399_PD_SDIOAUDIO>;
status = "disabled";
};
i2s2: i2s@ff8a0000 {
compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s";
reg = <0x0 0xff8a0000 0x0 0x1000>;
-interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_bus 4>, <&dmac_bus 5>;
dma-names = "tx", "rx";
clock-names = "i2s_clk", "i2s_hclk";
clocks = <&cru SCLK_I2S2_8CH>, <&cru HCLK_I2S2_8CH>;
+power-domains = <&power RK3399_PD_SDIOAUDIO>;
status = "disabled";
};
 @@ -697,7 +1415,7 @@
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff720000 0x0 0x100>;
clocks = <&pmucru PCLK_GPIO0_PMU>;
-interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH 0>;
gpio-controller;
#gpio-cells = <0x2>;
@@ -710,7 +1428,7 @@
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff730000 0x0 0x100>;
clocks = <&pmucru PCLK_GPIO1_PMU>;
-interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH 0>;
gpio-controller;
#gpio-cells = <0x2>;
@@ -723,7 +1441,7 @@
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff780000 0x0 0x100>;
clocks = <&cru PCLK_GPIO2>;
-interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH 0>;
gpio-controller;
#gpio-cells = <0x2>;
@@ -736,7 +1454,7 @@
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff788000 0x0 0x100>;
clocks = <&cru PCLK_GPIO3>;
-interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
gpio-controller;
#gpio-cells = <0x2>;
@@ -749,7 +1467,7 @@
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff790000 0x0 0x100>;
clocks = <&cru PCLK_GPIO4>;
-interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH 0>;
gpio-controller;
#gpio-cells = <0x2>;
@@ -800,427 +1518,575 @@
drive-strength = <13>;
};
 +clock {
+clk_32k: clk-32k {
+rockchip,pins = <0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
+};
+};
+
+edp {
+edp_hpd: edp-hpd {
+rockchip,pins =
+<4 RK_PC7 RK_FUNC_2 &pcfg_pull_none>;
+};
+};
+
+gmac {
+rgmii_pins: rgmii-pins {
+rockchip,pins =
+/* mac_txclk */
+<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_rxclk */
+<3 RK_PB6 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_mdio */
+<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_txen */
+<3 RK_PB4 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_clk */
+<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxdv */
+<3 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_mdc */
+<3 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxd1 */
+<3 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxd0 */
+<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_txd1 */
+<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_txd0 */
+<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_rxd3 */
+<3 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxd2 */
+<3 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_txd3 */
+<3 RK_PA1 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_txd2 */
+<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none_13ma>;
+};
+
+rmii_pins: rmii-pins {
+rockchip,pins =
+/* mac_mdio */
+<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_txen */
+<3 RK_PB4 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_clk */
+<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxer */
+<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxdv */
+<3 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_mdc */
+<3 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxd1 */
+<3 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_rxd0 */
+<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,
+/* mac_txd1 */
+<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none_13ma>,
+/* mac_txd0 */
+<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_13ma>;
+};
+};
+
i2c0 {
i2c0_xfer: i2c0-xfer {
rockchip,pins =
-<1 15 RK_FUNC_2 &pcfg_pull_none>,
-<1 16 RK_FUNC_2 &pcfg_pull_none>;
+<1 RK_PB7 RK_FUNC_2 &pcfg_pull_none>,
+<1 RK_PC0 RK_FUNC_2 &pcfg_pull_none>;
};
};
i2c1 {
i2c1_xfer: i2c1-xfer {
rockchip,pins =
-<4 2 RK_FUNC_1 &pcfg_pull_none>,
-<4 1 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA1 RK_FUNC_1 &pcfg_pull_none>;
};
};
i2c2 {
i2c2_xfer: i2c2-xfer {
rockchip,pins =
-<2 1 RK_FUNC_2 &pcfg_pull_none_12ma>,
-<2 0 RK_FUNC_2 &pcfg_pull_none_12ma>;
+<2 RK_PA1 RK_FUNC_2 &pcfg_pull_none_12ma>,
+<2 RK_PA0 RK_FUNC_2 &pcfg_pull_none_12ma>;
};
};
i2c3 {
i2c3_xfer: i2c3-xfer {
rockchip,pins =
-<4 17 RK_FUNC_1 &pcfg_pull_none>,
-<4 16 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PC1 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PC0 RK_FUNC_1 &pcfg_pull_none>;
};
};
i2c4 {
i2c4_xfer: i2c4-xfer {
rockchip,pins =
-<1 12 RK_FUNC_1 &pcfg_pull_none>,
-<1 11 RK_FUNC_1 &pcfg_pull_none>;
+<1 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
+<1 RK_PB3 RK_FUNC_1 &pcfg_pull_none>;
};
};
i2c5 {
i2c5_xfer: i2c5-xfer {
rockchip,pins =
-<3 11 RK_FUNC_2 &pcfg_pull_none>,
-<3 10 RK_FUNC_2 &pcfg_pull_none>;
+<3 RK_PB3 RK_FUNC_2 &pcfg_pull_none>,
+<3 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
};
};
i2c6 {
i2c6_xfer: i2c6-xfer {
rockchip,pins =
-<2 10 RK_FUNC_2 &pcfg_pull_none>,
-<2 9 RK_FUNC_2 &pcfg_pull_none>;
+<2 RK_PB2 RK_FUNC_2 &pcfg_pull_none>,
+<2 RK_PB1 RK_FUNC_2 &pcfg_pull_none>;
};
};
i2c7 {
i2c7_xfer: i2c7-xfer {
rockchip,pins =
-<2 8 RK_FUNC_2 &pcfg_pull_none>,
-<2 7 RK_FUNC_2 &pcfg_pull_none>;
+<2 RK_PB0 RK_FUNC_2 &pcfg_pull_none>,
+<2 RK_PA7 RK_FUNC_2 &pcfg_pull_none>;
};
};
i2c8 {
i2c8_xfer: i2c8-xfer {
rockchip,pins =
-<1 21 RK_FUNC_1 &pcfg_pull_none>,
-<1 20 RK_FUNC_1 &pcfg_pull_none>;
+<1 RK_PC5 RK_FUNC_1 &pcfg_pull_none>,
+<1 RK_PC4 RK_FUNC_1 &pcfg_pull_none>;
};
};
i2s0 {
i2s0_8ch_bus: i2s0-8ch-bus {
rockchip,pins =
-<3 24 RK_FUNC_1 &pcfg_pull_none>,
-<3 25 RK_FUNC_1 &pcfg_pull_none>,
-<3 26 RK_FUNC_1 &pcfg_pull_none>,
-<3 27 RK_FUNC_1 &pcfg_pull_none>,
-<3 28 RK_FUNC_1 &pcfg_pull_none>,
-<3 29 RK_FUNC_1 &pcfg_pull_none>,
-<3 30 RK_FUNC_1 &pcfg_pull_none>,
-<3 31 RK_FUNC_1 &pcfg_pull_none>,
-<4 0 RK_FUNC_1 &pcfg_pull_none>;
+<3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD1 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD4 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD5 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD6 RK_FUNC_1 &pcfg_pull_none>,
+<3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
};
};
i2s1 {
i2s1_2ch_bus: i2s1-2ch-bus {
rockchip,pins =
-<4 3 RK_FUNC_1 &pcfg_pull_none>,
-<4 4 RK_FUNC_1 &pcfg_pull_none>,
-<4 5 RK_FUNC_1 &pcfg_pull_none>,
-<4 6 RK_FUNC_1 &pcfg_pull_none>,
-<4 7 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,
+<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
};
};
 -gmac {
-rgmii_pins: rgmii-pins {
+sdio0 {
+sdio0_bus1: sdio0-bus1 {
rockchip,pins =
-/* mac_txclk */
-<3 17 RK_FUNC_1 &pcfg_pull_none_13ma>,
-/* mac_rxclk */
-<3 14 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_mdio */
-<3 13 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_txen */
-<3 12 RK_FUNC_1 &pcfg_pull_none_13ma>,
-/* mac_clk */
-<3 11 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_rxdv */
-<3 9 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_mdc */
-<3 8 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_rxd1 */
-<3 7 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_rxd0 */
-<3 6 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_txd1 */
-<3 5 RK_FUNC_1 &pcfg_pull_none_13ma>,
-/* mac_txd0 */
-<3 4 RK_FUNC_1 &pcfg_pull_none_13ma>,
-/* mac_rxd3 */
-<3 3 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_rxd2 */
-<3 2 RK_FUNC_1 &pcfg_pull_none>,
-/* mac_txd3 */
-<3 1 RK_FUNC_1 &pcfg_pull_none_13ma>,
-/* mac_txd2 */
-<3 0 RK_FUNC_1 &pcfg_pull_none_13ma>;
+<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_bus4: sdio0-bus4 {
+rockchip,pins =
+<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up>,
+<2 RK_PC5 RK_FUNC_1 &pcfg_pull_up>,
+<2 RK_PC6 RK_FUNC_1 &pcfg_pull_up>,
+<2 RK_PC7 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_cmd: sdio0-cmd {
+rockchip,pins =
+<2 RK_PD0 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_clk: sdio0-clk {
+rockchip,pins =
+<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;
+};
+
+sdio0_cd: sdio0-cd {
+rockchip,pins =
+<2 RK_PD2 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_pwr: sdio0-pwr {
+rockchip,pins =
+<2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_bkpwr: sdio0-bkpwr {
+rockchip,pins =
+<2 RK_PD4 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_wp: sdio0-wp {
+rockchip,pins =
+<0 RK_PA3 RK_FUNC_1 &pcfg_pull_up>;
+};
+
+sdio0_int: sdio0-int {
+rockchip,pins =
+<0 RK_PA4 RK_FUNC_1 &pcfg_pull_up>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
-<4 8 RK_FUNC_1 &pcfg_pull_up>;
+<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
-<4 8 RK_FUNC_1 &pcfg_pull_up>,
-<4 9 RK_FUNC_1 &pcfg_pull_up>,
-<4 10 RK_FUNC_1 &pcfg_pull_up>,
-<4 11 RK_FUNC_1 &pcfg_pull_up>;
+<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up>,
+<4 RK_PB1 RK_FUNC_1 &pcfg_pull_up>,
+<4 RK_PB2 RK_FUNC_1 &pcfg_pull_up>,
+<4 RK_PB3 RK_FUNC_1 &pcfg_pull_up>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
-<4 12 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PB4 RK_FUNC_1 &pcfg_pull_none>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
-<4 13 RK_FUNC_1 &pcfg_pull_up>;
+<4 RK_PB5 RK_FUNC_1 &pcfg_pull_up>;
};
sdmmc_cd: sdmcc-cd {
rockchip,pins =
-<0 7 RK_FUNC_1 &pcfg_pull_up>;
+<0 RK_PA7 RK_FUNC_1 &pcfg_pull_up>;
};
sdmmc_wp: sdmmc-wp {
rockchip,pins =
-<0 8 RK_FUNC_1 &pcfg_pull_up>;
+<0 RK_PB0 RK_FUNC_1 &pcfg_pull_up>;
+};
+};
+
+sleep {
+ap_pwroff: ap-pwroff {
+rockchip,pins = <1 RK_PA5 RK_FUNC_1 &pcfg_pull_none>;
+};
+
+ddrio_pwroff: ddrio-pwroff {
+rockchip,pins = <0 RK_PA1 RK_FUNC_1 &pcfg_pull_none>;
};
};
spdif {
spdif_bus: spdif-bus {
rockchip,pins =
-<4 21 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
+};
+
+spdif_bus_1: spdif-bus-1 {
+rockchip,pins =
+<3 RK_PC0 RK_FUNC_3 &pcfg_pull_none>;
};
};
spi0 {
spi0_clk: spi0-clk {
rockchip,pins =
-<3 6 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA6 RK_FUNC_2 &pcfg_pull_up>;
};
spi0_cs0: spi0-cs0 {
rockchip,pins =
-<3 7 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA7 RK_FUNC_2 &pcfg_pull_up>;
};
spi0_cs1: spi0-cs1 {
rockchip,pins =
-<3 8 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PB0 RK_FUNC_2 &pcfg_pull_up>;
};
spi0_tx: spi0-tx {
rockchip,pins =
-<3 5 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA5 RK_FUNC_2 &pcfg_pull_up>;
};
spi0_rx: spi0-rx {
rockchip,pins =
-<3 4 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA4 RK_FUNC_2 &pcfg_pull_up>;
};
};
spi1 {
spi1_clk: spi1-clk {
rockchip,pins =
-<1 9 RK_FUNC_2 &pcfg_pull_up>;
+<1 RK_PB1 RK_FUNC_2 &pcfg_pull_up>;
};
spi1_cs0: spi1-cs0 {
rockchip,pins =
-<1 10 RK_FUNC_2 &pcfg_pull_up>;
+<1 RK_PB2 RK_FUNC_2 &pcfg_pull_up>;
};
spi1_rx: spi1-rx {
rockchip,pins =
-<1 7 RK_FUNC_2 &pcfg_pull_up>;
+<1 RK_PA7 RK_FUNC_2 &pcfg_pull_up>;
};
spi1_tx: spi1-tx {
rockchip,pins =
-<1 8 RK_FUNC_2 &pcfg_pull_up>;
+<1 RK_PB0 RK_FUNC_2 &pcfg_pull_up>;
};
};
spi2 {
spi2_clk: spi2-clk {
rockchip,pins =
-<2 11 RK_FUNC_1 &pcfg_pull_up>;
+<2 RK_PB3 RK_FUNC_1 &pcfg_pull_up>;
};
spi2_cs0: spi2-cs0 {
rockchip,pins =
-<2 12 RK_FUNC_1 &pcfg_pull_up>;
+<2 RK_PB4 RK_FUNC_1 &pcfg_pull_up>;
};
spi2_rx: spi2-rx {
rockchip,pins =
-<2 9 RK_FUNC_1 &pcfg_pull_up>;
+<2 RK_PB1 RK_FUNC_1 &pcfg_pull_up>;
};
spi2_tx: spi2-tx {
rockchip,pins =
-<2 10 RK_FUNC_1 &pcfg_pull_up>;
+<2 RK_PB2 RK_FUNC_1 &pcfg_pull_up>;
};
};
spi3 {
spi3_clk: spi3-clk {
rockchip,pins =
-<1 17 RK_FUNC_1 &pcfg_pull_up>;
+<1 RK_PC1 RK_FUNC_1 &pcfg_pull_up>;
};
spi3_cs0: spi3-cs0 {
rockchip,pins =
-<1 18 RK_FUNC_1 &pcfg_pull_up>;
+<1 RK_PC2 RK_FUNC_1 &pcfg_pull_up>;
};
spi3_rx: spi3-rx {
rockchip,pins =
-<1 15 RK_FUNC_1 &pcfg_pull_up>;
+<1 RK_PB7 RK_FUNC_1 &pcfg_pull_up>;
};
spi3_tx: spi3-tx {
rockchip,pins =
-<1 16 RK_FUNC_1 &pcfg_pull_up>;
+<1 RK_PC0 RK_FUNC_1 &pcfg_pull_up>;
};
};
spi4 {
spi4_clk: spi4-clk {
rockchip,pins =
-<3 2 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA2 RK_FUNC_2 &pcfg_pull_up>;
};
spi4_cs0: spi4-cs0 {
rockchip,pins =
-<3 3 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA3 RK_FUNC_2 &pcfg_pull_up>;
};
spi4_rx: spi4-rx {
rockchip,pins =
-<3 0 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA0 RK_FUNC_2 &pcfg_pull_up>;
};
spi4_tx: spi4-tx {
rockchip,pins =
-<3 1 RK_FUNC_2 &pcfg_pull_up>;
+<3 RK_PA1 RK_FUNC_2 &pcfg_pull_up>;
};
};
spi5 {
spi5_clk: spi5-clk {
rockchip,pins =
-<2 22 RK_FUNC_2 &pcfg_pull_up>;
+<2 RK_PC6 RK_FUNC_2 &pcfg_pull_up>;
};
spi5_cs0: spi5-cs0 {
rockchip,pins =
-<2 23 RK_FUNC_2 &pcfg_pull_up>;
+<2 RK_PC7 RK_FUNC_2 &pcfg_pull_up>;
};
spi5_rx: spi5-rx {
rockchip,pins =
-<2 20 RK_FUNC_2 &pcfg_pull_up>;
+<2 RK_PC4 RK_FUNC_2 &pcfg_pull_up>;
};
spi5_tx: spi5-tx {
rockchip,pins =
-<2 21 RK_FUNC_2 &pcfg_pull_up>;
+<2 RK_PC5 RK_FUNC_2 &pcfg_pull_up>;
+};
+};
+
+tsadc {
+otp_gpio: otp-gpio {
+rockchip,pins = <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+};
+
+otp_out: otp-out {
+rockchip,pins = <1 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
};
};
uart0 {
uart0_xfer: uart0-xfer {
rockchip,pins =
-<2 16 RK_FUNC_1 &pcfg_pull_up>,
-<2 17 RK_FUNC_1 &pcfg_pull_none>;
+<2 RK_PC0 RK_FUNC_1 &pcfg_pull_up>,
+<2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
};
uart0_cts: uart0-cts {
rockchip,pins =
-<2 18 RK_FUNC_1 &pcfg_pull_none>;
+<2 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
};
uart0_rts: uart0-rts {
rockchip,pins =
-<2 19 RK_FUNC_1 &pcfg_pull_none>;
+<2 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
};
};
uart1 {
uart1_xfer: uart1-xfer {
rockchip,pins =
-<3 12 RK_FUNC_2 &pcfg_pull_up>,
-<3 13 RK_FUNC_2 &pcfg_pull_none>;
+<3 RK_PB4 RK_FUNC_2 &pcfg_pull_up>,
+<3 RK_PB5 RK_FUNC_2 &pcfg_pull_none>;
};
};
uart2a {
uart2a_xfer: uart2a-xfer {
rockchip,pins =
-<4 8 RK_FUNC_2 &pcfg_pull_up>,
-<4 9 RK_FUNC_2 &pcfg_pull_none>;
+<4 RK_PB0 RK_FUNC_2 &pcfg_pull_up>,
+<4 RK_PB1 RK_FUNC_2 &pcfg_pull_none>;
};
};
uart2b {
uart2b_xfer: uart2b-xfer {
rockchip,pins =
-<4 16 RK_FUNC_2 &pcfg_pull_up>,
-<4 17 RK_FUNC_2 &pcfg_pull_none>;
+<4 RK_PC0 RK_FUNC_2 &pcfg_pull_up>,
+<4 RK_PC1 RK_FUNC_2 &pcfg_pull_none>;
};
};
uart2c {
uart2c_xfer: uart2c-xfer {
rockchip,pins =
-<4 19 RK_FUNC_1 &pcfg_pull_up>,
-<4 20 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PC3 RK_FUNC_1 &pcfg_pull_up>,
+<4 RK_PC4 RK_FUNC_1 &pcfg_pull_none>;
};
};
uart3 {
uart3_xfer: uart3-xfer {
rockchip,pins =
-<3 14 RK_FUNC_2 &pcfg_pull_up>,
-<3 15 RK_FUNC_2 &pcfg_pull_none>;
+<3 RK_PB6 RK_FUNC_2 &pcfg_pull_up>,
+<3 RK_PB7 RK_FUNC_2 &pcfg_pull_none>;
};
uart3_cts: uart3-cts {
rockchip,pins =
-<3 18 RK_FUNC_2 &pcfg_pull_none>;
+<3 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
};
uart3_rts: uart3-rts {
rockchip,pins =
-<3 19 RK_FUNC_2 &pcfg_pull_none>;
+<3 RK_PC3 RK_FUNC_2 &pcfg_pull_none>;
};
};
uart4 {
uart4_xfer: uart4-xfer {
rockchip,pins =
-<1 7 RK_FUNC_1 &pcfg_pull_up>,
-<1 8 RK_FUNC_1 &pcfg_pull_none>;
+<1 RK_PA7 RK_FUNC_1 &pcfg_pull_up>,
+<1 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
};
};
uarthdcp {
uarthdcp_xfer: uarthdcp-xfer {
rockchip,pins =
-<4 21 RK_FUNC_2 &pcfg_pull_up>,
-<4 22 RK_FUNC_2 &pcfg_pull_none>;
+<4 RK_PC5 RK_FUNC_2 &pcfg_pull_up>,
+<4 RK_PC6 RK_FUNC_2 &pcfg_pull_none>;
};
};
pwm0 {
pwm0_pin: pwm0-pin {
rockchip,pins =
-<4 18 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
};
vop0_pwm_pin: vop0-pwm-pin {
rockchip,pins =
-<4 18 RK_FUNC_2 &pcfg_pull_none>;
+<4 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
};
};
pwm1 {
pwm1_pin: pwm1-pin {
rockchip,pins =
-<4 22 RK_FUNC_1 &pcfg_pull_none>;
+<4 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
};
vop1_pwm_pin: vop1-pwm-pin {
rockchip,pins =
-<4 18 RK_FUNC_3 &pcfg_pull_none>;
+<4 RK_PC2 RK_FUNC_3 &pcfg_pull_none>;
};
};
pwm2 {
pwm2_pin: pwm2-pin {
rockchip,pins =
-<1 19 RK_FUNC_1 &pcfg_pull_none>;
+<1 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
};
};
pwm3a {
pwm3a_pin: pwm3a-pin {
rockchip,pins =
-<0 6 RK_FUNC_1 &pcfg_pull_none>;
+<0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
};
};
pwm3b {
pwm3b_pin: pwm3b-pin {
rockchip,pins =
-<1 14 RK_FUNC_1 &pcfg_pull_none>;
+<1 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;
};
};
+
+hdmi {
+hdmi_i2c_xfer: hdmi-i2c-xfer {
+rockchip,pins =
+<4 RK_PC1 RK_FUNC_3 &pcfg_pull_none>,
+<4 RK_PC0 RK_FUNC_3 &pcfg_pull_none>;
+};
+
+hdmi_cec: hdmi-cec {
+rockchip,pins =
+<4 RK_PC7 RK_FUNC_1 &pcfg_pull_none>;
+};
+};
+
+pcie {
+pcie_clkreqn: pci-clkreqn {
+rockchip,pins =
+<2 RK_PD2 RK_FUNC_2 &pcfg_pull_none>;
+};
+
+pcie_clkreqnb: pci-clkreqnb {
+rockchip,pins =
+<4 RK_PD0 RK_FUNC_1 &pcfg_pull_none>;
+};
+
+pcie_clkreqn_cpm: pci-clkreqn-cpm {
+rockchip,pins =
+<2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+};
+
+pcie_clkreqnb_cpm: pci-clkreqnb-cpm {
+rockchip,pins =
+<4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
+};
+};
+
};
 };
diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
index ecb76c7..0798287 100644
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ b/include/dt-bindings/pinctrl/rockchip.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2013 MundoReader S.L.
  * Author: Heiko Stuebner <he...@sntech.de <mailto:he...@sntech.de>>
  *
- * SPDX-License-Identifier:GPL-2.0+
+ * SPDX-License-Identifier:    GPL-2.0+
  */
   #ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__
@@ -17,6 +17,39 @@
 #define RK_GPIO44
 #define RK_GPIO66
 +#define RK_PA00
+#define RK_PA11
+#define RK_PA22
+#define RK_PA33
+#define RK_PA44
+#define RK_PA55
+#define RK_PA66
+#define RK_PA77
+#define RK_PB08
+#define RK_PB19
+#define RK_PB210
+#define RK_PB311
+#define RK_PB412
+#define RK_PB513
+#define RK_PB614
+#define RK_PB715
+#define RK_PC016
+#define RK_PC117
+#define RK_PC218
+#define RK_PC319
+#define RK_PC420
+#define RK_PC521
+#define RK_PC622
+#define RK_PC723
+#define RK_PD024
+#define RK_PD125
+#define RK_PD226
+#define RK_PD327
+#define RK_PD428
+#define RK_PD529
+#define RK_PD630
+#define RK_PD731
+
 #define RK_FUNC_GPIO0
 #define RK_FUNC_11
 #define RK_FUNC_22
diff --git a/include/dt-bindings/power/rk3399-power.h b/include/dt-bindings/power/rk3399-power.h
new file mode 100644
index 0000000..168b3bf
--- /dev/null
+++ b/include/dt-bindings/power/rk3399-power.h
@@ -0,0 +1,53 @@
+#ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
+#define __DT_BINDINGS_POWER_RK3399_POWER_H__
+
+/* VD_CORE_L */
+#define RK3399_PD_A53_L00
+#define RK3399_PD_A53_L11
+#define RK3399_PD_A53_L22
+#define RK3399_PD_A53_L33
+#define RK3399_PD_SCU_L4
+
+/* VD_CORE_B */
+#define RK3399_PD_A72_B05
+#define RK3399_PD_A72_B16
+#define RK3399_PD_SCU_B7
+
+/* VD_LOGIC */
+#define RK3399_PD_TCPD08
+#define RK3399_PD_TCPD19
+#define RK3399_PD_CCI10
+#define RK3399_PD_CCI011
+#define RK3399_PD_CCI112
+#define RK3399_PD_PERILP13
+#define RK3399_PD_PERIHP14
+#define RK3399_PD_VIO15
+#define RK3399_PD_VO16
+#define RK3399_PD_VOPB17
+#define RK3399_PD_VOPL18
+#define RK3399_PD_ISP019
+#define RK3399_PD_ISP120
+#define RK3399_PD_HDCP21
+#define RK3399_PD_GMAC22
+#define RK3399_PD_EMMC23
+#define RK3399_PD_USB324
+#define RK3399_PD_EDP25
+#define RK3399_PD_GIC26
+#define RK3399_PD_SD27
+#define RK3399_PD_SDIOAUDIO28
+#define RK3399_PD_ALIVE29
+
+/* VD_CENTER */
+#define RK3399_PD_CENTER30
+#define RK3399_PD_VCODEC31
+#define RK3399_PD_VDU32
+#define RK3399_PD_RGA33
+#define RK3399_PD_IEP34
+
+/* VD_GPU */
+#define RK3399_PD_GPU35
+
+/* VD_PMU */
+#define RK3399_PD_PMU36
+
+#endif




_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to