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

Commit 7978794f authored by Vivek Veenam's avatar Vivek Veenam
Browse files

mm-camera: Remove qcom,clocks from all device dtsi 



We're moving from qcom,clock-names because clock-names has been
accepted in upstream as property name, so we need to migrate our
usage to use this name.

CRs-Fixed: 631800
Change-Id: Id40407b04fc6b77100327f2817aa13b5dffc065f
Signed-off-by: default avatarVivek Veenam <vveenam@codeaurora.org>
parent 04f8a4e5

Documentation/devicetree/bindings/media/video/msm-cci.txt

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ Example: 
       reg-names = "cci";

       interrupts = <0 50 0>;

       interrupt-names = "cci";

	qcom,clock-names = "camss_top_ahb_clk", "vfe_clk_src",

	clock-names = "camss_top_ahb_clk", "vfe_clk_src",

			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",

			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk";

	qcom,clock-rates = <0 266670000 0 0 266670000 0 0 0>;

Documentation/devicetree/bindings/media/video/msm-cpp.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Example: 
       interrupts = <0 49 0>;

       interrupt-names = "cpp";

       vdd-supply = <&gdsc_vfe>;

	qcom,clock-names = "camss_top_ahb_clk", "vfe_clk_src",

	clock-names = "camss_top_ahb_clk", "vfe_clk_src",

			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",

			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk";

	qcom,clock-rates = <0 266670000 0 0 266670000 0 0 0>;

Documentation/devicetree/bindings/media/video/msm-csi-phy.txt

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
- interrupts : should contain the csiphy interrupt.

- interrupt-names : should specify relevant names to each interrupts

  property defined.

- qcom,clock-names: name of the clocks required for the device

- clock-names: name of the clocks required for the device

- qcom,clock-rates: clock rate in Hz

	- 0 if appropriate clock is required but doesn't have to apply the rate
@@ -28,7 +28,7 @@ Example: 
       reg-names = "csiphy";

       interrupts = <0 78 0>;

       interrupt-names = "csiphy";

       qcom,clock-names = "camss_top_ahb_clk",

       clock-names = "camss_top_ahb_clk",

                "ispif_ahb_clk", "csiphy_timer_src_clk",

                "csiphy_timer_clk";

       qcom,clock-rates = <0 0 200000000 0>;

Documentation/devicetree/bindings/media/video/msm-csid.txt

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Required properties: 
    for mipi csi in uV.

- qcom,mipi-csi-vdd-supply : should contain regulator to be used for

    this csid core

- qcom,clock-names: name of the clocks required for the device

- clock-names: name of the clocks required for the device

- qcom,clock-rates: clock rate in Hz

	- 0 if appropriate clock is required but doesn't have to apply the rate
@@ -35,7 +35,7 @@ Example: 
       interrupt-names = "csiphy";

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

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

       qcom,clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",

       clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",

                "csi_ahb_clk", "csi_src_clk", "csi_clk",

                "csi_phy_clk", "csi_pix_clk", "csi_rdi_clk";

       qcom,clock-rates = <0 0 0 200000000 0 0 0 0>;

arch/arm/boot/dts/qcom/apq8084-camera.dtsi

+15 −15
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 78 0>;

		interrupt-names = "csiphy";

		qcom,clock-names = "camss_top_ahb_clk",

		clock-names = "camss_top_ahb_clk",

			"camss_ahb_clk", "ispif_ahb_clk",

			"csiphy_timer_src_clk", "csiphy_timer_clk";

		qcom,clock-rates = <0 0 0 200000000 0>;
@@ -40,7 +40,7 @@ 
		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 79 0>;

		interrupt-names = "csiphy";

		qcom,clock-names = "camss_top_ahb_clk",

		clock-names = "camss_top_ahb_clk",

			"camss_ahb_clk", "ispif_ahb_clk",

			"csiphy_timer_src_clk", "csiphy_timer_clk";

		qcom,clock-rates = <0 0 0 200000000 0>;
