Merge tag 'rockchip-for-v2019.07-rc5' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git] / arch / arm / dts / zynqmp-zcu102-revA.dts
index 93f1d85d05d1c4f48ca143f6e55a82d4c75f7ba8..6e22871713139517ad5f7f1d2e659690233bd946 100644 (file)
@@ -13,7 +13,6 @@
 #include "zynqmp-clk-ccf.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
 #include <dt-bindings/phy/phy.h>
 
 / {
@@ -37,6 +36,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {
@@ -46,8 +46,6 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
                autorepeat;
                sw19 {
                        label = "sw19";
@@ -70,8 +68,6 @@
 
 &can1 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_can1_default>;
 };
 
 &dcc {
        status = "okay";
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gem3_default>;
        phy0: phy@21 {
                reg = <21>;
                ti,rx-internal-delay = <0x8>;
 
 &gpio {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gpio_default>;
 };
 
 &gpu {
 &i2c0 {
        status = "okay";
        clock-frequency = <400000>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c0_default>;
-       pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 
        tca6416_u97: gpio@20 {
                compatible = "ti,tca6416";
                                status = "disabled"; /* unreachable */
                                reg = <0x20>;
                        };
-
                        max20751@72 { /* u95 */
                                compatible = "maxim,max20751";
                                reg = <0x72>;
 &i2c1 {
        status = "okay";
        clock-frequency = <400000>;
-       pinctrl-names = "default", "gpio";
-       pinctrl-0 = <&pinctrl_i2c1_default>;
-       pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 
        /* PL i2c via PCA9306 - u45 */
        i2c-mux@74 { /* u34 */
                        #size-cells = <0>;
                        reg = <1>;
                        si5341: clock-generator@36 { /* SI5341 - u69 */
-                               compatible = "si5341";
+                               compatible = "silabs,si5341";
                                reg = <0x36>;
                        };
 
                                temperature-stability = <50>;
                                factory-fout = <300000000>;
                                clock-frequency = <300000000>;
+                               clock-output-names = "si570_user";
                        };
                };
                i2c@3 {
                                temperature-stability = <50>; /* copy from zc702 */
                                factory-fout = <156250000>;
                                clock-frequency = <148500000>;
+                               clock-output-names = "si570_mgt";
                        };
                };
                i2c@4 {
                        #size-cells = <0>;
                        reg = <3>;
                        /* DDR4 SODIMM */
-                       dev@19 {
-                               reg = <0x19>;
-                       };
-                       dev@30 {
-                               reg = <0x30>;
-                       };
-                       dev@35 {
-                               reg = <0x35>;
-                       };
-                       dev@36 {
-                               reg = <0x36>;
-                       };
-                       dev@51 {
-                               reg = <0x51>;
-                       };
                };
                i2c@4 {
                        #address-cells = <1>;
        };
 };
 
-&pinctrl0 {
-       status = "okay";
-       pinctrl_i2c0_default: i2c0-default {
-               mux {
-                       groups = "i2c0_3_grp";
-                       function = "i2c0";
-               };
-
-               conf {
-                       groups = "i2c0_3_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-       };
-
-       pinctrl_i2c0_gpio: i2c0-gpio {
-               mux {
-                       groups = "gpio0_14_grp", "gpio0_15_grp";
-                       function = "gpio0";
-               };
-
-               conf {
-                       groups = "gpio0_14_grp", "gpio0_15_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-       };
-
-       pinctrl_i2c1_default: i2c1-default {
-               mux {
-                       groups = "i2c1_4_grp";
-                       function = "i2c1";
-               };
-
-               conf {
-                       groups = "i2c1_4_grp";
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-       };
-
-       pinctrl_i2c1_gpio: i2c1-gpio {
-               mux {
-                       groups = "gpio0_16_grp", "gpio0_17_grp";
-                       function = "gpio0";
-               };
-
-               conf {
-                       groups = "gpio0_16_grp", "gpio0_17_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-       };
-
-       pinctrl_uart0_default: uart0-default {
-               mux {
-                       groups = "uart0_4_grp";
-                       function = "uart0";
-               };
-
-               conf {
-                       groups = "uart0_4_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO18";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO19";
-                       bias-disable;
-               };
-       };
-
-       pinctrl_uart1_default: uart1-default {
-               mux {
-                       groups = "uart1_5_grp";
-                       function = "uart1";
-               };
-
-               conf {
-                       groups = "uart1_5_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO21";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO20";
-                       bias-disable;
-               };
-       };
-
-       pinctrl_usb0_default: usb0-default {
-               mux {
-                       groups = "usb0_0_grp";
-                       function = "usb0";
-               };
-
-               conf {
-                       groups = "usb0_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO52", "MIO53", "MIO55";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59",
-                              "MIO60", "MIO61", "MIO62", "MIO63";
-                       bias-disable;
-               };
-       };
-
-       pinctrl_gem3_default: gem3-default {
-               mux {
-                       function = "ethernet3";
-                       groups = "ethernet3_0_grp";
-               };
-
-               conf {
-                       groups = "ethernet3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74",
-                                                                       "MIO75";
-                       bias-high-impedance;
-                       low-power-disable;
-               };
-
-               conf-tx {
-                       pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68",
-                                                                       "MIO69";
-                       bias-disable;
-                       low-power-enable;
-               };
-
-               mux-mdio {
-                       function = "mdio3";
-                       groups = "mdio3_0_grp";
-               };
-
-               conf-mdio {
-                       groups = "mdio3_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-               };
-       };
-
-       pinctrl_can1_default: can1-default {
-               mux {
-                       function = "can1";
-                       groups = "can1_6_grp";
-               };
-
-               conf {
-                       groups = "can1_6_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-rx {
-                       pins = "MIO25";
-                       bias-high-impedance;
-               };
-
-               conf-tx {
-                       pins = "MIO24";
-                       bias-disable;
-               };
-       };
-
-       pinctrl_sdhci1_default: sdhci1-default {
-               mux {
-                       groups = "sdio1_0_grp";
-                       function = "sdio1";
-               };
-
-               conf {
-                       groups = "sdio1_0_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-                       bias-disable;
-               };
-
-               mux-cd {
-                       groups = "sdio1_0_cd_grp";
-                       function = "sdio1_cd";
-               };
-
-               conf-cd {
-                       groups = "sdio1_0_cd_grp";
-                       bias-high-impedance;
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux-wp {
-                       groups = "sdio1_0_wp_grp";
-                       function = "sdio1_wp";
-               };
-
-               conf-wp {
-                       groups = "sdio1_0_wp_grp";
-                       bias-high-impedance;
-                       bias-pull-up;
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-       };
-
-       pinctrl_gpio_default: gpio-default {
-               mux-sw {
-                       function = "gpio0";
-                       groups = "gpio0_22_grp", "gpio0_23_grp";
-               };
-
-               conf-sw {
-                       groups = "gpio0_22_grp", "gpio0_23_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               mux-msp {
-                       function = "gpio0";
-                       groups = "gpio0_13_grp", "gpio0_38_grp";
-               };
-
-               conf-msp {
-                       groups = "gpio0_13_grp", "gpio0_38_grp";
-                       slew-rate = <SLEW_RATE_SLOW>;
-                       io-standard = <IO_STANDARD_LVCMOS18>;
-               };
-
-               conf-pull-up {
-                       pins = "MIO22", "MIO23";
-                       bias-pull-up;
-               };
-
-               conf-pull-none {
-                       pins = "MIO13", "MIO38";
-                       bias-disable;
-               };
-       };
-};
-
 &pcie {
        status = "okay";
 };
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;
 /* SD1 with level shifter */
 &sdhci1 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sdhci1_default>;
        no-1-8-v;       /* for 1.0 silicon */
        xlnx,mio_bank = <1>;
 };
 
 &uart0 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart0_default>;
 };
 
 &uart1 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_default>;
 };
 
 /* ULPI SMSC USB3320 */
 &usb0 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb0_default>;
 };
 
 &dwc3_0 {