Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[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 10794a8..d3b9953 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -512,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>;
+                       };
                };
        };
 
@@ -794,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";
@@ -907,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>;
@@ -1020,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 */
 
@@ -1450,3 +1468,8 @@
                };
        };
 };
+
+&emc_icc_dvfs_opp_table {
+       /delete-node/ opp@666000000;
+       /delete-node/ opp@760000000;
+};