Commit 0bddaaf6 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding

ARM: tegra: Update Broadcom Bluetooth device-tree nodes

The host-wakeup GPIO is now marked as deprecated in the broadcom-bluetooth
device-tree binding, it's replaced with the host-wakeup interrupt. Update
Tegra device-trees to the recent version of the Bluetooth binding.
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 98b5c3eb
...@@ -393,6 +393,10 @@ uartc: serial@70006200 { ...@@ -393,6 +393,10 @@ uartc: serial@70006200 {
bluetooth { bluetooth {
compatible = "brcm,bcm4329-bt"; compatible = "brcm,bcm4329-bt";
interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>;
interrupt-names = "host-wakeup";
/* PLLP 216MHz / 16 / 4 */ /* PLLP 216MHz / 16 / 4 */
max-speed = <3375000>; max-speed = <3375000>;
...@@ -403,7 +407,6 @@ bluetooth { ...@@ -403,7 +407,6 @@ bluetooth {
vddio-supply = <&vdd_1v8_sys>; vddio-supply = <&vdd_1v8_sys>;
device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; 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>; shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -819,6 +819,10 @@ uartc: serial@70006200 { ...@@ -819,6 +819,10 @@ uartc: serial@70006200 {
bluetooth { bluetooth {
compatible = "brcm,bcm4330-bt"; compatible = "brcm,bcm4330-bt";
interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>;
interrupt-names = "host-wakeup";
max-speed = <4000000>; max-speed = <4000000>;
clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>; clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>;
...@@ -828,7 +832,6 @@ bluetooth { ...@@ -828,7 +832,6 @@ bluetooth {
vddio-supply = <&vdd_1v8>; vddio-supply = <&vdd_1v8>;
device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; 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>; shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -93,6 +93,10 @@ uartc: serial@70006200 { ...@@ -93,6 +93,10 @@ uartc: serial@70006200 {
bluetooth { bluetooth {
compatible = "brcm,bcm4330-bt"; compatible = "brcm,bcm4330-bt";
interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>;
interrupt-names = "host-wakeup";
max-speed = <4000000>; max-speed = <4000000>;
clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>; clocks = <&tegra_pmc TEGRA_PMC_CLK_BLINK>;
...@@ -103,7 +107,6 @@ bluetooth { ...@@ -103,7 +107,6 @@ bluetooth {
shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>;
device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment