evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: add camera focus and snapshot nodes for MSMFALCON"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-13 12:18:03 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1dcf06662e
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/arm/boot/dts/qcom/msmfalcon-pinctrl.dtsi
View file

@ -760,5 +760,33 @@
bias-disable; bias-disable;
}; };
}; };
tlmm_gpio_key {
gpio_key_active: gpio_key_active {
mux {
pins = "gpio64", "gpio113";
function = "gpio";
};
config {
pins = "gpio64", "gpio113";
drive-strength = <2>;
bias-pull-up;
};
};
gpio_key_suspend: gpio_key_suspend {
mux {
pins = "gpio64", "gpio113";
function = "gpio";
};
config {
pins = "gpio64", "gpio113";
drive-strength = <2>;
bias-pull-up;
};
};
};
}; };
}; };

21
arch/arm/boot/dts/qcom/msmfalcon.dtsi
View file

@ -1672,9 +1672,28 @@
&soc { &soc {
gpio_keys { gpio_keys {
status = "okay";
compatible = "gpio-keys"; compatible = "gpio-keys";
input-name = "gpio-keys"; input-name = "gpio-keys";
status = "okay"; pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";
pinctrl-0 = <&gpio_key_active>;
pinctrl-1 = <&gpio_key_suspend>;
camera_focus {
label = "camera_focus";
gpios = <&tlmm 64 0x1>;
linux,input-type = <1>;
linux,code = <0x210>;
debounce-interval = <15>;
};
camera_snapshot {
label = "camera_snapshot";
gpios = <&tlmm 113 0x1>;
linux,input-type = <1>;
linux,code = <0x2fe>;
debounce-interval = <15>;
};
vol_up { vol_up {
label = "volume_up"; label = "volume_up";