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

Commit b8efabab authored by Kiran Gunda's avatar Kiran Gunda
Browse files

ARM: dts: msm: migrate PMIC GPIOs to pinctrl framework for pm8953/pmi8950 



Migrate the PMIC GPIOs from qpnp-pin/gpio framework to pinctrl. This
enables the clients to configure GPIO PMIC via the pinctrl framework.

Change-Id: I97b30ece3ed56f14f9d95da0dbf4622cd0bb2266
Signed-off-by: default avatarKiran Gunda <kgunda@codeaurora.org>
parent 2d5f01d2

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

+22 −93
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-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
@@ -65,105 +65,34 @@ 
		};



		pm8953_mpps: mpps {

			compatible = "qcom,qpnp-pin";

			spmi-dev-container;

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm8953-mpp";

			compatible = "qcom,spmi-mpp";

			reg = <0xa000 0x400>;



			mpp@a000 {

				reg = <0xa000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			mpp@a100 {

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				/* MPP2 - PA_THERM config */

				qcom,mode = <4>; /* AIN input */

				qcom,invert = <1>; /* Enable MPP */

				qcom,ain-route = <1>; /* AMUX 6 */

				qcom,master-en = <1>;

				qcom,src-sel = <0>; /* Function constant */

			};

			interrupts = <0x0 0xa0 0 IRQ_TYPE_NONE>,

				<0x0 0xa1 0 IRQ_TYPE_NONE>,

				<0x0 0xa2 0 IRQ_TYPE_NONE>,

				<0x0 0xa3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8953_mpp1", "pm8953_mpp2",

					"pm8953_mpp3", "pm8953_mpp4";



			mpp@a200 {

				reg = <0xa200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			mpp@a300 {

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				/* MPP4 - CASE_THERM config */

				qcom,mode = <4>; /* AIN input */

				qcom,invert = <1>; /* Enable MPP */

				qcom,ain-route = <3>; /* AMUX 8 */

				qcom,master-en = <1>;

				qcom,src-sel = <0>; /* Function constant */

			};

		};



		pm8953_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm8953-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

		};



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			gpio@c200 {

				reg = <0xc200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			gpio@c300 {

				reg = <0xc300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};



			gpio@c400 {

				reg = <0xc400 0x100>;

				qcom,pin-num = <5>;

				status = "disabled";

			};



			gpio@c500 {

				reg = <0xc500 0x100>;

				qcom,pin-num = <6>;

				status = "disabled";

			};

		pm8953_gpios: gpios {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x800>;



			gpio@c600 {

				reg = <0xc600 0x100>;

				qcom,pin-num = <7>;

				status = "disabled";

			};

			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

				<0x0 0xc3 0 IRQ_TYPE_NONE>,

				<0x0 0xc6 0 IRQ_TYPE_NONE>,

				<0x0 0xc7 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8953_gpio1", "pm8953_gpio4",

					"pm8953_gpio7", "pm8953_gpio8";



			gpio@c700 {

				reg = <0xc700 0x100>;

				qcom,pin-num = <8>;

				status = "disabled";

			};

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <2 3 5 6>;

		};



		pm8953_vadc: vadc@3100 {

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

+18 −45
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-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
@@ -140,57 +140,30 @@ 
		};



		pmi8950_gpios: gpios {

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmi8950-gpio";

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x200>;



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};

			interrupts = <0x2 0xc0 0 IRQ_TYPE_NONE>,

				<0x2 0xc1 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi8950_gpio1", "pmi8950_gpio2";



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};

		};



		pmi8950_mpps: mpps {

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmi8950-mpp";



			mpp@a000 {

				reg = <0xa000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

		};



			mpp@a100 {

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};

		pmi8950_mpps: mpps {

			compatible = "qcom,spmi-mpp";

			reg = <0xa000 0x400>;



			mpp@a200 {

				reg = <0xa200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};

			interrupts = <0x2 0xa0 0 IRQ_TYPE_NONE>,

				<0x2 0xa1 0 IRQ_TYPE_NONE>,

				<0x2 0xa2 0 IRQ_TYPE_NONE>,

				<0x2 0xa3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi8950_mpp1", "pmi8950_mpp2",

					  "pmi8950_mpp3", "pmi8950_mpp4";



			mpp@a300 {

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};

			gpio-controller;

			#gpio-cells = <2>;

		};



		pmi8950_charger: qcom,qpnp-smbcharger {