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

Commit 5843400c 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 pinctrl for PCIe endpoint mode on mdmcalifornium"

parents 9d02d829 3cf0b9ea
Loading
Loading
Loading
Loading
+25 −1
Original line number Diff line number Diff line
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2016, 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
@@ -349,6 +349,30 @@
					bias-pull-down;
				};
			};

			pcie_ep_perst_default: pcie_ep_perst_default {
				mux {
					pins = "gpio65";
					function = "gpio";
				};
				config {
					pins = "gpio65";
					drive-strength = <2>;
					bias-pull-down;
				};
			};

			pcie_ep_wake_default: pcie_ep_wake_default {
				mux {
					pins = "gpio61";
					function = "gpio";
				};
				config {
					pins = "gpio61";
					drive-strength = <2>;
					bias-pull-down;
				};
			};
		};

		/* UART HS CONFIGURATION */
+2 −2
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@
		interrupt-names = "int_global";

		pinctrl-names = "default";
		pinctrl-0 = <&pcie0_clkreq_default &pcie0_perst_default
			&pcie0_wake_default &pcie0_mdm2apstatus_default>;
		pinctrl-0 = <&pcie0_clkreq_default &pcie_ep_perst_default
			&pcie_ep_wake_default &pcie0_mdm2apstatus_default>;

		perst-gpio = <&tlmm_pinmux 65 0>;
		wake-gpio = <&tlmm_pinmux 61 0>;