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

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

Merge "defconfig: arm: Add led gpio flash config on msm8909"

parents 2ad033bf 2983aa3b

arch/arm/configs/msm8909-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_MSM_GPIO_FLASH=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_RTC_CLASS=y

arch/arm/configs/msm8909_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_MSM_GPIO_FLASH=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_RTC_CLASS=y

arch/arm64/boot/dts/qcom/msm-pm8909.dtsi

+6 −25
Original line number Diff line number Diff line
@@ -81,33 +81,14 @@ 
		};



		pm8909_gpios: gpios {

			compatible = "qcom,qpnp-pin";

			spmi-dev-container;

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x400>;

			interrupts = <0x0 0xc1 0 IRQ_TYPE_NONE>,

				<0x0 0xc3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8909_gpio2", "pm8909_gpio4";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm8909-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

			};



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

			};



			gpio@c200 {

				reg = <0xc200 0x100>;

				qcom,pin-num = <3>;

			};



			gpio@c300 {

				reg = <0xc300 0x100>;

				qcom,pin-num = <4>;

			};

			qcom,gpios-disallowed = <1 3>;

		};



		pm8909_vadc: vadc@3100 {