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

Commit 1794670a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable display rsc for kona target"

parents c6584e58 ea3caf42

arch/arm64/boot/dts/qcom/kona-sde-display.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
};



&mdss_mdp {

	connectors = <&sde_dp &sde_wb &sde_dsi &sde_dsi1>;

	connectors = <&sde_dp &sde_wb &sde_dsi &sde_dsi1 &sde_rscc>;

};



/* PHY TIMINGS REVISION W */

arch/arm64/boot/dts/qcom/kona-sde.dtsi

+10 −32
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
		clock-max-rate = <0 0 0 0 460000000 19200000 460000000

					460000000>;



		sde-vdd-supply = <&mdss_core_gdsc>;

		mmcx-supply = <&VDD_MMCX_LEVEL>;



		/* interrupt config */

		interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -256,7 +256,7 @@ 


			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "sde-vdd";

				qcom,supply-name = "mmcx";

				qcom,supply-min-voltage = <0>;

				qcom,supply-max-voltage = <0>;

				qcom,supply-enable-load = <0>;
@@ -282,23 +282,13 @@ 


		/* data and reg bus scale settings */

		qcom,sde-data-bus {

			qcom,msm-bus,name = "mdss_sde_mnoc_llcc";

			qcom,msm-bus,name = "mdss_sde";

			qcom,msm-bus,num-cases = <3>;

			qcom,msm-bus,num-paths = <2>;

			qcom,msm-bus,vectors-KBps =

				<22 770 0 0>, <23 770 0 0>,

				<22 770 0 6400000>, <23 770 0 6400000>,

				<22 770 0 6400000>, <23 770 0 6400000>;

		};



		qcom,sde-ebi-bus  {

			qcom,msm-bus,name = "mdss_sde_ebi";

			qcom,msm-bus,num-cases = <3>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

				<129 512 0 0>,

				<129 512 0 6400000>,

				<129 512 0 6400000>;

				<22 512 0 0>, <23 512 0 0>,

				<22 512 0 6400000>, <23 512 0 6400000>,

				<22 512 0 6400000>, <23 512 0 6400000>;

		};



		qcom,sde-reg-bus {
@@ -430,7 +420,6 @@ 
			<0xaf30000 0x3fd4>;

		reg-names = "drv", "wrapper";

		qcom,sde-rsc-version = <3>;

		status = "disabled";



		qcom,sde-dram-channels = <2>;
@@ -442,25 +431,14 @@ 


		/* data and reg bus scale settings */

		qcom,sde-data-bus {

			qcom,msm-bus,name = "disp_rsc_mnoc";

			qcom,msm-bus,name = "disp_rsc_mnoc_llcc";

			qcom,msm-bus,active-only;

			qcom,msm-bus,num-cases = <3>;

			qcom,msm-bus,num-paths = <2>;

			qcom,msm-bus,vectors-KBps =

			    <20003 20515 0 0>, <20004 20515 0 0>,

			    <20003 20515 0 6400000>, <20004 20515 0 6400000>,

			    <20003 20515 0 6400000>, <20004 20515 0 6400000>;

		};



		qcom,sde-llcc-bus {

			qcom,msm-bus,name = "disp_rsc_llcc";

			qcom,msm-bus,active-only;

			qcom,msm-bus,num-cases = <3>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

			    <20001 20513 0 0>,

			    <20001 20513 0 6400000>,

			    <20001 20513 0 6400000>;

			    <20003 20513 0 0>, <20004 20513 0 0>,

			    <20003 20513 0 6400000>, <20004 20513 0 6400000>,

			    <20003 20513 0 6400000>, <20004 20513 0 6400000>;

		};



		qcom,sde-ebi-bus {

arch/arm64/boot/dts/qcom/kona.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -2177,18 +2177,15 @@ 
				  <SLEEP_TCS   1>,

				  <WAKE_TCS    1>,

				  <CONTROL_TCS 0>;

		status = "disabled";



		msm_bus_disp_rsc {

			compatible = "qcom,msm-bus-rsc";

			qcom,msm-bus-id = <MSM_BUS_RSC_DISP>;

			status = "disabled";

		};



		sde_rsc_rpmh {

			compatible = "qcom,sde-rsc-rpmh";

			cell-index = <0>;

			status = "disabled";

		};

	};