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

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

Merge "ARM: dts: msm: Reorganize the pinctrl node"

parents 3470828f f256922e

qcom/lahaina-pinctrl.dtsi

+1471 −1482
Original line number Diff line number Diff line 
&soc {

	tlmm: pinctrl@f000000 {

		compatible = "qcom,lahaina-pinctrl";

		reg = <0x0F000000 0x1000000>;

		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		wakeup-parent = <&pdc>;



&tlmm {

	bt_en_sleep: bt_en_sleep {

		mux {

			pins = "gpio65";
@@ -262,6 +252,15 @@ 
				bias-pull-up;

			};

		};



		usb2_id_det_default: usb2_id_det_default {

			config {

				pins = "gpio51";

				function = "gpio";

				input-enable;

				bias-pull-up;

			};

		};

	};



	/* I3C */
@@ -1658,15 +1657,6 @@ 
		};

	};



		usb2_id_det_default: usb2_id_det_default {

			config {

				pins = "gpio51";

				function = "gpio";

				input-enable;

				bias-pull-up;

			};

		};

	};

	pmx_sde: pmx_sde {

		sde_dsi_active: sde_dsi_active {

			mux {
@@ -2207,5 +2197,4 @@ 
			};

		};

	};



};

qcom/lahaina.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -668,6 +668,17 @@ 
		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	tlmm: pinctrl@f000000 {

		compatible = "qcom,lahaina-pinctrl";

		reg = <0x0F000000 0x1000000>;

		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		wakeup-parent = <&pdc>;

	};



	ipcc_mproc: qcom,ipcc@408000 {

		compatible = "qcom,ipcc";

		reg = <0x408000 0x1000>;