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

Commit 5356803b 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: qseecom bus scaling support for 8074, 8610 and msmsamarium"

parents 81fd2d7a db43c969

arch/arm/boot/dts/qcom/apq8074-v1.dtsi

+5 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -31,11 +31,12 @@ 
		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,active-only = <0>;

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

		qcom,support-bus-scaling;

		qcom,msm-bus,vectors-KBps =

				<55 512 0 0>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>;

				<55 512 0 0>,

				<55 512 120000 1200000>,

				<55 512 393600 3936000>;

	};

};

arch/arm/boot/dts/qcom/apq8074-v2.0-1.dtsi

+5 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -31,11 +31,12 @@ 
		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,active-only = <0>;

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

		qcom,support-bus-scaling;

		qcom,msm-bus,vectors-KBps =

				<55 512 0 0>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>;

				<55 512 0 0>,

				<55 512 120000 1200000>,

				<55 512 393600 3936000>;

	};



};

arch/arm/boot/dts/qcom/msm8610.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -977,11 +977,12 @@ 
		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,active-only = <0>;

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

		qcom,support-bus-scaling;

		qcom,msm-bus,vectors-KBps =

				<55 512 0 0>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>;

				<55 512 0 0>,

				<55 512 120000 1200000>,

				<55 512 393600 3936000>;

	};



        qcom,msm-rng@f9bff000 {

arch/arm/boot/dts/qcom/msmsamarium.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -1800,11 +1800,12 @@ 
		qcom,msm-bus,name = "qseecom-noc";

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

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

		qcom,support-bus-scaling;

		qcom,msm-bus,vectors-KBps =

				<55 512 0 0>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>,

				<55 512 3936000 393600>;

				<55 512 0 0>,

				<55 512 120000 1200000>,

				<55 512 393600 3936000>;

	};



	cpu-pmu {