diff options
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index b64cfda8dbb7..49f37084e435 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts | |||
@@ -155,6 +155,13 @@ | |||
155 | compatible = "nokia,n900-ir"; | 155 | compatible = "nokia,n900-ir"; |
156 | pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ | 156 | pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ |
157 | }; | 157 | }; |
158 | |||
159 | /* controlled (enabled/disabled) directly by bcm2048 and wl1251 */ | ||
160 | vctcxo: vctcxo { | ||
161 | compatible = "fixed-clock"; | ||
162 | #clock-cells = <0>; | ||
163 | clock-frequency = <38400000>; | ||
164 | }; | ||
158 | }; | 165 | }; |
159 | 166 | ||
160 | &omap3_pmx_core { | 167 | &omap3_pmx_core { |
@@ -162,8 +169,10 @@ | |||
162 | 169 | ||
163 | uart2_pins: pinmux_uart2_pins { | 170 | uart2_pins: pinmux_uart2_pins { |
164 | pinctrl-single,pins = < | 171 | pinctrl-single,pins = < |
165 | OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx */ | 172 | OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts */ |
173 | OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts */ | ||
166 | OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx */ | 174 | OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx */ |
175 | OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx */ | ||
167 | >; | 176 | >; |
168 | }; | 177 | }; |
169 | 178 | ||
@@ -920,6 +929,8 @@ | |||
920 | 929 | ||
921 | interrupt-parent = <&gpio2>; | 930 | interrupt-parent = <&gpio2>; |
922 | interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */ | 931 | interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */ |
932 | |||
933 | clocks = <&vctcxo>; | ||
923 | }; | 934 | }; |
924 | }; | 935 | }; |
925 | 936 | ||
@@ -937,9 +948,17 @@ | |||
937 | }; | 948 | }; |
938 | 949 | ||
939 | &uart2 { | 950 | &uart2 { |
940 | interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>; | ||
941 | pinctrl-names = "default"; | 951 | pinctrl-names = "default"; |
942 | pinctrl-0 = <&uart2_pins>; | 952 | pinctrl-0 = <&uart2_pins>; |
953 | |||
954 | bcm2048: bluetooth { | ||
955 | compatible = "brcm,bcm2048-nokia", "nokia,h4p-bluetooth"; | ||
956 | reset-gpios = <&gpio3 27 GPIO_ACTIVE_LOW>; /* 91 */ | ||
957 | host-wakeup-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* 101 */ | ||
958 | bluetooth-wakeup-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* 37 */ | ||
959 | clocks = <&vctcxo>; | ||
960 | clock-names = "sysclk"; | ||
961 | }; | ||
943 | }; | 962 | }; |
944 | 963 | ||
945 | &uart3 { | 964 | &uart3 { |