Merge remote branch 'kumar/merge' into merge (d660474e) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/powerpc/include/asm/rio.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#define ASM_PPC_RIO_H

		extern void platform_rio_init(void);
		#ifdef CONFIG_RAPIDIO
		#ifdef CONFIG_FSL_RIO
		extern int fsl_rio_mcheck_exception(struct pt_regs *);
		#else
		static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }

+1 −1

Original line number	Diff line number	Diff line
		@@ -1979,7 +1979,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
		.pvr_value = 0x80240000,
		.cpu_name = "e5500",
		.cpu_features = CPU_FTRS_E5500,
		.cpu_user_features = COMMON_USER_BOOKE,
		.cpu_user_features = COMMON_USER_BOOKE \| PPC_FEATURE_HAS_FPU,
		.mmu_features = MMU_FTR_TYPE_FSL_E \| MMU_FTR_BIG_PHYS \|
		MMU_FTR_USE_TLBILX,
		.icache_bsize = 64,

+3 −3

Original line number	Diff line number	Diff line
		@@ -196,9 +196,6 @@ static int __devinit fsl_lbc_ctrl_init(struct fsl_lbc_ctrl *ctrl,
		out_be32(&lbc->lteccr, LTECCR_CLEAR);
		out_be32(&lbc->ltedr, LTEDR_ENABLE);

		/* Enable interrupts for any detected events */
		out_be32(&lbc->lteir, LTEIR_ENABLE);

		/* Set the monitor timeout value to the maximum for erratum A001 */
		if (of_device_is_compatible(node, "fsl,elbc"))
		clrsetbits_be32(&lbc->lbcr, LBCR_BMT, LBCR_BMTPS);
		@@ -322,6 +319,9 @@ static int __devinit fsl_lbc_ctrl_probe(struct platform_device *dev)
		goto err;
		}

		/* Enable interrupts for any detected events */
		out_be32(&fsl_lbc_ctrl_dev->regs->lteir, LTEIR_ENABLE);

		return 0;

		err: