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

Commit 83579fad authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: ispif: Get clock names and rates from dtsi files"

parents 26435ea0 58a13ce1

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

+10 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,num-isps = <0x2>;

		qcom,clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <0>;

	};



	qcom,vfe@fda10000 {
@@ -144,6 +146,10 @@ 
		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,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>;

	};



	qcom,vfe@fda14000 {
@@ -155,6 +161,10 @@ 
		interrupts = <0 58 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,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>;

	};



	qcom,jpeg@fda1c000 {

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

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ 
		reg-names = "ispif", "csi_clk_mux";

		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <0>;

	};



	qcom,vfe@fda10000 {
@@ -95,6 +97,10 @@ 
		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

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

			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk";

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

	};



	qcom,jpeg@fda1c000 {

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

+10 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ 
		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,num-isps = <0x2>;

		qcom,clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <0>;

	};



	qcom,vfe@fda10000 {
@@ -140,6 +142,10 @@ 
		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

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

			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk";

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

	};



	qcom,vfe@fda14000 {
@@ -151,6 +157,10 @@ 
		interrupts = <0 58 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

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

			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk";

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

	};



	qcom,jpeg@fda1c000 {

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

+10 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
		interrupts = <0 55 0>;

		interrupt-names = "ispif";

		qcom,num-isps = <0x2>;

		qcom,clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <0>;

	};



	qcom,vfe@fda10000 {
@@ -144,6 +146,10 @@ 
		interrupts = <0 57 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,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>;

	};



	qcom,vfe@fda14000 {
@@ -155,6 +161,10 @@ 
		interrupts = <0 58 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		qcom,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>;

	};



	qcom,jpeg@fda1c000 {

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define VFE_PONG_FLAG 0x0



#define VFE_MAX_CFG_TIMEOUT 3000

#define VFE_CLK_INFO_MAX 16



struct vfe_device;

struct msm_vfe_axi_stream;
@@ -415,6 +416,7 @@ struct vfe_device { 


	struct regulator *fs_vfe;

	struct clk *vfe_clk[7];

	uint32_t num_clk;



	uint32_t bus_perf_client;