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

Commit fc5dd615 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 the initial device tree for msmterbium"

parents 0342edb4 0e8879e0

Documentation/devicetree/bindings/arm/msm/msm.txt

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ compatible = "qcom,msm8994-rumi" 
compatible = "qcom,msm8994-sim"

compatible = "qcom,msmtellurium-rumi"

compatible = "qcom,msmtellurium-sim"

compatible = "qcom,msmterbium-rumi"

compatible = "qcom,msmterbium-sim"

compatible = "qcom,msmterbium-cdp"

compatible = "qcom,msmterbium-mtp"

compatible = "qcom,msmzirc-cdp"

compatible = "qcom,msmzirc-mtp"

compatible = "qcom,msmzirc-rumi"

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \ 
	msm8936-mtp-smb1360.dtb \

	msm8936-mtp-wcd9306.dtb \

	msmtellurium-sim.dtb \

	msmtellurium-rumi.dtb

	msmtellurium-rumi.dtb \

	msmterbium-sim.dtb \

	msmterbium-rumi.dtb

dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \

	msm8226-fluid.dtb \

	msm8226-v1-cdp.dtb \

arch/arm/boot/dts/qcom/msmterbium-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-8916";

		reg = <0x1000000 0x300000>;

		interrupts = <0 208 0>;



		/*General purpose pins*/

		gp: gp {

			qcom,num-pins = <122>;

			#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 = <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 = <2>;

				bias-pull-down;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msmterbium-rumi.dts

0 → 100644
+34 −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.

 */



/dts-v1/;



#include "msmterbium.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM Terbium RUMI";

	compatible = "qcom,msmterbium-rumi", "qcom,msmterbium", "qcom,rumi";

	qcom,board-id= <15 0>;

};



&soc {

	timer {

		clock-frequency = <5000000>;

	};

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};

arch/arm/boot/dts/qcom/msmterbium-sim.dts

0 → 100644
+30 −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.

 */



/dts-v1/;



/memreserve/ 0x86000000 0x00000200;



#include "msmterbium.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM Terbium Simulator";

	compatible = "qcom,msmterbium-sim", "qcom,msmterbium", "qcom,sim";

	qcom,board-id= <16 0>;

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};