Merge "ARM: dts: msm: Add pinctrl device support for msmferrum"

/* 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-ferrum", "qcom,msm-tlmm-8916";

		reg = <0x1000000 0x300000>;

		interrupts = <0 208 0>;

		/*General purpose pins*/

		gp: gp {

			qcom,num-pins = <113>;

			#qcom,pin-cells = <1>;

			msm_gpio: msm_gpio {

				compatible = "qcom,msm-tlmm-gp";

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				num_irqs = <113>;

			};

		};

	};

};

/dts-v1/;

#include "msmferrum.dtsi"

#include "msmferrum-pinctrl.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. MSMFERRUM RUMI";

/dts-v1/;

#include "msmferrum.dtsi"

#include "msmferrum-pinctrl.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. MSMFERRUM Simulator";