Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ad033bf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Fix Flash gpio configuration for MSM8905 QRD"

parents 43e9f8f6 a482fcf4

arch/arm64/boot/dts/qcom/msm8905-camera-sensor-skub.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
		compatible = "qcom,leds-gpio-flash";

		status = "okay";

		pinctrl-names = "flash_default";

		pinctrl-0 = <&SY7807_default>;

		pinctrl-0 = <&SY7807_default &flash_en_default>;

		qcom,flash-en = <&pm8909_gpios 4 0>;

		qcom,flash-now = <&msm_gpio 32 0>;

		clocks = <&clock_gcc clk_gcc_camss_gp1_clk>,

arch/arm64/boot/dts/qcom/msm8905-qrd-skub.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -522,6 +522,17 @@ 
			power-source = <1>;

		};

	};



	/* GPIO 4 (FLASH ENABLE GPIO CONFIG) */

	flash_en {

		flash_en_default: flash_en_default{

			pins = "gpio4";

			function = "normal";

			input-disable;

			output-enable;

			status = "okay";

		};

	};

};



&i2c_2 {