ARM: dts: N900: Add bluetooth

Add bcm2048 node and its system clock to the N900 device tree file.
Apart from that a reference to the new clock has been added to
wl1251 (which uses it, too).

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index b64cfda..49f3708 100644 (file)
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -155,6 +155,13 @@
                compatible = "nokia,n900-ir";
                pwms = <&pwm9 0 26316 0>; /* 38000 Hz */
        };
+
+       /* controlled (enabled/disabled) directly by bcm2048 and wl1251 */
+       vctcxo: vctcxo {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <38400000>;
+       };
 };
 
 &omap3_pmx_core {
@@ -162,8 +169,10 @@
 
        uart2_pins: pinmux_uart2_pins {
                pinctrl-single,pins = <
-                       OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)                /* uart2_rx */
+                       OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0)         /* uart2_cts */
+                       OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0)               /* uart2_rts */
                        OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0)               /* uart2_tx */
+                       OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)                /* uart2_rx */
                >;
        };
 
@@ -920,6 +929,8 @@
 
                interrupt-parent = <&gpio2>;
                interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */
+
+               clocks = <&vctcxo>;
        };
 };
 
@@ -937,9 +948,17 @@
 };
 
 &uart2 {
-       interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
        pinctrl-names = "default";
        pinctrl-0 = <&uart2_pins>;
+
+       bcm2048: bluetooth {
+               compatible = "brcm,bcm2048-nokia", "nokia,h4p-bluetooth";
+               reset-gpios = <&gpio3 27 GPIO_ACTIVE_LOW>; /* 91 */
+               host-wakeup-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* 101 */
+               bluetooth-wakeup-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* 37 */
+               clocks = <&vctcxo>;
+               clock-names = "sysclk";
+       };
 };
 
 &uart3 {