From 2493fd83fa0b3d3cf52fad6556c6514f6082cf21 Mon Sep 17 00:00:00 2001 From: Sureshnaidu Laveti Date: Fri, 13 May 2016 16:48:38 -0700 Subject: [PATCH] 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: Sureshnaidu Laveti --- .../boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi | 5 ++++- arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi | 5 ++++- arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi | 7 ++++++- arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi | 7 ++++++- arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi | 7 ++++++- arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi | 7 ++++++- arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi | 7 ++++++- 7 files changed, 38 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi index fab3415f6ad0..5aabb8d15a9f 100644 --- a/arch/arm/boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi +++ b/arch/arm/boot/dts/qcom/apq8096-camera-sensor-dragonboard.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -165,6 +165,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -207,6 +208,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -251,5 +253,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi b/arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi index cd94cc41593d..2bfb6501160e 100644 --- a/arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi +++ b/arch/arm/boot/dts/qcom/apq8096-camera-sensor-sbc.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -155,6 +155,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -193,6 +194,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -233,5 +235,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi index 4f51d296c45f..5fdb71c4a3d3 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -78,6 +78,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; eeprom1: qcom,eeprom@1 { @@ -110,6 +111,7 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; qcom,camera@0 { @@ -151,6 +153,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -189,6 +192,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -229,5 +233,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi index 435d1626d3cc..c20ac822a3c7 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -90,6 +90,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; eeprom1: qcom,eeprom@1 { @@ -122,6 +123,7 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; qcom,camera@0 { @@ -163,6 +165,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -200,6 +203,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -239,5 +243,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi index fa2053100892..52638fe8e170 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -78,6 +78,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; eeprom1: qcom,eeprom@1 { @@ -110,6 +111,7 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; qcom,camera@0 { @@ -149,6 +151,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -188,6 +191,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -229,5 +233,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi index 962b85a64c9d..e041921e7154 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -88,6 +88,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; eeprom1: qcom,eeprom@1 { @@ -120,6 +121,7 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; qcom,camera@0 { @@ -162,6 +164,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -200,6 +203,7 @@ clocks = <&clock_mmss clk_mclk1_clk_src>, <&clock_mmss clk_camss_mclk1_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -240,5 +244,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi index 243e517154d1..b70781f8f893 100644 --- a/arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi @@ -1,5 +1,5 @@ /* - * 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 * it under the terms of the GNU General Public License version 2 and @@ -90,6 +90,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; eeprom1: qcom,eeprom@1 { @@ -122,6 +123,7 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <19200000 0>; }; qcom,camera@0 { @@ -163,6 +165,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@1 { @@ -203,6 +206,7 @@ clocks = <&clock_mmss clk_mclk0_clk_src>, <&clock_mmss clk_camss_mclk0_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; qcom,camera@2 { @@ -242,5 +246,6 @@ clocks = <&clock_mmss clk_mclk2_clk_src>, <&clock_mmss clk_camss_mclk2_clk>; clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; }; };