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

Commit 8f3dda75 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote branch 'kumar/merge' into merge

parents a1b49cb7 e5462d16

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ config ARCH_HIBERNATION_POSSIBLE 
config ARCH_SUSPEND_POSSIBLE

	def_bool y

	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \

		   PPC_85xx || PPC_86xx || PPC_PSERIES || 44x || 40x

		   (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x



config PPC_DCR_NATIVE

	bool

arch/powerpc/include/asm/cputable.h

+14 −2
Original line number Diff line number Diff line
@@ -382,10 +382,12 @@ extern const char *powerpc_base_platform; 
#define CPU_FTRS_E500_2	(CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | \

	    CPU_FTR_SPE_COMP | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE)

#define CPU_FTRS_E500MC	(CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | \

	    CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_NODSISRALIGN | \

#define CPU_FTRS_E500MC	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL)

#define CPU_FTRS_E5500	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD)

#define CPU_FTRS_GENERIC_32	(CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)



/* 64-bit CPUs */
@@ -435,11 +437,15 @@ extern const char *powerpc_base_platform; 
#define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)



#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_POSSIBLE	(CPU_FTRS_E5500)

#else

#define CPU_FTRS_POSSIBLE	\

	    (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |	\

	    CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |	\

	    CPU_FTRS_POWER7 | CPU_FTRS_CELL | CPU_FTRS_PA6T |		\

	    CPU_FTR_1T_SEGMENT | CPU_FTR_VSX)

#endif

#else

enum {

	CPU_FTRS_POSSIBLE =
@@ -473,16 +479,21 @@ enum { 
#endif

#ifdef CONFIG_E500

	    CPU_FTRS_E500 | CPU_FTRS_E500_2 | CPU_FTRS_E500MC |

	    CPU_FTRS_E5500 |

#endif

	    0,

};

#endif /* __powerpc64__ */



#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_ALWAYS		(CPU_FTRS_E5500)

#else

#define CPU_FTRS_ALWAYS		\

	    (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &	\

	    CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 &	\

	    CPU_FTRS_POWER7 & CPU_FTRS_CELL & CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)

#endif

#else

enum {

	CPU_FTRS_ALWAYS =
@@ -513,6 +524,7 @@ enum { 
#endif

#ifdef CONFIG_E500

	    CPU_FTRS_E500 & CPU_FTRS_E500_2 & CPU_FTRS_E500MC &

	    CPU_FTRS_E5500 &

#endif

	    CPU_FTRS_POSSIBLE,

};

arch/powerpc/kernel/cputable.c

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x80240000,

		.cpu_name		= "e5500",

		.cpu_features		= CPU_FTRS_E500MC,

		.cpu_features		= CPU_FTRS_E5500,

		.cpu_user_features	= COMMON_USER_BOOKE,

		.mmu_features		= MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS |

			MMU_FTR_USE_TLBILX,

arch/powerpc/kernel/legacy_serial.c

+5 −3
Original line number Diff line number Diff line
@@ -330,10 +330,12 @@ void __init find_legacy_serial_ports(void) 
		if (!parent)

			continue;

		if (of_match_node(legacy_serial_parents, parent) != NULL) {

			if (of_device_is_available(np)) {

				index = add_legacy_soc_port(np, np);

				if (index >= 0 && np == stdout)

					legacy_serial_console = index;

			}

		}

		of_node_put(parent);

	}

arch/powerpc/sysdev/fsl_pci.c

+5 −0
Original line number Diff line number Diff line
@@ -324,6 +324,11 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary) 
	struct resource rsrc;

	const int *bus_range;



	if (!of_device_is_available(dev)) {

		pr_warning("%s: disabled\n", dev->full_name);

		return -ENODEV;

	}



	pr_debug("Adding PCI host bridge %s\n", dev->full_name);



	/* Fetch host bridge registers address */