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

Commit 3b673111 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 support for ce-device number in crypto drivers"

parents fa0abf7a f438a528

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

+2 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ 
		interrupts = <0 236 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <1>;

		qcom,ce-device = <0>;

                qcom,msm-bus,name = "qcedev-noc";

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

		qcom,msm-bus,num-paths = <1>;
@@ -658,6 +659,7 @@ 
		interrupts = <0 236 0>;

		qcom,bam-pipe-pair = <2>;

		qcom,ce-hw-instance = <1>;

		qcom,ce-device = <0>;

                qcom,msm-bus,name = "qcrypto-noc";

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

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

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

+5 −0
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ 
		interrupts = <0 110 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <1>;

		qcom,ce-device = <0>;

	};

	qcom,qcrypto@fe040000 {

		compatible = "qcom,qcrypto";
@@ -592,6 +593,7 @@ 
		interrupts = <0 115 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <6>;

		qcom,ce-device = <1>;

	};

	qcom,qcrypto@fe000000 {

		compatible = "qcom,qcrypto";
@@ -601,6 +603,7 @@ 
		interrupts = <0 116 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <7>;

		qcom,ce-device = <2>;

	};



	qcom,qcota@fe140000 {
@@ -611,6 +614,7 @@ 
		interrupts = <0 111 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <2>;

		qcom,ce-device = <0>;

	};

	qcom,qcota@fe0c0000 {

		compatible = "qcom,qcota";
@@ -620,6 +624,7 @@ 
		interrupts = <0 113 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <4>;

		qcom,ce-device = <1>;

	};



	tsens: tsens@fc4a8000 {

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

+2 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <2>;

		qcom,ce-hw-instance = <0>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcrypto-noc";

		qcom,msm-bus,num-cases = <2>;
@@ -1444,6 +1445,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <0>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcedev-noc";

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

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

+2 −0
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <2>;

		qcom,ce-hw-instance = <1>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcrypto-noc";

		qcom,msm-bus,num-cases = <2>;
@@ -1082,6 +1083,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <1>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcedev-noc";

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

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

+2 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <2>;

		qcom,ce-hw-instance = <0>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcrypto-noc";

		qcom,msm-bus,num-cases = <2>;
@@ -519,6 +520,7 @@ 
		interrupts = <0 207 0>;

		qcom,bam-pipe-pair = <1>;

		qcom,ce-hw-instance = <0>;

		qcom,ce-device = <0>;

		qcom,ce-hw-shared;

		qcom,msm-bus,name = "qcedev-noc";

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