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

Commit 30c1bd45 authored by Xu Han's avatar Xu Han
Browse files

Revert "ARM: dts: msm: Camera bring up for MSMSAMARIUM" 



This reverts commit d1ab8bd0.
This commit was rebased/merged incorrect regarding the property
board-id. Reverted.

Change-Id: I9fc6771e66375276d0582b012b3e26cf52464335
Signed-off-by: default avatarXu Han <hanxu@codeaurora.org>
parent dc077d46

arch/arm/boot/dts/msmsamarium-camera-sensor-cdp-interposer.dtsi

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, 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.

 */



&cci {

	actuator0: qcom,actuator@18 {

		cell-index = <0>;

		reg = <0x18>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	actuator1: qcom,actuator@36 {

		cell-index = <1>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



    qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,vdd-cx-supply = <&pma8084_s2>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pma8084_l27>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vaf-supply = <&pma8084_l23>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

				     "cam_vaf";

		qcom,cam-vreg-type = <0 1 0 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2850000 2850000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2850000 2850000>;

		qcom,cam-vreg-op-mode = <135000 0 44000 124000>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 15 0>,

			<&msmgpio 81 0>,

			<&msmgpio 80 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



   qcom,camera@6d {

               compatible = "qcom,imx132";

               reg = <0x6d>;

               qcom,slave-id = <0x6c 0x0 0x0132>;

               qcom,csiphy-sd-index = <1>;

               qcom,csid-sd-index = <1>;

               qcom,mount-angle = <270>;

               qcom,sensor-name = "imx132";

               qcom,vdd-cx-supply = <&pma8084_s2>;

               qcom,vdd-cx-name = "qcom,vdd-cx";

               cam_vdig-supply = <&pma8084_l3>;

               cam_vana-supply = <&pma8084_l17>;

               cam_vio-supply = <&pma8084_lvs4>;

               qcom,cam-vreg-name =  "cam_vana", "cam_vdig", "cam_vio";

               qcom,cam-vreg-type = <0 0 1>;

               qcom,cam-vreg-min-voltage = <2850000 1200000 0>;

               qcom,cam-vreg-max-voltage = <2850000 1200000 0>;

               qcom,cam-vreg-op-mode = <44000 98000 0>;

               qcom,gpio-no-mux = <0>;

               gpios = <&msmgpio 16 0>,

                       <&msmgpio 18 0>;

               qcom,gpio-reset = <1>;

               qcom,gpio-req-tbl-num = <0 1>;

               qcom,gpio-req-tbl-flags = <1 0>;

               qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

                                         "CAM_XSHUTDOWN";

               qcom,gpio-set-tbl-num = <1 1>;

               qcom,gpio-set-tbl-flags = <0 2>;

               qcom,gpio-set-tbl-delay = <1000 4000>;

               qcom,csi-lane-assign = <0x4320>;

               qcom,csi-lane-mask = <0x7>;

               qcom,sensor-position = <1>;

               qcom,sensor-mode = <1>;

               qcom,cci-master = <0>;

      };



};

arch/arm/boot/dts/msmsamarium-camera-sensor-cdp.dtsi

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, 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.

 */



&cci {



	actuator0: qcom,actuator@18 {

		cell-index = <0>;

		reg = <0x18>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	actuator1: qcom,actuator@36 {

		cell-index = <1>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



    qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,vdd-cx-supply = <&pma8084_s2>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pma8084_l27>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vaf-supply = <&pma8084_l23>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

				     "cam_vaf";

		qcom,cam-vreg-type = <0 1 0 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2850000 2850000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2850000 2850000>;

		qcom,cam-vreg-op-mode = <135000 0 44000 124000>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 15 0>,

			<&msmgpio 30 0>,

			<&msmgpio 29 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



   qcom,camera@6d {

               compatible = "qcom,imx132";

               reg = <0x6d>;

               qcom,slave-id = <0x6c 0x0 0x0132>;

               qcom,csiphy-sd-index = <1>;

               qcom,csid-sd-index = <1>;

               qcom,mount-angle = <270>;

               qcom,sensor-name = "imx132";

               qcom,vdd-cx-supply = <&pma8084_s2>;

               qcom,vdd-cx-name = "qcom,vdd-cx";

               cam_vdig-supply = <&pma8084_l3>;

               cam_vana-supply = <&pma8084_l17>;

               cam_vio-supply = <&pma8084_lvs4>;

               qcom,cam-vreg-name =  "cam_vana", "cam_vdig", "cam_vio";

               qcom,cam-vreg-type = <0 0 1>;

               qcom,cam-vreg-min-voltage = <2850000 1200000 0>;

               qcom,cam-vreg-max-voltage = <2850000 1200000 0>;

               qcom,cam-vreg-op-mode = <44000 98000 0>;

               qcom,gpio-no-mux = <0>;

               gpios = <&msmgpio 16 0>,

                       <&msmgpio 18 0>;

               qcom,gpio-reset = <1>;

               qcom,gpio-req-tbl-num = <0 1>;

               qcom,gpio-req-tbl-flags = <1 0>;

               qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

                                         "CAM_XSHUTDOWN";

               qcom,gpio-set-tbl-num = <1 1>;

               qcom,gpio-set-tbl-flags = <0 2>;

               qcom,gpio-set-tbl-delay = <1000 4000>;

               qcom,csi-lane-assign = <0x4320>;

               qcom,csi-lane-mask = <0x7>;

               qcom,sensor-position = <1>;

               qcom,sensor-mode = <1>;

               qcom,cci-master = <0>;

      };

};

arch/arm/boot/dts/msmsamarium-camera.dtsi

deleted100644 → 0
+0 −231
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, 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 {

	qcom,msm-cam@fd8C0000 {

		compatible = "qcom,msm-cam";

		reg = <0xfd8C0000 0x10000>;

		reg-names = "msm-cam";

	};



	qcom,csiphy@fda0ac00 {

		cell-index = <0>;

		compatible = "qcom,csiphy";

		reg = <0xfda0ac00 0x200>,

                      <0xfda00030 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 78 0>;

		interrupt-names = "csiphy";

	};



	qcom,csiphy@fda0b000 {

		cell-index = <1>;

		compatible = "qcom,csiphy";

		reg = <0xfda0b000 0x200>,

                      <0xfda00038 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 79 0>;

		interrupt-names = "csiphy";

	};



	qcom,csiphy@fda0b400 {

		cell-index = <2>;

		compatible = "qcom,csiphy";

		reg = <0xfda0b400 0x200>,

                      <0xfda00040 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 80 0>;

		interrupt-names = "csiphy";

	};



	qcom,csid@fda08000  {

		cell-index = <0>;

		compatible = "qcom,csid";

		reg = <0xfda08000 0x100>;

		reg-names = "csid";

		interrupts = <0 51 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1175000>;

		qcom,mipi-csi-vdd-supply = <&pma8084_l2>;

	};



	qcom,csid@fda08400 {

		cell-index = <1>;

		compatible = "qcom,csid";

		reg = <0xfda08400 0x100>;

		reg-names = "csid";

		interrupts = <0 52 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1175000>;

		qcom,mipi-csi-vdd-supply = <&pma8084_l2>;

	};



	qcom,csid@fda08800 {

		cell-index = <2>;

		compatible = "qcom,csid";

		reg = <0xfda08800 0x100>;

		reg-names = "csid";

		interrupts = <0 53 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1175000>;

		qcom,mipi-csi-vdd-supply = <&pma8084_l2>;

	};



	qcom,csid@fda08C00 {

		cell-index = <3>;

		compatible = "qcom,csid";

		reg = <0xfda08C00 0x100>;

		reg-names = "csid";

		interrupts = <0 54 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1175000>;

		qcom,mipi-csi-vdd-supply = <&pma8084_l2>;

	};



	qcom,ispif@fda0A000 {

		cell-index = <0>;

		compatible = "qcom,ispif-v3.0", "qcom,ispif";

		reg = <0xfda0A000 0x500>,

                      <0xfda00020 0x10>;

		reg-names = "ispif", "csi_clk_mux";

		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,num-isps = <0x2>;

	};



	qcom,vfe@fda10000 {

		cell-index = <0>;

		compatible = "qcom,vfe40";

		reg = <0xfda10000 0x1000>,

			<0xfda40000 0x200>;

		reg-names = "vfe", "vfe_vbif";

		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

	};



	qcom,vfe@fda14000 {

		cell-index = <1>;

		compatible = "qcom,vfe40";

		reg = <0xfda14000 0x1000>,

			<0xfda40000 0x200>;

		reg-names = "vfe", "vfe_vbif";

		interrupts = <0 58 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

	};



	qcom,jpeg@fda1c000 {

		cell-index = <0>;

		compatible = "qcom,jpeg";

		reg = <0xfda1c000 0x400>;

		reg-names = "jpeg";

		interrupts = <0 59 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

	};



	qcom,jpeg@fda20000 {

		cell-index = <1>;

		compatible = "qcom,jpeg";

		reg = <0xfda20000 0x400>;

		reg-names = "jpeg";

		interrupts = <0 60 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

	};



	qcom,jpeg@fda24000 {

		cell-index = <2>;

		compatible = "qcom,jpeg";

		reg = <0xfda24000 0x400>;

		reg-names = "jpeg";

		interrupts = <0 61 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

	};



	qcom,irqrouter@fda00000 {

		cell-index = <0>;

		compatible = "qcom,irqrouter";

		reg = <0xfda00000 0x100>;

		reg-names = "irqrouter";

	};



	qcom,cpp@fda04000 {

		cell-index = <0>;

		compatible = "qcom,cpp";

		reg = <0xfda04000 0x100>,

			<0xfda40000 0x200>,

			<0xfda18000 0x008>;

		reg-names = "cpp", "cpp_vbif", "cpp_hw";

		interrupts = <0 49 0>;

		interrupt-names = "cpp";

		vdd-supply = <&gdsc_vfe>;

	};



	cci: qcom,cci@fda0C000 {

		cell-index = <0>;

		compatible = "qcom,cci";

		reg = <0xfda0C000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "cci";

		interrupts = <0 50 0>;

		interrupt-names = "cci";

		gpios = <&msmgpio 19 0>,

			<&msmgpio 20 0>,

			<&msmgpio 21 0>,

			<&msmgpio 22 0>;

		qcom,gpio-tbl-num = <0 1 2 3>;

		qcom,gpio-tbl-flags = <1 1 1 1>;

		qcom,gpio-tbl-label = "CCI_I2C_DATA0",

				      "CCI_I2C_CLK0",

				      "CCI_I2C_DATA1",

				      "CCI_I2C_CLK1";

		master0: qcom,cci-master0 {

			status = "disabled";

		};

		master1: qcom,cci-master1 {

			status = "disabled";

		};

	};

};



&master0 {

	qcom,hw-thigh = <78>;

	qcom,hw-tlow = <114>;

	qcom,hw-tsu-sto = <28>;

	qcom,hw-tsu-sta = <28>;

	qcom,hw-thd-dat = <10>;

	qcom,hw-thd-sta = <77>;

	qcom,hw-tbuf = <118>;

	qcom,hw-scl-stretch-en = <0>;

	qcom,hw-trdhld = <6>;

	qcom,hw-tsp = <1>;

	status = "ok";

};



&master1 {

	qcom,hw-thigh = <78>;

	qcom,hw-tlow = <114>;

	qcom,hw-tsu-sto = <28>;

	qcom,hw-tsu-sta = <28>;

	qcom,hw-thd-dat = <10>;

	qcom,hw-thd-sta = <77>;

	qcom,hw-tbuf = <118>;

	qcom,hw-scl-stretch-en = <0>;

	qcom,hw-trdhld = <6>;

	qcom,hw-tsp = <1>;

	status = "ok";

};

arch/arm/boot/dts/msmsamarium-cdp-interposer.dts

+17 −67
Original line number Diff line number Diff line
@@ -14,16 +14,12 @@ 


/include/ "msm8974pro-ac.dtsi"

/include/ "msmsamarium-cdp.dtsi"

/include/ "dsi-panel-jdi-1080p-video.dtsi"

/include/ "msmsamarium-camera-sensor-cdp-interposer.dtsi"





/ {

        model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP";

        model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP / MTP";

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

        qcom,msm-id = <194 1 8>;

};



&usb3 {

      status = "disabled";

        qcom,board-id = <1 8>, <8 8>;

};



&pma8084_l3 {
@@ -44,6 +40,17 @@ 
	qcom,init-voltage = <1050000>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_jdi_1080_vid>;

};



&dsi_jdi_1080_vid {

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-bank-select = <3>;

	qcom,mdss-dsi-pwm-gpio = <&pma8084_gpios 8 0>;

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -85,70 +92,13 @@ 


	status = "ok";

};

&i2c_0 {

	smb349-charger@1b {

		compatible = "summit,smb349-charger";

		reg = <0x1b>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xCC 0x0>;	/* PMA8084 GPIO 13 */

		summit,charging-disabled;

		summit,disable-apsd;

	};

};



&pma8084_gpios {

	gpio@cc00 { /* GPIO 13 */

		/* SMB349 STAT */

		qcom,mode = <0>;		/* Digital input */

		qcom,pull = <1>;		/* Pull up 1.5 uA */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;

	};

};



&soc {

	qcom,mdss_dsi_jdi_1080p_video {

		/*qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

		qcom,mdss-dsi-bl-pmic-bank-select = <3>;*/

		qcom,mdss-dsi-pwm-gpio = <&pma8084_gpios 8 0>;

	};



	mdss_dsi1: qcom,mdss_dsi@fd922e00 {

		status = "disabled";

	};



	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {

		status = "disabled";

	};



	mdss_edp: qcom,mdss_edp@fd923400 {

&usb3 {

	status = "disabled";

};



	sound{

		compatible = "qcom,msm8974-audio-tapan";

		qcom,model = "msm8974-tapan-cdp-snd-card";

	};

};



&usb_otg {

	status = "ok";

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

	qcom,dp-manual-pullup;

};
 


&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_jdi_1080_vid>;

};



&dsi_jdi_1080_vid {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-bank-select = <3>;

	qcom,mdss-dsi-pwm-gpio = <&pma8084_gpios 8 0>;

};

arch/arm/boot/dts/msmsamarium-cdp.dts

+2 −3
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ 


/include/ "msmsamarium.dtsi"

/include/ "msmsamarium-cdp.dtsi"

/include/ "msmsamarium-camera.dtsi"

/include/ "msmsamarium-camera-sensor-cdp.dtsi"



/ {

	model = "Qualcomm MSM SAMARIUM CDP";

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

	qcom,msm-id = <195 1 0>;

	qcom,board-id = <1 0>;

};



&sdhc_1 {