Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-artful-kernel.git] / arch / arm / boot / dts / rk3036.dtsi

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 3864fa142df045e6be19fa2480d1c97d6870f0c2..d0f4bb7e1e50a4d44aea72b1160c3dc8e739f641 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -95,7 +95,7 @@
        };
 
        amba {
-               compatible = "arm,amba-bus";
+               compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges;
@@ -188,6 +188,27 @@
                status = "disabled";
        };
 
+       emac: ethernet@10200000 {
+               compatible = "rockchip,rk3036-emac", "snps,arc-emac";
+               reg = <0x10200000 0x4000>;
+               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               rockchip,grf = <&grf>;
+               clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>;
+               clock-names = "hclk", "macref", "macclk";
+               /*
+                * Fix the emac parent clock is DPLL instead of APLL.
+                * since that will cause some unstable things if the cpufreq
+                * is working. (e.g: the accurate 50MHz what mac_ref need)
+                */
+               assigned-clocks = <&cru SCLK_MACPLL>;
+               assigned-clock-parents = <&cru PLL_DPLL>;
+               max-speed = <100>;
+               phy-mode = "rmii";
+               status = "disabled";
+       };
+
        sdmmc: dwmmc@10214000 {
                compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x10214000 0x4000>;
@@ -573,6 +594,24 @@
                        };
                };
 
+               emac {
+                       emac_xfer: emac-xfer {
+                               rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_default>, /* crs_dvalid */
+                                               <2 13 RK_FUNC_1 &pcfg_pull_default>, /* tx_en */
+                                               <2 14 RK_FUNC_1 &pcfg_pull_default>, /* mac_clk */
+                                               <2 15 RK_FUNC_1 &pcfg_pull_default>, /* rx_err */
+                                               <2 16 RK_FUNC_1 &pcfg_pull_default>, /* rxd1 */
+                                               <2 17 RK_FUNC_1 &pcfg_pull_default>, /* rxd0 */
+                                               <2 18 RK_FUNC_1 &pcfg_pull_default>, /* txd1 */
+                                               <2 19 RK_FUNC_1 &pcfg_pull_default>; /* txd0 */
+                       };
+
+                       emac_mdio: emac-mdio {
+                               rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_default>, /* mac_md */
+                                               <2 25 RK_FUNC_1 &pcfg_pull_default>; /* mac_mdclk */
+                       };
+               };
+
                i2c0 {
                        i2c0_xfer: i2c0-xfer {
                                rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,