ARM: at91: asm/at91_pmc.h: fix trival register offset

[u-boot] / arch / arm / dts / tegra30-apalis.dts

diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts
index 5c717e2c4de7e121c99b9d35d0f7f8a874e5026f..3e0545c8befb18dc4f282ad17a0d2736652a1fe8 100644 (file)
--- a/arch/arm/dts/tegra30-apalis.dts
+++ b/arch/arm/dts/tegra30-apalis.dts
@@ -6,6 +6,10 @@
        model = "Toradex Apalis T30";
        compatible = "toradex,apalis_t30", "nvidia,tegra30";
 
+       chosen {
+               stdout-path = &uarta;
+       };
+
        aliases {
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
@@ -14,6 +18,10 @@
                sdhci0 = "/sdhci@78000600";
                sdhci1 = "/sdhci@78000400";
                sdhci2 = "/sdhci@78000000";
+               spi0 = "/spi@7000d400";
+               spi1 = "/spi@7000dc00";
+               spi2 = "/spi@7000de00";
+               spi3 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
                usb1 = "/usb@7d004000";
                usb2 = "/usb@7d008000";
@@ -239,13 +247,15 @@
        sdhci@78000000 {
                status = "okay";
                bus-width = <4>;
-               cd-gpios = <&gpio 229 1>; /* PCC5, SD1_CD# */
+               /* SD1_CD# */
+               cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_LOW>;
        };
 
        sdhci@78000400 {
                status = "okay";
                bus-width = <8>;
-               cd-gpios = <&gpio 171 1>; /* PV3, MMC1_CD# */
+               /* MMC1_CD# */
+               cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
        };
 
        sdhci@78000600 {
@@ -257,21 +267,24 @@
        /* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */
        usb@7d000000 {
                status = "okay";
-               dr_mode = "peripheral";
-               nvidia,vbus-gpio = <&gpio 157 0>;       /* PT5, USBO1_EN */
+               dr_mode = "otg";
+               /* USBO1_EN */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
        };
 
        /* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */
        usb@7d004000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio 233 0>;       /* PDD1, USBH_EN */
+               /* USBH_EN */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
                phy_type = "utmi";
        };
 
        /* EHCI instance 2: USB3_DP/N -> USBH3_DP/N */
        usb@7d008000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio 233 0>;       /* PDD1, USBH_EN */
+               /* USBH_EN */
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
        };
 
        regulators {