Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4210-universal_c210.dts

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 08284e8..dd44ad2 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -532,6 +532,24 @@
 };
 
 &pinctrl_1 {
+       bt_shutdown: bt-shutdown {
+               samsung,pins = "gpe1-4";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+       };
+
+       bt_host_wakeup: bt-host-wakeup {
+               samsung,pins = "gpx2-6";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+       };
+
+       bt_device_wakeup: bt-device-wakeup {
+               samsung,pins = "gpx3-1";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+       };
+
        lp3974_irq: lp3974-irq {
                samsung,pins = "gpx0-7", "gpx2-7";
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
@@ -608,6 +626,17 @@
        status = "okay";
        /delete-property/dmas;
        /delete-property/dma-names;
+       pinctrl-0 = <&uart0_data &uart0_fctl>;
+       pinctrl-names = "default";
+
+       bluetooth {
+               compatible = "brcm,bcm4330-bt";
+               pinctrl-0 = <&bt_shutdown &bt_device_wakeup &bt_host_wakeup>;
+               pinctrl-names = "default";
+               shutdown-gpios = <&gpe1 4 GPIO_ACTIVE_HIGH>;
+               device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>;
+               host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 &serial_1 {