summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts12
-rw-r--r--arch/arm/boot/dts/exynos4x12-pinctrl.dtsi7
-rw-r--r--net/rfkill/rfkill-gpio.c1
3 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index ff08a4b..0a5e2a3 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -400,6 +400,8 @@
};
serial@13800000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_data &uart0_fctl>;
status = "okay";
};
@@ -415,6 +417,16 @@
status = "okay";
};
+ rfkill_bt {
+ compatible = "rfkill-gpio";
+ pinctrl-0 = <&eint22>;
+ pinctrl-names = "default";
+ status = "okay";
+ rfkill-name = "bt";
+ rfkill-type = <2>;
+ shutdown-gpio = <&gpl0 6 0>;
+ };
+
i2c_ak8975: i2c-gpio-0 {
compatible = "i2c-gpio";
gpios = <&gpy2 4 0>, <&gpy2 5 0>;
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index b4919a6..0b85587 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -898,6 +898,13 @@
samsung,pin-drv = <0>;
};
+ eint22: ext-int22 {
+ samsung,pins = "gpx2-6";
+ samsung,pin-function = <0xf>;
+ samsung,pin-pud = <0>;
+ samsung,pin-drv = <0>;
+ };
+
eint31: ext-int31 {
samsung,pins = "gpx3-7";
samsung,pin-function = <0xf>;
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 99c778c..ad5c956 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -79,6 +79,7 @@ static int rfkill_gpio_dt_probe(struct device *dev,
rfkill->name = np->name;
of_property_read_string(np, "rfkill-name", &rfkill->name);
of_property_read_u32(np, "rfkill-type", &rfkill->type);
+ rfkill->shutdown_gpio = of_get_named_gpio(np, "shutdown-gpio", 0);
return 0;
}