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

Commit 55a40a40 authored by Sureshnaidu Laveti's avatar Sureshnaidu Laveti Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Add clock rates in camera node for all boards 



Adding clock rates to camera node instead of statically
reading from sensor driver so that clock names and
rates can be read from camera node using common software on chip
API and if needed it can be overrided with the values obtained from
userspace sensor drivers.

Change-Id: Icf950194191cbd0887740d692bb88cc650430fb8
Signed-off-by: default avatarSureshnaidu Laveti <lsuresh@codeaurora.org>
parent 2ab415c7

arch/arm/boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi

+4 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2015 The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -165,6 +165,7 @@ 
		clocks = <&clock_mmss clk_mclk0_clk_src>,

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

				<&clock_mmss clk_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@1 {

	qcom,camera@1 {
@@ -207,6 +208,7 @@ 
		clocks = <&clock_mmss clk_mclk1_clk_src>,

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_camss_mclk1_clk>;

			<&clock_mmss clk_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@2 {

	qcom,camera@2 {
@@ -251,5 +253,6 @@ 
		clocks = <&clock_mmss clk_mclk2_clk_src>,

		clocks = <&clock_mmss clk_mclk2_clk_src>,

			<&clock_mmss clk_camss_mclk2_clk>;

			<&clock_mmss clk_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};

};
 
};

arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi

+4 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2015 The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -155,6 +155,7 @@ 
		clocks = <&clock_mmss clk_mclk0_clk_src>,

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

				<&clock_mmss clk_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@1 {

	qcom,camera@1 {
@@ -193,6 +194,7 @@ 
		clocks = <&clock_mmss clk_mclk1_clk_src>,

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_camss_mclk1_clk>;

			<&clock_mmss clk_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@2 {

	qcom,camera@2 {
@@ -233,5 +235,6 @@ 
		clocks = <&clock_mmss clk_mclk2_clk_src>,

		clocks = <&clock_mmss clk_mclk2_clk_src>,

			<&clock_mmss clk_camss_mclk2_clk>;

			<&clock_mmss clk_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};

};
 
};

arch/arm/boot/dts/qcom/msm8909-camera-sensor-cdp.dtsi

+3 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <19200000 0>;

	};

	};





	qcom,camera@0 {

	qcom,camera@0 {
@@ -131,6 +132,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@1 {

	qcom,camera@1 {
@@ -165,5 +167,6 @@ 
		clocks = <&clock_gcc clk_mclk1_clk_src>,

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};

};
 
};

arch/arm/boot/dts/qcom/msm8909-camera-sensor-mtp.dtsi

+4 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -89,6 +89,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <19200000 0>;

	};

	};





	led_flash0: qcom,led-flash@60 {

	led_flash0: qcom,led-flash@60 {
@@ -155,6 +156,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@1 {

	qcom,camera@1 {
@@ -189,5 +191,6 @@ 
		clocks = <&clock_gcc clk_mclk1_clk_src>,

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};

};
 
};

arch/arm/boot/dts/qcom/msm8909-camera-sensor-skuc.dtsi

+3 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ 
		clocks = <&clock_gcc clk_mclk1_clk_src>,

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@0 {

	qcom,camera@0 {
@@ -95,6 +96,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};





	qcom,camera@1 {

	qcom,camera@1 {
@@ -130,5 +132,6 @@ 
		clocks = <&clock_gcc clk_mclk1_clk_src>,

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

	};

};
 
};