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

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

Merge "Leds: Add fake led driver for skuc 8909."

parents 8ac4733d 4d5be106

arch/arm/boot/dts/qcom/msm8909-camera-sensor-skuc.dtsi

100644 → 100755
+33 −0
Original line number Diff line number Diff line
@@ -10,8 +10,40 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

&tlmm_pinmux {

	SL610W1D_pins {

		qcom,pins = <&gp 31>, <&gp 0>;

		qcom,num-grp-pins = <2>;

		qcom,pin-func = <0>;

		label = "SL610W1D_pins";

		SL610W1D_default: en_default {

		drive-strength = <2>;

		bias-pull-down;

		};

	};

};



&soc {

	flash_SL610W1D:flashlight {

		compatible = "qcom,leds-gpio-flash";

		status = "okay";

		pinctrl-names = "flash_default";

		pinctrl-0 = <&SL610W1D_default>;

		qcom,flash-en = <&msm_gpio 31 0>;

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

		qcom,op-seq = "flash_en", "flash_now";

		qcom,torch-seq-val = <1 0>;

		qcom,flash-seq-val = <1 1>;

		linux,name = "flashlight";

		linux,default-trigger = "flashlight-trigger";

	};

	led_flash0: qcom,camera-led-flash {

		cell-index = <0>;

		compatible = "qcom,camera-led-flash";

		qcom,flash-type = <3>;

		qcom,flash-source = <&flash_SL610W1D>;

		qcom,torch-source = <&flash_SL610W1D>;

	};

};



&i2c_3 {
@@ -66,6 +98,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vana-supply = <&pm8909_l17>;

		cam_vio-supply = <&pm8909_l6>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana";

arch/arm/configs/msm8909-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_MODVERSIONS=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8909=y

CONFIG_LEDS_MSM_GPIO_FLASH=y

# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMCMOD=y
@@ -72,6 +73,7 @@ CONFIG_PM_AUTOSLEEP=y 
CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_GC0310=y

CONFIG_PM_RUNTIME=y

CONFIG_PM_OPP=y

CONFIG_NET=y
@@ -419,6 +421,7 @@ CONFIG_MMC_BLOCK_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

arch/arm/configs/msm8909_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ CONFIG_MODULE_SIG_SHA512=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8909=y

CONFIG_LEDS_MSM_GPIO_FLASH=y

# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMCMOD=y
@@ -424,6 +425,7 @@ CONFIG_MMC_BLOCK_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y