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

Commit ac03564f 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 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/44x: Add mtd ndfc to the ppx44x defconfig
  powerpc: Fix compiliation with hugetlbfs enabled
  arch/powerpc/sysdev/ehv_pic.c: add missing kfree
  powerpc/fsl-lbc: Fix for fsl_upm
  drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
  powerpc/qe: Fixup QE_General4 errata
  powerpc/85xx: Fix compile error on p3060_qds.c
  powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO'
  powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe
parents dd38d298 49e44064

arch/powerpc/boot/dts/p1023rds.dts

+13 −4
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ 
			interrupt-parent = <&mpic>;

			interrupts = <16 2>;

			interrupt-map-mask = <0xf800 0 0 7>;

			/* IRQ[0:3] are pulled up on board, set to active-low */

			interrupt-map = <

				/* IDSEL 0x0 */

				0000 0 0 1 &mpic 0 1
@@ -488,11 +489,15 @@ 
			interrupt-parent = <&mpic>;

			interrupts = <16 2>;

			interrupt-map-mask = <0xf800 0 0 7>;

			/*

			 * IRQ[4:6] only for PCIe, set to active-high,

			 * IRQ[7] is pulled up on board, set to active-low

			 */

			interrupt-map = <

				/* IDSEL 0x0 */

				0000 0 0 1 &mpic 4 1

				0000 0 0 2 &mpic 5 1

				0000 0 0 3 &mpic 6 1

				0000 0 0 1 &mpic 4 2

				0000 0 0 2 &mpic 5 2

				0000 0 0 3 &mpic 6 2

				0000 0 0 4 &mpic 7 1

				>;

			ranges = <0x2000000 0x0 0xa0000000
@@ -527,12 +532,16 @@ 
			interrupt-parent = <&mpic>;

			interrupts = <16 2>;

			interrupt-map-mask = <0xf800 0 0 7>;

			/*

			 * IRQ[8:10] are pulled up on board, set to active-low

			 * IRQ[11] only for PCIe, set to active-high,

			 */

			interrupt-map = <

				/* IDSEL 0x0 */

				0000 0 0 1 &mpic 8 1

				0000 0 0 2 &mpic 9 1

				0000 0 0 3 &mpic 10 1

				0000 0 0 4 &mpic 11 1

				0000 0 0 4 &mpic 11 2

				>;

			ranges = <0x2000000 0x0 0x80000000

				  0x2000000 0x0 0x80000000

arch/powerpc/configs/ppc44x_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ CONFIG_MTD_CFI=y 
CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND_NDFC=m

CONFIG_MTD_UBI=m

CONFIG_MTD_UBI_GLUEBI=m

CONFIG_PROC_DEVICETREE=y

arch/powerpc/mm/hugetlbpage.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/of_fdt.h>

#include <linux/memblock.h>

#include <linux/bootmem.h>

#include <linux/moduleparam.h>

#include <asm/pgtable.h>

#include <asm/pgalloc.h>

#include <asm/tlb.h>

arch/powerpc/platforms/85xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ config P3060_QDS 
	select PPC_E500MC

	select PHYS_64BIT

	select SWIOTLB

	select MPC8xxx_GPIO

	select GPIO_MPC8XXX

	select HAS_RAPIDIO

	select PPC_EPAPR_HV_PIC

	help

arch/powerpc/platforms/85xx/p3060_qds.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ define_machine(p3060_qds) { 
	.power_save		= e500_idle,

};



machine_device_initcall(p3060_qds, declare_of_platform_devices);

machine_device_initcall(p3060_qds, corenet_ds_publish_devices);



#ifdef CONFIG_SWIOTLB

machine_arch_initcall(p3060_qds, swiotlb_setup_bus_notifier);