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

Commit 7b530317 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: PPS enablement for 9x40"

parents e191daa2 724be482
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-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
@@ -44,5 +44,15 @@
			};
		};

		pinctrl_pps: ppsgrp {
			mux {
				pins = "gpio38";
				function = "nav_dr";
			};
			config {
				pins = "gpio38";
				bias-pull-down;
			};
		};
	};
};
+8 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,14 @@
		memory-region = <&peripheral1_mem>;
	};

	pps{
		compatible = "pps-gpio";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_pps>;
		gpios = <&tlmm_pinmux 38 0>;
		status = "okay";
	};

};

&gdsc_usb30 {