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

Commit 5acdc770 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-4.19' of... 

Merge tag 'samsung-soc-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc changes for v4.19

Minor cleanups and fixes.

* tag 'samsung-soc-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: exynos: Clear global variable on init error path
  ARM: exynos: Remove outdated maintainer information
  ARM: s3c24xx: Fix typo in guard macro of s3c2412.h

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f0ad8412 cd480691

arch/arm/mach-exynos/exynos.c

+0 −2
Original line number Diff line number Diff line
@@ -190,8 +190,6 @@ static void __init exynos_dt_fixup(void) 
}



DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")

	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */

	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */

	.l2c_aux_val	= 0x3c400001,

	.l2c_aux_mask	= 0xc20fffff,

	.smp		= smp_ops(exynos_smp_ops),

arch/arm/mach-exynos/suspend.c

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node, 
					  NULL);

	if (!domain) {

		iounmap(pmu_base_addr);

		pmu_base_addr = NULL;

		return -ENOMEM;

	}

arch/arm/mach-s3c24xx/include/mach/s3c2412.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */



#ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H

#define __ARCH_ARM_REGS_S3C24XX_S3C2412_H __FILE__

#define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__



#define S3C2412_MEMREG(x)		(S3C24XX_VA_MEMCTRL + (x))

#define S3C2412_EBIREG(x)		(S3C2412_VA_EBI + (x))