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

Commit 0ff3c6d1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add reg bus scale properties for msmtitanium/8937"

parents 17932808 19e39120

arch/arm/boot/dts/qcom/msm8937-mdss.dtsi

+25 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016 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
@@ -159,6 +159,19 @@ 
			qcom,mdss-dspp-pgc-off = <0x17C0>;

		};



		qcom,mdss-reg-bus {

			/* Reg Bus Scale Settings */

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

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

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

			qcom,msm-bus,active-only;

			qcom,msm-bus,vectors-KBps =

				<1 590 0 0>,

				<1 590 0 76800>,

				<1 590 0 160000>,

				<1 590 0 320000>;

		};



		smmu_mdp_unsec: qcom,smmu_mdp_unsec_cb {

			compatible = "qcom,smmu_mdp_unsec";

		};
@@ -365,10 +378,20 @@ 


		rot-vdd-supply = <&gdsc_mdss>;

		qcom,supply-names = "rot-vdd";



		qcom,mdss-has-reg-bus;

		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>,

			<&clock_gcc_mdss clk_mdss_rotator_vote_clk>;

		clock-names = "iface_clk", "rot_core_clk";



		qcom,mdss-rot-reg-bus {

			/* Reg Bus Scale Settings */

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

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

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

			qcom,msm-bus,active-only;

			qcom,msm-bus,vectors-KBps =

				<1 590 0 0>,

				<1 590 0 76800>;

		};

	};

};

arch/arm/boot/dts/qcom/msmtitanium-mdss.dtsi

+25 −1
Original line number Diff line number Diff line
@@ -159,6 +159,19 @@ 
			qcom,mdss-dspp-pgc-off = <0x17c0>;

		};



		qcom,mdss-reg-bus {

			/* Reg Bus Scale Settings */

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

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

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

			qcom,msm-bus,active-only;

			qcom,msm-bus,vectors-KBps =

				<1 590 0 0>,

				<1 590 0 76800>,

				<1 590 0 160000>,

				<1 590 0 320000>;

		};



		smmu_mdp_unsec: qcom,smmu_mdp_unsec_cb {

			compatible = "qcom,smmu_mdp_unsec";

		};
@@ -392,9 +405,20 @@ 


		rot-vdd-supply = <&gdsc_mdss>;

		qcom,supply-names = "rot-vdd";



		qcom,mdss-has-reg-bus;

		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>,

			<&clock_gcc_mdss clk_mdss_rotator_vote_clk>;

		clock-names = "iface_clk", "rot_core_clk";



		qcom,mdss-rot-reg-bus {

			/* Reg Bus Scale Settings */

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

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

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

			qcom,msm-bus,active-only;

			qcom,msm-bus,vectors-KBps =

				<1 590 0 0>,

				<1 590 0 76800>;

		};

	};

};