Merge tag 'dmaengine-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra20-acer-a500-picasso.dts

diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
index a150e34..d3b9953 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -14,6 +14,10 @@
        compatible = "acer,picasso", "nvidia,tegra20";
 
        aliases {
+               mmc0 = &sdmmc4; /* eMMC */
+               mmc1 = &sdmmc3; /* MicroSD */
+               mmc2 = &sdmmc1; /* WiFi */
+
                rtc0 = &pmic;
                rtc1 = "/rtc@7000e000";
 
@@ -314,16 +318,24 @@
                                nvidia,pins = "drive_ddc",
                                                "drive_vi1",
                                                "drive_sdio1";
+                               nvidia,pull-up-strength = <31>;
+                               nvidia,pull-down-strength = <31>;
                                nvidia,schmitt = <TEGRA_PIN_ENABLE>;
-                               nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_4>;
+                               nvidia,high-speed-mode = <TEGRA_PIN_DISABLE>;
+                               nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
+                               nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOWEST>;
+                               nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_SLOWEST>;
                        };
                        drive_dbg {
                                nvidia,pins = "drive_dbg",
                                                "drive_vi2",
                                                "drive_at1",
                                                "drive_ao1";
+                               nvidia,pull-up-strength = <31>;
+                               nvidia,pull-down-strength = <31>;
                                nvidia,schmitt = <TEGRA_PIN_ENABLE>;
-                               nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_4>;
+                               nvidia,high-speed-mode = <TEGRA_PIN_DISABLE>;
+                               nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
                                nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
                        };
@@ -431,8 +443,6 @@
                        compatible = "atmel,maxtouch";
                        reg = <0x4c>;
 
-                       atmel,cfg_name = "maxtouch-acer-iconia-tab-a500.cfg";
-
                        interrupt-parent = <&gpio>;
                        interrupts = <TEGRA_GPIO(V, 6) IRQ_TYPE_LEVEL_LOW>;
 
@@ -502,6 +512,16 @@
                        reg = <1>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       embedded-controller@58 {
+                               compatible = "acer,a500-iconia-ec", "ene,kb930";
+                               reg = <0x58>;
+
+                               system-power-controller;
+
+                               monitored-battery = <&bat1010>;
+                               power-supplies = <&mains>;
+                       };
                };
        };
 
@@ -720,13 +740,17 @@
                power-off-delay-us = <300>;
        };
 
-       mmc@c8000000 {
+       sdmmc1: mmc@c8000000 {
                status = "okay";
 
                #address-cells = <1>;
                #size-cells = <0>;
 
-               max-frequency = <25000000>;
+               assigned-clocks = <&tegra_car TEGRA20_CLK_SDMMC1>;
+               assigned-clock-parents = <&tegra_car TEGRA20_CLK_PLL_C>;
+               assigned-clock-rates = <50000000>;
+
+               max-frequency = <50000000>;
                keep-power-in-suspend;
                bus-width = <4>;
                non-removable;
@@ -745,7 +769,7 @@
                };
        };
 
-       mmc@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -754,7 +778,7 @@
                vqmmc-supply = <&vdd_3v3_sys>;
        };
 
-       mmc@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                vmmc-supply = <&vcore_emmc>;
@@ -780,6 +804,13 @@
                default-brightness-level = <20>;
        };
 
+       bat1010: battery-2s1p {
+               compatible = "simple-battery";
+               charge-full-design-microamp-hours = <3260000>;
+               energy-full-design-microwatt-hours = <24000000>;
+               operating-range-celsius = <0 40>;
+       };
+
        /* PMIC has a built-in 32KHz oscillator which is used by PMC */
        clk32k_in: clock@0 {
                compatible = "fixed-clock";
@@ -893,6 +924,7 @@
                compatible = "ti,sn75lvds83", "lvds-encoder";
 
                powerdown-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_LOW>;
+               power-supply = <&vdd_3v3_sys>;
 
                ports {
                        #address-cells = <1>;
@@ -1006,14 +1038,14 @@
        };
 
        thermal-zones {
-               nct1008-local {
+               skin-thermal {
                        polling-delay-passive = <1000>; /* milliseconds */
                        polling-delay = <0>; /* milliseconds */
 
                        thermal-sensors = <&nct1008 0>;
                };
 
-               nct1008-remote {
+               cpu-thermal {
                        polling-delay-passive = <1000>; /* milliseconds */
                        polling-delay = <5000>; /* milliseconds */
 
@@ -1436,3 +1468,8 @@
                };
        };
 };
+
+&emc_icc_dvfs_opp_table {
+       /delete-node/ opp@666000000;
+       /delete-node/ opp@760000000;
+};