Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / rk3328.dtsi

diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
index 35e02f554f14b15f15681dc22fc57973cf865a25..060c84e6c0cfc38cd710da04d941c5b2f9d21a73 100644 (file)
--- a/arch/arm/dts/rk3328.dtsi
+++ b/arch/arm/dts/rk3328.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <dt-bindings/clock/rk3328-cru.h>
@@ -25,6 +24,9 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
+               mmc0 = &emmc;
+               mmc1 = &sdmmc;
+               mmc2 = &sdmmc_ext;
        };
 
        cpus {
@@ -184,11 +186,8 @@
        };
 
        grf: syscon@ff100000 {
-               u-boot,dm-pre-reloc;
                compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
                reg = <0x0 0xff100000 0x0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
                io_domains: io-domains {
                        compatible = "rockchip,rk3328-io-voltage-domain";
@@ -232,7 +231,6 @@
                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
                clock-names = "baudclk", "apb_pclk";
-               clock-frequency = <24000000>;
                reg-shift = <2>;
                reg-io-width = <4>;
                dmas = <&dmac 6>, <&dmac 7>;
@@ -351,12 +349,6 @@
                status = "disabled";
        };
 
-       dmc: dmc@ff400000 {
-               u-boot,dm-pre-reloc;
-               compatible = "rockchip,rk3328-dmc", "syscon";
-               reg = <0x0 0xff400000 0x0 0x1000>;
-       };
-
        cru: clock-controller@ff440000 {
                compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
                reg = <0x0 0xff440000 0x0 0x1000>;
@@ -453,6 +445,25 @@
                status = "disabled";
        };
 
+       gmac2io: ethernet@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";
+       };
+
        usb_host0_ehci: usb@ff5c0000 {
                compatible = "generic-ehci";
                reg = <0x0 0xff5c0000 0x0 0x10000>;
@@ -488,17 +499,6 @@
                status = "disabled";
        };
 
-       usb_host0_xhci: usb@ff600000 {
-               compatible = "rockchip,rk3328-xhci";
-               reg = <0x0 0xff600000 0x0 0x100000>;
-               interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-               snps,dis-enblslpm-quirk;
-               snps,phyif-utmi-bits = <16>;
-               snps,dis-u2-freeclk-exists-quirk;
-               snps,dis-u2-susphy-quirk;
-               status = "disabled";
-       };
-
        gic: interrupt-controller@ffb70000 {
                compatible = "arm,gic-400";
                #interrupt-cells = <3>;