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

Commit 1c47a75b authored by Abhimanyu Kapur's avatar Abhimanyu Kapur
Browse files

mdm9640: Delete all pinctrl client references 



Delete pinmux client references until they move over to the
new pinctrl bindings. This is required since msm-3.18 pinctrl
driver is based on upstream pinctrl framework which is different
from the internal frameowrk on msm-3.10

As an example the uart bindings are ported over.

Change-Id: I85f2175fef4ee2fbdafa455284cec18784d98b78
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent d81ff97a

arch/arm/boot/dts/qcom/mdm9640-bus.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
			clocks = <&clock_gcc  clk_bimc_msmbus_clk>,

				<&clock_gcc  clk_bimc_msmbus_a_clk>;



			coresight-id = <55>;

			coresight-name = "coresight-bimc";

			coresight-nr-inports = <0>;

			coresight-outports = <0>;

			coresight-child-list = <&funnel_in0>;

			coresight-child-ports = <3>;

		};



		fab_pcnoc: fab-pcnoc {
@@ -65,12 +59,6 @@ 
			clocks = <&clock_gcc  clk_snoc_msmbus_clk>,

				<&clock_gcc  clk_snoc_msmbus_a_clk>;



			coresight-id = <50>;

			coresight-name = "coresight-snoc";

			coresight-nr-inports = <0>;

			coresight-outports = <0>;

			coresight-child-list = <&funnel_in0>;

			coresight-child-ports = <5>;

		};



		/*Masters*/

arch/arm/boot/dts/qcom/mdm9640-cdp.dtsi

+2 −72
Original line number Diff line number Diff line
@@ -23,35 +23,9 @@ 


&blsp1_uart2 {

	status = "ok";

};



&spi_1 {

	status = "ok";

	ethernet-switch@0 {

		compatible = "micrel,ks8851";

		interrupt-parent = <&msm_gpio>;

		reg = <0>;

		spi-max-frequency = <2400000>;

		interrupts = <88 0>;

		vdd-io-supply = <&spi_eth_vreg>;

		vdd-phy-supply = <&spi_eth_vreg>;

		rst-gpio = <&msm_gpio 89 0>;

	};

};

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_console_active>;