@@ -54,7 +54,7 @@ 
		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 80 0>;

		interrupt-names = "csiphy";

		qcom,clock-names = "camss_top_ahb_clk",

		clock-names = "camss_top_ahb_clk",

			"camss_ahb_clk", "ispif_ahb_clk",

			"csiphy_timer_src_clk", "csiphy_timer_clk";

		qcom,clock-rates = <0 0 0 200000000 0>;
@@ -69,7 +69,7 @@ 
		interrupt-names = "csid";

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

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

		qcom,clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk",

			"csi_src_clk", "csi_clk", "csi_phy_clk",

			"csi_pix_clk", "csi_rdi_clk";
@@ -85,7 +85,7 @@ 
		interrupt-names = "csid";

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

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

		qcom,clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk",

			"csi_src_clk", "csi_clk", "csi_phy_clk",

			"csi_pix_clk", "csi_rdi_clk";
@@ -101,7 +101,7 @@ 
		interrupt-names = "csid";

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

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

		qcom,clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk",

			"csi_src_clk", "csi_clk", "csi_phy_clk",

			"csi_pix_clk", "csi_rdi_clk";
@@ -117,7 +117,7 @@ 
		interrupt-names = "csid";

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

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

		qcom,clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk", "camss_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk",

			"csi_src_clk", "csi_clk", "csi_phy_clk",

			"csi_pix_clk", "csi_rdi_clk";
@@ -133,7 +133,7 @@ 
		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,num-isps = <0x2>;

		qcom,clock-names = "ispif_ahb_clk";

		clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <0>;

	};
@@ -146,7 +146,7 @@ 
		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,clock-names = "camss_top_ahb_clk" , "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk" , "camss_ahb_clk",

			"vfe_clk_src", "camss_vfe_vfe_clk", "camss_csi_vfe_clk",

			"iface_clk", "bus_clk";

		qcom,clock-rates = <0 0 266670000 0 0 0 0>;
@@ -161,7 +161,7 @@ 
		interrupts = <0 58 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,clock-names = "camss_top_ahb_clk" , "camss_ahb_clk",

		clock-names = "camss_top_ahb_clk" , "camss_ahb_clk",

			"vfe_clk_src", "camss_vfe_vfe_clk", "camss_csi_vfe_clk",

			"iface_clk", "bus_clk";

		qcom,clock-rates = <0 0 266670000 0 0 0 0>;
@@ -176,7 +176,7 @@ 
		interrupts = <0 59 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk0",

		clock-names = "core_clk", "iface_clk", "bus_clk0",

			"camss_top_ahb_clk";

		qcom,clock-rates = <266670000 0 0 0>;

	};
@@ -190,7 +190,7 @@ 
		interrupts = <0 60 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk0",

		clock-names = "core_clk", "iface_clk", "bus_clk0",

			"camss_top_ahb_clk";

		qcom,clock-rates = <266670000 0 0 0>;

	};
@@ -204,7 +204,7 @@ 
		interrupts = <0 61 0>;

		interrupt-names = "jpeg";

		vdd-supply = <&gdsc_jpeg>;

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk0",

		clock-names = "core_clk", "iface_clk", "bus_clk0",

			"camss_top_ahb_clk";

		qcom,clock-rates = <266670000 0 0 0>;

	};
@@ -226,7 +226,7 @@ 
		interrupts = <0 49 0>;

		interrupt-names = "cpp";

		vdd-supply = <&gdsc_vfe>;

        qcom,clock-names = "camss_top_ahb_clk", "vfe_clk_src",

        clock-names = "camss_top_ahb_clk", "vfe_clk_src",

                           "camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",

                           "cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk",

                           "camss_ahb_clk";
@@ -242,7 +242,7 @@ 
		reg-names = "cci";

		interrupts = <0 50 0>;

		interrupt-names = "cci";

        qcom,clock-names = "camss_top_ahb_clk", "camss_ahb_clk", "cci_src_clk",

        clock-names = "camss_top_ahb_clk", "camss_ahb_clk", "cci_src_clk",

                           "cci_ahb_clk", "cci_clk";

        qcom,clock-rates = <0 0 19200000 0 0>;

		gpios = <&msmgpio 19 0>,