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 / exynos4412-galaxy-s3.dtsi

diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 89ed81f..c14e37d 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -15,7 +15,7 @@
                i2c10 = &i2c_cm36651;
        };
 
-       aat1290 {
+       led-controller {
                compatible = "skyworks,aat1290";
                flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>;
                enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>;
@@ -58,9 +58,8 @@
                i2c-gpio,delay-us = <2>;
                #address-cells = <1>;
                #size-cells = <0>;
-               status = "okay";
 
-               ak8975@c {
+               magnetometer@c {
                        compatible = "asahi-kasei,ak8975";
                        reg = <0x0c>;
                        gpios = <&gpj0 7 GPIO_ACTIVE_HIGH>;
@@ -75,7 +74,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               cm36651@18 {
+               light-sensor@18 {
                        compatible = "capella,cm36651";
                        reg = <0x18>;
                        interrupt-parent = <&gpx0>;
@@ -133,7 +132,7 @@
 };
 
 &i2c_3 {
-       mms114-touchscreen@48 {
+       touchscreen@48 {
                compatible = "melfas,mms114";
                reg = <0x48>;
                interrupt-parent = <&gpm2>;