Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra30-asus-nexus7-grouper-common.dtsi

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index 9732cd6..07d4ea1 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -819,6 +819,10 @@
                bluetooth {
                        compatible = "brcm,bcm4330-bt";
 
+                       interrupt-parent = <&gpio>;
+                       interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "host-wakeup";
+
                        max-speed = <4000000>;
 
                        clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>;
@@ -828,7 +832,6 @@
                        vddio-supply = <&vdd_1v8>;
 
                        device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>;
-                       host-wakeup-gpios =   <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>;
                        shutdown-gpios =      <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>;
                };
        };
@@ -941,9 +944,29 @@
                        interrupts = <TEGRA_GPIO(V, 1) IRQ_TYPE_EDGE_BOTH>;
 
                        summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW>;
+                       summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>;
                        summit,enable-usb-charging;
 
                        monitored-battery = <&battery_cell>;
+
+                       usb_vbus: usb-vbus {
+                               regulator-name = "usb_vbus";
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5000000>;
+                               regulator-min-microamp = <750000>;
+                               regulator-max-microamp = <750000>;
+
+                               /*
+                                * SMB347 INOK input pin is connected to PMIC's
+                                * ACOK output, which is fixed to ACTIVE_LOW as
+                                * long as battery voltage is in a good range.
+                                *
+                                * Active INOK disables SMB347 output, so polarity
+                                * needs to be toggled when we want to get the
+                                * output.
+                                */
+                               summit,needs-inok-toggle;
+                       };
                };
        };
 
@@ -1016,12 +1039,13 @@
        usb@7d000000 {
                compatible = "nvidia,tegra30-udc";
                status = "okay";
-               dr_mode = "peripheral";
+               dr_mode = "otg";
+               vbus-supply = <&usb_vbus>;
        };
 
        usb-phy@7d000000 {
                status = "okay";
-               dr_mode = "peripheral";
+               dr_mode = "otg";
                nvidia,hssync-start-delay = <0>;
                nvidia,xcvr-lsfslew = <2>;
                nvidia,xcvr-lsrslew = <2>;