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

Commit 407a362f authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'kumar/merge' into merge

parents 4a7cbb56 621c4b99

arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -236,6 +236,10 @@ 
	};



/include/ "pq3-esdhc-0.dtsi"

	sdhc@2e000 {

		compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";

	};



/include/ "pq3-sec3.0-0.dtsi"

/include/ "pq3-mpic.dtsi"

/include/ "pq3-mpic-timer-B.dtsi"

arch/powerpc/boot/dts/fsl/p1010si-post.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ 
/include/ "pq3-usb2-dr-0.dtsi"

/include/ "pq3-esdhc-0.dtsi"

	sdhc@2e000 {

		fsl,sdhci-auto-cmd12;

		compatible = "fsl,p1010-esdhc", "fsl,esdhc";

		sdhci,auto-cmd12;

	};



/include/ "pq3-sec4.4-0.dtsi"

arch/powerpc/boot/dts/fsl/p1020si-post.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ 
/include/ "pq3-usb2-dr-1.dtsi"



/include/ "pq3-esdhc-0.dtsi"

	sdhc@2e000 {

		compatible = "fsl,p1020-esdhc", "fsl,esdhc";

		sdhci,auto-cmd12;

	};

/include/ "pq3-sec3.3-0.dtsi"



/include/ "pq3-mpic.dtsi"

arch/powerpc/boot/dts/fsl/p1022si-post.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ 


/include/ "pq3-esdhc-0.dtsi"

	sdhc@2e000 {

		fsl,sdhci-auto-cmd12;

		compatible = "fsl,p1022-esdhc", "fsl,esdhc";

		sdhci,auto-cmd12;

	};



/include/ "pq3-sec3.3-0.dtsi"

arch/powerpc/boot/dts/fsl/p2020si-post.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ 
/include/ "pq3-etsec1-1.dtsi"

/include/ "pq3-etsec1-2.dtsi"

/include/ "pq3-esdhc-0.dtsi"

	sdhc@2e000 {

		compatible = "fsl,p2020-esdhc", "fsl,esdhc";

	};



/include/ "pq3-sec3.1-0.dtsi"

/include/ "pq3-mpic.dtsi"

/include/ "pq3-mpic-timer-B.dtsi"