&i2c_3 {

	smb1357_otg_supply: smb1357-charger@1c {

		compatible = "qcom,smb1357-charger";

		reg = <0x1c>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <83 0>;	/* MDM GPIO 83 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

		qcom,iterm-ma = <100>;

		regulator-name = "smb1357_otg_supply";

		qcom,charging-disabled;

	};

};



&pmd9635_gpios {
@@ -247,47 +221,3 @@ 
		qcom,thermal-node;

	};

};
 


/* CoreSight */

&tpiu {

	pinctrl-names = "seta-pctrl", "setb-pctrl", "sdcard", "trace",

			"swduart", "swdtrc", "jtag", "spmi";

	/* Mictor */

	pinctrl-0 = <&seta_1 &seta_2 &seta_3 &seta_4 &seta_5 &seta_6 &seta_7

		     &seta_8 &seta_9 &seta_10 &seta_11 &seta_12 &seta_13

		     &seta_14 &seta_15 &seta_16 &seta_17 &seta_18>;

	pinctrl-1 = <&setb_1 &setb_2 &setb_3 &setb_4 &setb_5 &setb_6 &setb_7

		     &setb_8 &setb_9 &setb_10 &setb_11 &setb_12 &setb_13

		     &setb_14 &setb_15 &setb_16 &setb_17 &setb_18>;

	/* NIDnT */

	pinctrl-2 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard

		    &qdsd_data0_sdcard &qdsd_data1_sdcard

		    &qdsd_data2_sdcard &qdsd_data3_sdcard>;

	pinctrl-3 = <&qdsd_clk_trace &qdsd_cmd_trace

		    &qdsd_data0_trace &qdsd_data1_trace

		    &qdsd_data2_trace &qdsd_data3_trace>;

	pinctrl-4 = <&qdsd_cmd_swduart &qdsd_data0_swduart

		    &qdsd_data1_swduart &qdsd_data2_swduart

		    &qdsd_data3_swduart>;

	pinctrl-5 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc

		    &qdsd_data0_swdtrc &qdsd_data1_swdtrc

		    &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;

	pinctrl-6 = <&qdsd_cmd_jtag &qdsd_data0_jtag

		    &qdsd_data1_jtag &qdsd_data2_jtag

		    &qdsd_data3_jtag>;

	pinctrl-7 = <&qdsd_clk_spmi &qdsd_cmd_spmi

		    &qdsd_data0_spmi &qdsd_data3_spmi>;

};



/* Display */

&mdss_qpic {

        pinctrl-names= "mdss_default", "mdss_sleep";

        pinctrl-0 = <&mdss_cs_active &mdss_te_active &mdss_rs_active

                        &mdss_ad_active &mdss_bl_active>;

        pinctrl-1 = <&mdss_cs_suspend &mdss_te_suspend

                &mdss_rs_suspend &mdss_ad_suspend &mdss_bl_suspend>;

};



&usb3 {

	vbus_dwc3-supply = <&smb1357_otg_supply>;

};

arch/arm/boot/dts/qcom/mdm9640-emmc-cdp.dts

+1 −24
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -30,26 +30,3 @@ 
&usb3 {

	qcom,skip-charger-detection;

};
 


&sdhc_1 {

	vdd-supply = <&sd_slot_vreg>;

	qcom,vdd-always-on;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <9000 800000>;



	vdd-io-supply = <&pmd9635_l6>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <200 60000>;



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

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

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

	qcom,nonremovable;



	status = "ok";

};

arch/arm/boot/dts/qcom/mdm9640-mtp.dtsi

+2 −52
Original line number Diff line number Diff line
@@ -27,36 +27,9 @@ 


&blsp1_uart2 {

	status = "ok";

};



&spi_1 {

	status = "ok";

	ethernet-switch@0 {

		compatible = "micrel,ks8851";

		interrupt-parent = <&msm_gpio>;

		reg = <0>;

		spi-max-frequency = <2400000>;

		interrupts = <21 0>;

		vdd-io-supply = <&spi_eth_vreg>;

		vdd-phy-supply = <&spi_eth_vreg>;

		rst-gpio = <&msm_gpio 20 0>;

	};

};



&i2c_3 {

	smb1357_otg_supply: smb1357-charger@1c {

		compatible = "qcom,smb1357-charger";

		reg = <0x1c>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <83 0>;	/* MDM GPIO 83 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

		qcom,iterm-ma = <100>;

		regulator-name = "smb1357_otg_supply";

	pinctrl-names = "default";

		pinctrl-0 = <&smb_stat_active>;

	};

	pinctrl-0 = <&uart2_console_active>;



};



&pmd9635_gpios {
@@ -256,26 +229,3 @@ 
&qnand_1 {

	status = "ok";

};
 


&sdhc_1 {

	vdd-supply = <&sd_slot_vreg>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <9000 800000>;



	vdd-io-supply = <&pmd9635_l14>;

	qcom,vdd-io-voltage-level = <1800000 2850000>;

	qcom,vdd-io-current-level = <200 60000>;



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;



	status = "ok";

};



&usb3 {

	vbus_dwc3-supply = <&smb1357_otg_supply>;

};

arch/arm/boot/dts/qcom/mdm9640-nand-cdp.dts

+1 −20
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -31,22 +31,3 @@ 
&qnand_1 {

	status = "ok";

};
 


&sdhc_1 {

	vdd-supply = <&sd_slot_vreg>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <9000 800000>;



	vdd-io-supply = <&pmd9635_l14>;

	qcom,vdd-io-voltage-level = <1800000 2850000>;

	qcom,vdd-io-current-level = <200 60000>;



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;



	status = "ok";

};