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

Commit a86b4ad6 authored Jan 24, 2012 by Linus Torvalds

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix build on some non-freescale platforms
  powerpc/powernv: Fix PCI resource handling
  powerpc/crash: Fix build error without SMP
  powerpc/cpuidle: Make it a bool, not a tristate
  powerpc/85xx: Add dr_mode property in USB nodes
  powerpc/85xx: Enable USB2 controller node for P1020RDB
  powerpc/85xx: Fix cmd12 bug and add the chip compatible for eSDHC
  arch/powerpc/sysdev/fsl_pci.c: add missing iounmap
  powerpc: fix compile error with 85xx/p1022_ds.c

parents 701b259f 3493c853

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

+4 −0

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

	/include/ "pq3-esdhc-0.dtsi"		/include/ "pq3-esdhc-0.dtsi"
			sdhc@2e000 {
			compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";
			};

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

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -158,7 +158,8 @@
	/include/ "pq3-usb2-dr-0.dtsi"		/include/ "pq3-usb2-dr-0.dtsi"
	/include/ "pq3-esdhc-0.dtsi"		/include/ "pq3-esdhc-0.dtsi"
	sdhc@2e000 {		sdhc@2e000 {
	fsl,sdhci-auto-cmd12;		compatible = "fsl,p1010-esdhc", "fsl,esdhc";
			sdhci,auto-cmd12;
	};		};

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

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

+4 −0

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

	/include/ "pq3-esdhc-0.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-sec3.3-0.dtsi"

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

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -203,7 +203,8 @@

	/include/ "pq3-esdhc-0.dtsi"		/include/ "pq3-esdhc-0.dtsi"
	sdhc@2e000 {		sdhc@2e000 {
	fsl,sdhci-auto-cmd12;		compatible = "fsl,p1022-esdhc", "fsl,esdhc";
			sdhci,auto-cmd12;
	};		};

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

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -182,6 +182,10 @@
	/include/ "pq3-etsec1-1.dtsi"		/include/ "pq3-etsec1-1.dtsi"
	/include/ "pq3-etsec1-2.dtsi"		/include/ "pq3-etsec1-2.dtsi"
	/include/ "pq3-esdhc-0.dtsi"		/include/ "pq3-esdhc-0.dtsi"
			sdhc@2e000 {
			compatible = "fsl,p2020-esdhc", "fsl,esdhc";
			};

	/include/ "pq3-sec3.1-0.dtsi"		/include/ "pq3-sec3.1-0.dtsi"
	/include/ "pq3-mpic.dtsi"		/include/ "pq3-mpic.dtsi"
	/include/ "pq3-mpic-timer-B.dtsi"		/include/ "pq3-mpic-timer-B.dtsi"