Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index a226bec..d2406c9 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -263,7 +263,7 @@
        pinctrl-names = "default";
        status = "okay";
 
-       mms114-touchscreen@48 {
+       touchscreen@48 {
                compatible = "melfas,mms114";
                reg = <0x48>;
                interrupt-parent = <&gpx0>;
@@ -283,7 +283,7 @@
        pinctrl-names = "default";
        status = "okay";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
 
                reg = <0x66>;
@@ -462,6 +462,26 @@
        };
 };
 
+&pinctrl_1 {
+       bt_shutdown: bt-shutdown {
+               samsung,pins = "gpl1-0";
+               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>;
+       };
+};
+
 &rtc {
        status = "okay";
        clocks = <&clock CLK_RTC>, <&pmic_ap_clk>;
@@ -512,6 +532,17 @@
 
 &serial_0 {
        status = "okay";
+       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 = <&gpl1 0 GPIO_ACTIVE_HIGH>;
+               device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>;
+               host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 &serial_1 {