Merge "ARM: dts: msm: Add pinctrl device support for MSM8939" (1795a18e) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		&soc {
		tlmm_pinmux: pinctrl@1000000 {
		compatible = "qcom,msm-tlmm-v4";
		reg = <0x1000000 0x300000>;
		interrupts = <0 208 0>;

		/General purpose pins/
		gp: gp {
		qcom,pin-type-gp;
		qcom,num-pins = <122>;
		#qcom,pin-cells = <1>;
		msm_gpio: msm_gpio {
		compatible = "qcom,msm-tlmmv4-gp-intc";
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		#interrupt-cells = <2>;
		num_irqs = <122>;
		};
		};

		pmx-uartconsole {
		qcom,pins = <&gp 4>, <&gp 5>;
		qcom,num-grp-pins = <2>;
		qcom,pin-func = <2>;
		label = "uart-console";
		uart_console_sleep: uart-console {
		drive-strength = <16>;
		bias-disable;
		};
		};
		};
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		/dts-v1/;

		#include "msm8939.dtsi"
		#include "msm8939-pinctrl.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8939 RUMI";
		@@ -32,4 +33,6 @@

		&blsp1_uart2 {
		status = "ok";
		pinctrl-names = "default";
		pinctrl-0 = <&uart_console_sleep>;
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		/dts-v1/;

		#include "msm8939.dtsi"
		#include "msm8939-pinctrl.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8939 Simulator";
		@@ -27,4 +28,6 @@

		&blsp1_uart2 {
		status = "ok";
		pinctrl-names = "default";
		pinctrl-0 = <&uart_console_sleep>;
		};