ARM: dts: DRA7: enabling optional clks in DT

[android-sdk/kernel-video.git] / arch / arm / boot / dts / dra72-evm.dts

diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index a9ccdc44541cd5fa781cdc4551a7c17bc8add938..080f1844a511e5e4583a6245a5484a1b00f09b63 100644 (file)
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -200,6 +200,16 @@
 };
 
 &dra7_pmx_core {
+       bt_uart3_pins: pinmux_uart3_pins {
+               pinctrl-single,pins = <
+                       0x3c0 (PIN_INPUT_PULLUP | MUX_MODE1)    /* uart3_rxd */
+                       0x3c4 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* uart3_txd */
+                       0x3c8 (PIN_INPUT | MUX_MODE1)           /* uart3_ctsn */
+                       0x3cc (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* uart3_rtsn */
+                       0x2bc (PIN_OUTPUT | MUX_MODE14)         /* gpio5_4 */
+               >;
+       };
+
        i2c1_pins: pinmux_i2c1_pins {
                pinctrl-single,pins = <
                        0x400 (PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
@@ -479,7 +489,7 @@
 
        wlirq_pins: pinmux_wlirq_pins {
                pinctrl-single,pins = <
-                       0x2c8 (PIN_INPUT_PULLUP | WAKEUP_EN | MUX_MODE14 ) /* mcasp1_axr5.gpio5_7 - WLAN_IRQ */
+                       0x2c8 (PIN_INPUT_PULLDOWN | MUX_MODE14 ) /* mcasp1_axr5.gpio5_7 - WLAN_IRQ */
                >;
        };
 
@@ -615,6 +625,7 @@
                                        regulator-name = "ldo1";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-always-on;
                                        regulator-boot-on;
                                };
 
@@ -680,7 +691,7 @@
                interrupt-controller;
                #interrupt-cells = <2>;
 
-               cpsw_sel_s0 {
+               sel_enet_mux_hog: cpsw_sel_s0 {
                        gpio-hog;
                        gpios = <4 GPIO_ACTIVE_HIGH>;
                        output-low;
@@ -760,6 +771,8 @@ i2c_p3_exp: &i2c5 {
 &uart3 {
        status = "okay";
        gpios = <&pcf_gpio_21 14 GPIO_ACTIVE_LOW>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&bt_uart3_pins>;
 };
 
 &mmc1 {
@@ -805,7 +818,7 @@ i2c_p3_exp: &i2c5 {
        #address-cells = <1>;
        #size-cells = <0>;
        wlcore: wlcore@0 {
-               compatible = "ti,wlcore";
+               compatible = "ti,wl1835";
                reg = <2>;
                interrupt-parent = <&gpio5>;
                interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
@@ -818,6 +831,7 @@ i2c_p3_exp: &i2c5 {
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        slaves = <1>;
+       ti,no-idle;
 };
 
 &cpsw_emac0 {
@@ -946,6 +960,7 @@ i2c_p3_exp: &i2c5 {
 
 &dss {
        status = "ok";
+       ti,enable-opt-clks-on-reset;
 
        vdda_video-supply = <&ldo5_reg>;
 };
@@ -1032,6 +1047,11 @@ i2c_p3_exp: &i2c5 {
        };
 };
 
+&mcasp2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp2_pins>;
+};
+
 &mcasp3 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mcasp3_pins>;
@@ -1047,6 +1067,13 @@ i2c_p3_exp: &i2c5 {
        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                1 2 0 0
        >;
+       tx-num-evt = <8>;
+       rx-num-evt = <8>;
+};
+
+&mcasp6 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp6_pins>;
 };
 
 &mcasp7 {
@@ -1084,7 +1111,7 @@ i2c_p3_exp: &i2c5 {
 };
 
 &usb1 {
-       dr_mode = "otg";
+       dr_mode = "peripheral";
        pinctrl-names = "default";
        pinctrl-0 = <&usb1_pins>;
 };
@@ -1173,7 +1200,8 @@ i2c_p3_exp: &i2c5 {
        status = "okay";
 };
 
-&vin2a {
+video_in: &vin2a {
+       status = "okay";
        endpoint@0 {
                slave-mode;
                remote-endpoint = <&onboardLI>;
@@ -1184,3 +1212,14 @@ i2c_p3_exp: &i2c5 {
 &cal {
        status = "okay";
 };
+
+&dsp_radio {
+        pinctrl-names = "default";
+        pinctrl-0 = <&radio_pins>;
+};
+
+&tvp_5158{
+       mux-gpios = <&pcf_hdmi 2 GPIO_ACTIVE_LOW>,      /*VIN2_S0*/
+                       <&pcf_jamr3_21 8 GPIO_ACTIVE_LOW>,      /*SEL_TVP_FPD*/
+                       <&pcf_hdmi 6 GPIO_ACTIVE_HIGH>; /*VIN2_S2*/
+};