From: André Apitzsch <git@xxxxxxxxxxx> Patch "arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash" has been applied twice. This reverts the older version of the patch. Revert the commit f98bdb21cfc9 ("arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash") Fixes: f98bdb21cfc9 ("arm64: dts: qcom: msm8939-longcheer-l9100: Add rear flash") Signed-off-by: André Apitzsch <git@xxxxxxxxxxx> --- .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts index adc992ebc29d..b845da4fa23e 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts @@ -160,25 +160,6 @@ led@2 { }; }; - flash-led-controller@53 { - compatible = "silergy,sy7802"; - reg = <0x53>; - #address-cells = <1>; - #size-cells = <0>; - - enable-gpios = <&tlmm 16 GPIO_ACTIVE_HIGH>; - - pinctrl-0 = <&camera_rear_flash_default>; - pinctrl-names = "default"; - - led@0 { - reg = <0>; - function = LED_FUNCTION_FLASH; - color = <LED_COLOR_ID_WHITE>; - led-sources = <0>, <1>; - }; - }; - flash-led-controller@53 { compatible = "silergy,sy7802"; reg = <0x53>; @@ -364,13 +345,6 @@ camera_rear_flash_default: camera-rear-flash-default-state { bias-disable; }; - camera_rear_flash_default: camera-rear-flash-default-state { - pins = "gpio9", "gpio16", "gpio51"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - gpio_hall_sensor_default: gpio-hall-sensor-default-state { pins = "gpio20"; function = "gpio"; --- base-commit: d7b69f6e9e1c8b6acdcce3b385779eb046835dd5 change-id: 20240830-revert_flash-4e184591da15 Best regards, -- André Apitzsch <git@xxxxxxxxxxx>