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

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

Merge "ARM: dts: msm: Add register base address for sdm670/sdm845" into dev/msm-4.9-camx

parents 5ba83741 c555f976

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

+9 −0
Original line number Diff line number Diff line
@@ -908,6 +908,9 @@ 
	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam-ipe";

		reg = <0xac87000 0x3000>;

		reg-names = "ipe0_top";

		reg-cam-base = <0x87000>;

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -935,6 +938,9 @@ 
	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam-ipe";

		reg = <0xac91000 0x3000>;

		reg-names = "ipe1_top";

		reg-cam-base = <0x91000>;

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -962,6 +968,9 @@ 
	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam-bps";

		reg = <0xac6f000 0x3000>;

		reg-names = "bps_top";

		reg-cam-base = <0x6f000>;

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",

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

+9 −0
Original line number Diff line number Diff line
@@ -881,6 +881,9 @@ 
	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam-ipe";

		reg = <0xac87000 0x3000>;

		reg-names = "ipe0_top";

		reg-cam-base = <0x87000>;

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -908,6 +911,9 @@ 
	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam-ipe";

		reg = <0xac91000 0x3000>;

		reg-names = "ipe1_top";

		reg-cam-base = <0x91000>;

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -935,6 +941,9 @@ 
	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam-bps";

		reg = <0xac6f000 0x3000>;

		reg-names = "bps_top";

		reg-cam-base = <0x6f000>;

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",