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

Commit b1911652 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: Add PWM device nodes for pmdcalifornium"

parents 3089b361 dec82141

arch/arm/boot/dts/qcom/mdmcalifornium-mtp.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ 
		qcom,master-en = <0>;	/* DISABLE GPIO */

	};



	gpio@c200 { /* GPIO 3 - LED */

		status = "ok";

		qcom,master-en = <0>;    /* Disable GPIO */

	};



	gpio@c400 { /* GPIO 5 - USB_ID */

		status = "ok";

		qcom,mode = <0>;	/* Digital input */
@@ -85,6 +90,14 @@ 
	qcom,enable-gp-driver;		/* Enable GP */

};



&pmdcalifornium_pwm_1 {

	status = "ok";

};



&pmdcalifornium_pwm_2 {

	status = "ok";

};



&qnand_1 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm-pmdcalifornium.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -188,6 +188,26 @@ 
		#address-cells = <1>;

		#size-cells = <1>;



		pmdcalifornium_pwm_1: pwm@bc00 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xbc00 0x100>;

			reg-names = "qpnp-lpg-channel-base";

			qcom,channel-id = <0>;

			qcom,supported-sizes = <6>, <9>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pmdcalifornium_pwm_2: pwm@bd00 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xbd00 0x100>;

			reg-names = "qpnp-lpg-channel-base";

			qcom,channel-id = <1>;

			qcom,supported-sizes = <6>, <9>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		regulator@1400 {

			compatible = "qcom,qpnp-regulator";

			regulator-name = "californium_s1";

arch/arm/configs/mdm-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -353,6 +353,8 @@ CONFIG_TRACER_PKT=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y

arch/arm/configs/mdm_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ CONFIG_TRACER_PKT=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y