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

Commit 78a74bfb 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 new device tree file for MDM9x50 TTP"

parents c80d883e 9a292419

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

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ compatible = "qcom,mdm9650-rumi" 
compatible = "qcom,mdm9650-sim"

compatible = "qcom,mdm9650-cdp"

compatible = "qcom,mdm9650-mtp"

compatible = "qcom,mdm9650-ttp"

compatible = "qcom,sdx20-mtp"

compatible = "qcom,sdx20-cdp"

compatible = "qcom,apq8009-cdp"

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-sim.dtb \ 
	mdm9650-nand-cdp.dtb \

	mdm9650-emmc-mtp.dtb \

	mdm9650-nand-mtp.dtb \

	mdm9650-ttp.dtb \

	mdm9650-nand-dualwifi-mtp.dtb \

	mdm9650-v1.1-emmc-cdp.dtb \

	mdm9650-v1.1-nand-cdp.dtb \

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

+29 −0
Original line number Diff line number Diff line
@@ -1057,5 +1057,34 @@ 
			};

		};



		can_reset {

			can_rst_on: rst_on {

				mux {

					pins = "gpio68";

					function = "gpio";

				};





				config {

					pins = "gpio68";

					drive-strength = <2>; /* 2 mA */

					bias-pull-up;

				};

			};



			can_rst_off: rst_off {

				mux {

					pins = "gpio68";

					function = "gpio";

				};



				config {

					pins = "gpio68";

					drive-strength = <2>; /* 2 mA */

					bias-pull-up;

					output-high;

				};

			};

		};

	};

};

arch/arm/boot/dts/qcom/mdm9650-ttp.dts

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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 "mdm9650-mtp.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. MDM 9650 TTP";

	compatible = "qcom,mdm9650-ttp", "qcom,mdm9650", "qcom,ttp";

	qcom,board-id = <0x1e 0>;

};



&i2c_3 {

	status = "ok";

	smb1351_otg_supply: smb1351-charger@55{

		status = "disabled";

	};

};



&soc {

	usb_detect {

		compatible = "qcom,gpio-usbdetect";

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0x0d 0x0>; /* PMD9655 VBUS DETECT */

		interrupt-names = "vbus_det_irq";

	};

};



&usb3 {

	cpe-gpio = <&tlmm_pinmux 87 0>;

};



&spi_2 {

	status = "ok";



	can-controller@0 {

		compatible = "fsl,k61";

		spi-max-frequency = <4800000>;

		reg = <0>;

		interrupt-parent = <&tlmm_pinmux>;

		interrupts = <84 0>;

		reset-gpio = <&tlmm_pinmux 68 0x1>;

		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&can_rst_on>;

		pinctrl-1 = <&can_rst_off>;

	};

};



&blsp1_uart2_hs {

	status = "disabled";

};