6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch git@apitzsch.eu
[ Upstream commit 5d8d9330921770fb953e8e749bbd049ac0fae988 ]
l8910 uses OCP8110 flash LED driver. Add it to the device tree.
Tested-by: Stephan Gerhold stephan@gerhold.net Signed-off-by: André Apitzsch git@apitzsch.eu Signed-off-by: Bjorn Andersson andersson@kernel.org Link: https://lore.kernel.org/r/20230514-x5_front_flash-v2-1-845a8bb0483b@apitzsch... Stable-dep-of: 4facccb44a82 ("arm64: dts: qcom: apq8016-sbc: Rename ov5640 enable-gpios to powerdown-gpios") Signed-off-by: Sasha Levin sashal@kernel.org --- .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index b79e80913af9f..6046e2c1f1586 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -20,6 +20,21 @@ chosen { stdout-path = "serial0"; };
+ flash-led-controller { + compatible = "ocs,ocp8110"; + enable-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>; + flash-gpios = <&msmgpio 119 GPIO_ACTIVE_HIGH>; + + pinctrl-0 = <&camera_front_flash_default>; + pinctrl-names = "default"; + + flash_led: led { + function = LED_FUNCTION_FLASH; + color = <LED_COLOR_ID_WHITE>; + flash-max-timeout-us = <250000>; + }; + }; + gpio-keys { compatible = "gpio-keys";
@@ -246,6 +261,13 @@ button_backlight_default: button-backlight-default-state { bias-disable; };
+ camera_front_flash_default: camera-front-flash-default-state { + pins = "gpio49", "gpio119"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + gpio_keys_default: gpio-keys-default-state { pins = "gpio107"; function = "gpio";