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

Commit 012c7173 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 PMIC GPIO devices for SDM855"

parents d2c12174 1e5a3e7b

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

+17 −0
Original line number Diff line number Diff line
@@ -54,6 +54,23 @@ 
				interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

			};

		};



		pm855_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xa00>;

			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc5 0 IRQ_TYPE_NONE>,

					<0x0 0xc8 0 IRQ_TYPE_NONE>,

					<0x0 0xc9 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm855_gpio1", "pm855_gpio3",

					"pm855_gpio4", "pm855_gpio6",

					"pm855_gpio9", "pm855_gpio10";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <2 5 7 8>;

		};

	};



	qcom,pm855@1 {

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

+22 −0
Original line number Diff line number Diff line
@@ -38,6 +38,28 @@ 
			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};



		pm855b_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xc00>;

			interrupts = <0x2 0xc0 0 IRQ_TYPE_NONE>,

					<0x2 0xc1 0 IRQ_TYPE_NONE>,

					<0x2 0xc4 0 IRQ_TYPE_NONE>,

					<0x2 0xc5 0 IRQ_TYPE_NONE>,

					<0x2 0xc7 0 IRQ_TYPE_NONE>,

					<0x2 0xc8 0 IRQ_TYPE_NONE>,

					<0x2 0xc9 0 IRQ_TYPE_NONE>,

					<0x2 0xca 0 IRQ_TYPE_NONE>,

					<0x2 0xcb 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm855b_gpio1", "pm855b_gpio2",

					"pm855b_gpio5", "pm855b_gpio6",

					"pm855b_gpio8", "pm855b_gpio9",

					"pm855b_gpio10", "pm855b_gpio11",

					"pm855b_gpio12";

			gpio-controller;

			#gpio-cells = <2>;

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

		};

	};



	qcom,pm855b@3 {

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

+25 −0
Original line number Diff line number Diff line
@@ -43,6 +43,31 @@ 
			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};



		pm855l_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xc00>;

			interrupts = <0x4 0xc0 0 IRQ_TYPE_NONE>,

					<0x4 0xc1 0 IRQ_TYPE_NONE>,

					<0x4 0xc2 0 IRQ_TYPE_NONE>,

					<0x4 0xc3 0 IRQ_TYPE_NONE>,

					<0x4 0xc4 0 IRQ_TYPE_NONE>,

					<0x4 0xc5 0 IRQ_TYPE_NONE>,

					<0x4 0xc7 0 IRQ_TYPE_NONE>,

					<0x4 0xc8 0 IRQ_TYPE_NONE>,

					<0x4 0xc9 0 IRQ_TYPE_NONE>,

					<0x4 0xca 0 IRQ_TYPE_NONE>,

					<0x4 0xcb 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm855l_gpio1", "pm855l_gpio2",

					"pm855l_gpio3", "pm855l_gpio4",

					"pm855l_gpio5", "pm855l_gpio6",

					"pm855l_gpio8", "pm855l_gpio9",

					"pm855l_gpio10", "pm855l_gpio11",

					"pm855l_gpio12";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <7>;

		};

	};



	qcom,pm855l@5 {

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ CONFIG_PM855B_PMIC_SIMULATOR=y 
CONFIG_PM855L_PMIC_SIMULATOR=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_QCOM=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ CONFIG_PM855B_PMIC_SIMULATOR=y 
CONFIG_PM855L_PMIC_SIMULATOR=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_QCOM=y