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

Commit 4d64e4d9 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I2656af75,I258c9711 into dev/msm-4.9-camx 

* changes:
  msm: camera: cpas: Use device tree entry to set camnoc-min-bw
  ARM: dts: msm: Add camnoc-min-bw entry in cpas node for sdm670/sdm845
parents c8e610fe b7b9533a

Documentation/devicetree/bindings/media/video/msm-cam-cpas.txt

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ First Level Node - CAM CPAS device 
  Value type: <u32>

  Definition: CAM HW Version information.



- camnoc-axi-min-ib-bw

  Usage: optional

  Value type: <u64>

  Definition: Min camnoc axi bw for the given target.



- regulator-names

  Usage: required

  Value type: <string>

arch/arm64/boot/dts/qcom/sdm670-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ 
		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170110>; /* Titan v170 v1.1.0 */

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ 
		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170100>; /* Titan v170 v1.0.0 */

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ 
		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170110>; /* Titan v170 v1.1.0 */

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+3 −7
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 
#include "cam_cpas_hw_intf.h"

#include "cam_cpas_soc.h"



#define CAM_CPAS_AXI_MIN_MNOC_AB_BW   (2048 * 1024)

#define CAM_CPAS_AXI_MIN_MNOC_IB_BW   (2048 * 1024)

#define CAM_CPAS_AXI_MIN_CAMNOC_AB_BW (2048 * 1024)

#define CAM_CPAS_AXI_MIN_CAMNOC_IB_BW (3000000000L)



static uint cam_min_camnoc_ib_bw;

module_param(cam_min_camnoc_ib_bw, uint, 0644);
@@ -580,8 +575,9 @@ static int cam_cpas_util_set_camnoc_axi_clk_rate( 
			soc_private->camnoc_axi_clk_bw_margin) / 100;



		if ((required_camnoc_bw > 0) &&

			(required_camnoc_bw < CAM_CPAS_AXI_MIN_CAMNOC_IB_BW))

			required_camnoc_bw = CAM_CPAS_AXI_MIN_CAMNOC_IB_BW;

			(required_camnoc_bw <

			soc_private->camnoc_axi_min_ib_bw))

			required_camnoc_bw = soc_private->camnoc_axi_min_ib_bw;



		clk_rate = required_camnoc_bw / soc_private->camnoc_bus_width;