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

Commit 036521df authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add pmxprairie and PM8150B PMIC devices for sdxprairie"

parents ac79363c fbc26c66

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ CONFIG_CFG80211_DEBUGFS=y 
CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_WEXT=y

CONFIG_RFKILL=y

CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=12

CONFIG_MTD=y
@@ -198,6 +199,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
@@ -211,11 +213,15 @@ CONFIG_I2C_MSM_V2=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y

CONFIG_POWER_RESET=y

CONFIG_POWER_SUPPLY=y

CONFIG_THERMAL=y

CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_STUB=y

CONFIG_SOUND=y
@@ -265,6 +271,7 @@ CONFIG_USB_CONFIGFS_F_CDEV=y 
CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_STAGING=y
@@ -279,6 +286,7 @@ CONFIG_RMNET_IPA3=y 
CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_GCC_SDXPRAIRIE=y
@@ -315,6 +323,7 @@ CONFIG_QCOM_GLINK_PKT=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

arch/arm/configs/vendor/sdxprairie_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ CONFIG_QRTR=y 
CONFIG_QRTR_SMD=y

CONFIG_CFG80211=y

CONFIG_RFKILL=y

CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=12

CONFIG_MTD=y
@@ -185,6 +186,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
@@ -200,12 +202,16 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MSM_V2=y

CONFIG_SPI=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_SLIMBUS=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y

CONFIG_POWER_RESET=y

CONFIG_POWER_SUPPLY=y

CONFIG_THERMAL=y

CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_STUB=y

CONFIG_FB=y
@@ -256,6 +262,7 @@ CONFIG_USB_CONFIGFS_F_CDEV=y 
CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_STAGING=y
@@ -269,6 +276,7 @@ CONFIG_RMNET_IPA3=y 
CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_GCC_SDXPRAIRIE=y
@@ -306,6 +314,7 @@ CONFIG_QCOM_GLINK_PKT=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_STM=y

arch/arm64/boot/dts/qcom/pmxprairie.dtsi

0 → 100644
+153 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>



&spmi_bus {

	#address-cells = <2>;

	#size-cells = <0>;

	interrupt-controller;

	#interrupt-cells = <4>;



	qcom,pmxprairie@8 {

		compatible = "qcom,spmi-pmic";

		reg = <0x8 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		qcom,power-on@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			interrupts = <0x8 0x8 0x0 IRQ_TYPE_EDGE_BOTH>,

				     <0x8 0x8 0x1 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "kpdpwr", "resin";

			qcom,pon-dbc-delay = <15625>;

			qcom,kpdpwr-sw-debounce;

			qcom,system-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <PON_POWER_ON_TYPE_KPDPWR>;

				linux,code = <KEY_POWER>;

				qcom,pull-up;

			};



			qcom,pon_2 {

				qcom,pon-type = <PON_POWER_ON_TYPE_RESIN>;

				linux,code = <KEY_VOLUMEDOWN>;

				qcom,pull-up;

			};

		};



		pmxprairie_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x8 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;

			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};



		pmxprairie_clkdiv: clock-controller@5b00 {

			compatible = "qcom,spmi-clkdiv";

			reg = <0x5b00 0x100>;

			#clock-cells = <1>;

			qcom,num-clkdivs = <1>;

			clock-output-names = "pmxprairie_div_clk1";

			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};



		pmxprairie_rtc: qcom,rtc@6000 {

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;

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

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



			qcom,pmxprairie_rtc_rw@6000 {

				reg = <0x6000 0x100>;

			};



			qcom,pmxprairie_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts =

					<0x8 0x61 0x1 IRQ_TYPE_EDGE_RISING>;

			};

		};



		pmxprairie_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xb00>;

			interrupts = <0x8 0xc0 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc1 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc3 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc4 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc5 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc7 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc8 0x0 IRQ_TYPE_NONE>,

					<0x8 0xc9 0x0 IRQ_TYPE_NONE>;

			interrupt-names = "pmxprairie_gpio1",

					"pmxprairie_gpio2",

					"pmxprairie_gpio4",

					"pmxprairie_gpio5",

					"pmxprairie_gpio6",

					"pmxprairie_gpio8",

					"pmxprairie_gpio9",

					"pmxprairie_gpio10";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <3 7 11>;

		};

	};



	qcom,pmxprairie@9 {

		compatible ="qcom,spmi-pmic";

		reg = <0x9 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

	};

};



&thermal_zones {

	pmxprairie_temp_alarm: pmxprairie_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pmxprairie_tz>;



		trips {

			pmxprairie_trip0: trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};



			pmxprairie_trip1: trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";

			};



			pmxprairie_trip2: trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


/dts-v1/;



#include "sdxprairie.dtsi"

#include "sdxprairie-cdp.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ 
 * GNU General Public License for more details.

 */



#include "sdxprairie.dtsi"
 
#include "sdxprairie-pmic-overlay.dtsi"