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

Commit c3d6f24e authored by Rohit Vaswani's avatar Rohit Vaswani
Browse files

ARM: dts: msm8994: Remove support for Interposer 



MSM8994 with MSM8974 Interposer is now obsolete.
Remove it.

Change-Id: Ide91c113702b0f05f1512c4597725ea33ed62287
Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
parent 799792ac

arch/arm/boot/dts/qcom/Makefile

+1 −3
Original line number Original line Diff line number Diff line
@@ -27,9 +27,7 @@ dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-cdp.dtb \ 
	msm8974pro-ac-pm8941-cdp.dtb \

	msm8974pro-ac-pm8941-cdp.dtb \

	msm8974pro-ac-pm8941-liquid.dtb \

	msm8974pro-ac-pm8941-liquid.dtb \

	msm8974pro-ac-pm8941-mtp.dtb \

	msm8974pro-ac-pm8941-mtp.dtb \

	msm8974pro-ac-pma8084-pm8941-mtp.dtb \

	msm8974pro-ac-pma8084-pm8941-mtp.dtb

	msm8994-cdp-interposer.dtb \

	msm8994-mtp-interposer.dtb

dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \

dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \

	msm8916-rumi.dtb \

	msm8916-rumi.dtb \

	msm8916-cdp.dtb \

	msm8916-cdp.dtb \

arch/arm/boot/dts/qcom/msm8994-cdp-interposer.dts

deleted100644 → 0
+0 −91
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013-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 "msm8974pro-pm8994.dtsi"

&soc {

	/*

	 * This workaround is needed as 8974 config fails to build

	 * due to the missing blsp2_uart2 label refernce with interposer.

	 * The dummy node needs to be defined before the msm8994-mtp.dtsi

	 * is included as that file has a reference to the blsp2_uart2 label

	 */

	blsp2_uart2: uart@f995e000 {

	};

};

#include "msm8994-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8974Pro-AC MSM8994 Interposer CDP";

	compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,cdp";

	qcom,board-id = <1 3>;



	aliases {

		serial0 = &blsp1_uart1;

	};

};



&blsp1_uart1 {

	status = "ok";

};



&usb_otg {

	qcom,dp-manual-pullup;

	qcom,hsusb-otg-otg-control = <2>;

	status = "ok";

};



&usb3 {

	status = "disabled";

};



&hsphy {

	status = "disabled";

};



&ssphy {

	status = "disabled";

};



&sdhc_1 {

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

			interrupt-parent = <&msmgpio>;

			synaptics,reset-gpio = <&msmgpio 60 0x00>;

			synaptics,irq-gpio = <&msmgpio 61 0x2008>;

		};

	};

};



&cci {

	qcom,camera@0 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};



	qcom,camera@1 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};



	qcom,camera@2 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};

};

arch/arm/boot/dts/qcom/msm8994-mtp-interposer.dts

deleted100644 → 0
+0 −99
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2013-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 "msm8974pro-pm8994.dtsi"

&soc {

	/*

	 * This workaround is needed as 8974 config fails to build

	 * due to the missing blsp2_uart2 label refernce with interposer.

	 * The dummy node needs to be defined before the msm8994-mtp.dtsi

	 * is included as that file has a reference to the blsp2_uart2 label

	 */

	blsp2_uart2: uart@f995e000 {

	};

};

#include "msm8994-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8974Pro-AC MSM8994 Interposer MTP";

	compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,mtp";

	qcom,board-id = <8 3>;



	aliases {

		serial0 = &blsp1_uart1;

	};



	qcom,mss@fc880000 {

		status = "disabled";

	};



	qcom,pronto@fb21b000 {

		status = "disabled";

	};

};



&blsp1_uart1 {

	status = "ok";

};



&usb_otg {

	qcom,dp-manual-pullup;

	qcom,hsusb-otg-otg-control = <2>;

	status = "ok";

};



&usb3 {

	status = "disabled";

};



&hsphy {

	status = "disabled";

};



&ssphy {

	status = "disabled";

};



&sdhc_1 {

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

			interrupt-parent = <&msmgpio>;

			synaptics,reset-gpio = <&msmgpio 60 0x00>;

			synaptics,irq-gpio = <&msmgpio 61 0x2008>;

		};

	};

};



&cci {

	qcom,camera@0 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};



	qcom,camera@1 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};



	qcom,camera@2 {

		/delete-property/ pinctrl-0;

		/delete-property/ pinctrl-1;

	};

};
 
 No newline at end of file