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

Commit 17b2112f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are a handful of powerpc fixes for 3.13.

  The patches are reasonably trivial and self contained.  Note the offb
  patches outside of arch/powerpc, they are LE fixes for our
  open-firmware 'dumb' framebuffer"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix up the kdump base cap to 128M
  powernv: Fix VFIO support with PHB3
  powerpc/52xx: Re-enable bestcomm driver in defconfigs
  powerpc/pasemi: Turn on devtmpfs in defconfig
  offb: Add palette hack for little endian
  offb: Little endian fixes
  powerpc: Fix PTE page address mismatch in pgtable ctor/dtor
  powerpc/44x: Fix ocm_block allocation
  powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX=y
  powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node
parents 78fd8223 e641eb03

arch/powerpc/boot/dts/mpc5121.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
		compatible = "fsl,mpc5121-immr";

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		ranges = <0x0 0x80000000 0x400000>;

		reg = <0x80000000 0x400000>;

		bus-frequency = <66000000>;	/* 66 MHz ips bus */

arch/powerpc/configs/52xx/cm5200_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_EXPERT=y 
CONFIG_PPC_MPC52xx=y

CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_SPARSE_IRQ=y

CONFIG_PM=y

# CONFIG_PCI is not set
@@ -71,6 +70,8 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y

CONFIG_USB_STORAGE=y

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

arch/powerpc/configs/52xx/lite5200b_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ CONFIG_PPC_MPC52xx=y 
CONFIG_PPC_MPC5200_SIMPLE=y

CONFIG_PPC_LITE5200=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SPARSE_IRQ=y
@@ -59,6 +58,8 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MPC=y

# CONFIG_HWMON is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

arch/powerpc/configs/52xx/motionpro_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_EXPERT=y 
CONFIG_PPC_MPC52xx=y

CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_SPARSE_IRQ=y

CONFIG_PM=y

# CONFIG_PCI is not set
@@ -84,6 +83,8 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

arch/powerpc/configs/52xx/pcm030_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_PPC_MPC52xx=y

CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HZ_100=y
@@ -87,6 +86,8 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 
CONFIG_USB_STORAGE=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PCF8563=m

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=m

CONFIG_EXT3_FS=m

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set