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

Commit 203df93b 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 qpnp pinctrl, pwm and rtc devices for pmxpoorwills"

parents fb25d3fe 97c29938

arch/arm/boot/dts/qcom/pmxpoorwills.dtsi

+74 −0
Original line number Diff line number Diff line
@@ -51,6 +51,40 @@ 
				linux,code = <114>;

			};

		};



		pmxpoorwills_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x900>;

			interrupts = <0x0 0xc1 0 IRQ_TYPE_NONE>,

					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc4 0 IRQ_TYPE_NONE>,

					<0x0 0xc5 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmxpoorwills_gpio2",

					  "pmxpoorwills_gpio3",

					  "pmxpoorwills_gpio4",

					  "pmxpoorwills_gpio5",

					  "pmxpoorwills_gpio6";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <1 7 8 9>;

		};



		pmxpoorwills_rtc: qcom,pmxpoorwills_rtc {

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;

			qcom,qpnp-rtc-write = <0>;

			qcom,qpnp-rtc-alarm-pwrup = <0>;



			qcom,pmxpoorwills_rtc_rw@6000 {

				reg = <0x6000 0x100>;

			};

			qcom,pmxpoorwills_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

			};

		};

	};



	qcom,pmxpoorwills@1 {
@@ -58,5 +92,45 @@ 
		reg = <0x1 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmxpoorwills_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";

		};



		pmxpoorwills_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";

		};



		pmxpoorwills_pwm_3: pwm@be00 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xbe00 0x100>;

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

			qcom,channel-id = <2>;

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

			#pwm-cells = <2>;

			status = "disabled";

		};



		pmxpoorwills_pwm_4: pwm@bf00 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xbf00 0x100>;

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

			qcom,channel-id = <3>;

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

			#pwm-cells = <2>;

			status = "disabled";

		};

	};

};

arch/arm/configs/sdxpoorwills-perf_defconfig

+13 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_SERIO_LIBPS2=y
@@ -203,17 +204,25 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_PINCTRL_SDXPOORWILLS=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB138X_CHARGER=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y
@@ -265,6 +274,7 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_STAGING=y
@@ -276,6 +286,7 @@ CONFIG_RNDIS_IPA=y 
CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y
@@ -293,7 +304,9 @@ CONFIG_MSM_GLINK_PKT=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_QCOM_SHOW_RESUME_IRQ=y

CONFIG_ANDROID=y

CONFIG_EXT3_FS=y

arch/arm/configs/sdxpoorwills_defconfig

+13 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_SERIO_LIBPS2=y
@@ -199,18 +200,26 @@ CONFIG_SPI=y 
CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SLIMBUS=y

CONFIG_SPMI=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_PINCTRL_SDXPOORWILLS=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB138X_CHARGER=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SYSCON=y

CONFIG_MSM_CDC_PINCTRL=y

CONFIG_MSM_CDC_SUPPLY=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_STUB=y

CONFIG_FB=y

CONFIG_SOUND=y
@@ -263,6 +272,7 @@ CONFIG_MMC_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_UIO=y
@@ -275,6 +285,7 @@ CONFIG_RNDIS_IPA=y 
CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_SCM=y
@@ -292,7 +303,9 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_QCOM_SHOW_RESUME_IRQ=y

CONFIG_ANDROID=y

CONFIG_STM=y

drivers/power/supply/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ obj-$(CONFIG_SMB135X_CHARGER) += smb135x-charger.o pmic-voter.o 
obj-$(CONFIG_SMB1355_SLAVE_CHARGER)   += smb1355-charger.o pmic-voter.o

obj-$(CONFIG_SMB1351_USB_CHARGER) += smb1351-charger.o pmic-voter.o battery.o

obj-$(CONFIG_QPNP_SMB2)		+= step-chg-jeita.o battery.o qpnp-smb2.o smb-lib.o pmic-voter.o storm-watch.o

obj-$(CONFIG_SMB138X_CHARGER)	+= smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o battery.o

obj-$(CONFIG_SMB138X_CHARGER)	+= step-chg-jeita.o smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o battery.o

obj-$(CONFIG_QPNP_QNOVO)	+= qpnp-qnovo.o battery.o