These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / at91-sama5d3_xplained.dts

diff --git a/kernel/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/kernel/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 9991240..ff888d2 100644 (file)
--- a/kernel/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/kernel/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -14,7 +14,7 @@
        compatible = "atmel,sama5d3-xplained", "atmel,sama5d3", "atmel,sama5";
 
        chosen {
-               bootargs = "console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -35,6 +35,8 @@
                apb {
                        mmc0: mmc@f0000000 {
                                pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
+                               vmmc-supply = <&vcc_mmc0_reg>;
+                               vqmmc-supply = <&vcc_3v3_reg>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -43,6 +45,17 @@
                                };
                        };
 
+                       mmc1: mmc@f8000000 {
+                               vmmc-supply = <&vcc_3v3_reg>;
+                               vqmmc-supply = <&vcc_3v3_reg>;
+                               status = "disabled";
+                               slot@0 {
+                                       reg = <0>;
+                                       bus-width = <4>;
+                                       cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;
+                               };
+                       };
+
                        spi0: spi@f0004000 {
                                cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
                                status = "okay";
@@ -63,7 +76,7 @@
                                pmic: act8865@5b {
                                        compatible = "active-semi,act8865";
                                        reg = <0x5b>;
-                                       status = "okay";
+                                       status = "disabled";
 
                                        regulators {
                                                vcc_1v8_reg: DCDC_REG1 {
@@ -105,7 +118,13 @@
 
                        macb0: ethernet@f0028000 {
                                phy-mode = "rgmii";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                status = "okay";
+
+                               ethernet-phy@7 {
+                                       reg = <0x7>;
+                               };
                        };
 
                        pwm0: pwm@f002c000 {
@@ -215,12 +234,6 @@
                                        };
                                };
                        };
-
-                       pmc: pmc@fffffc00 {
-                               main: mainck {
-                                       clock-frequency = <12000000>;
-                               };
-                       };
                };
 
                nand0: nand@60000000 {
@@ -284,6 +297,14 @@
                };
        };
 
+       vcc_mmc0_reg: fixedregulator@0 {
+               compatible = "regulator-fixed";
+               gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
+               regulator-name = "mmc0-card-supply";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        gpio_keys {
                compatible = "gpio-keys";
 
@@ -294,7 +315,7 @@
                        label = "PB_USER";
                        gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
                        linux,code = <0x104>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };