Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap3-gta04.dts

diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts
index d3b253bbc8856a9ba0a2f1810c1860f875931462..f8ad125fa46f2658b2ff43f79b2097780ef8695d 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dts
+++ b/arch/arm/boot/dts/omap3-gta04.dts
@@ -36,6 +36,14 @@
                        gpio-key,wakeup;
                };
        };
+
+       sound {
+               compatible = "ti,omap-twl4030";
+               ti,model = "gta04";
+
+               ti,mcbsp = <&mcbsp2>;
+               ti,codec = <&twl_audio>;
+       };
 };
 
 &omap3_pmx_core {
@@ -80,6 +88,12 @@
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                interrupt-parent = <&intc>;
        };
+
+       twl_audio: audio {
+               compatible = "ti,twl4030-audio";
+               codec {
+               };
+       };
 };
 
 #include "twl4030.dtsi"
@@ -96,6 +110,14 @@
                interrupts = <17 IRQ_TYPE_EDGE_RISING>;
        };
 
+       /* accelerometer */
+       bma180@41 {
+               compatible = "bosch,bma180";
+               reg = <0x41>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+       };
+
        /* leds */
        tca6507@45 {
                compatible = "ti,tca6507";
@@ -124,6 +146,22 @@
                        reg = <0x4>;
                };
        };
+
+       /* compass aka magnetometer */
+       hmc5843@1e {
+               compatible = "honeywell,hmc5843";
+               reg = <0x1e>;
+       };
+
+       /* touchscreen */
+       tsc2007@48 {
+               compatible = "ti,tsc2007";
+               reg = <0x48>;
+               interrupt-parent = <&gpio6>;
+               interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
+               gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
+               ti,x-plate-ohms = <600>;
+       };
 };
 
 &i2c3 {
@@ -148,7 +186,9 @@
 };
 
 &mmc2 {
-       status = "disabled";
+       vmmc-supply = <&vaux4>;
+       bus-width = <4>;
+       ti,non-removable;
 };
 
 &mmc3 {
@@ -170,3 +210,12 @@
        pinctrl-0 = <&uart3_pins>;
 };
 
+&charger {
+       bb_uvolt = <3200000>;
+       bb_uamp = <150>;
+};
+
+&vaux4 {
+       regulator-min-microvolt = <2800000>;
+       regulator-max-microvolt = <3150000>;
+};