Commit 51378066 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-1' of... 

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

From Kukjin Kim:
Samsung fixes for v3.11
- fix kernel booting on exynos5440
  skip pm which is not supported
  update regarding LPAE features
- fix s3c2440 uart with adding clkdev entries
- fix compilatioin for Samsung SoCs with selecting pm
- update ARCH_NR_GPIO to support exynos4412 has more gpios

* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
  ARM: EXYNOS: Fix low level debug support
  ARM: SAMSUNG: Save/restore only selected uart's registers
  ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
  ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
  ARM: EXYNOS: Enable 64-bit DMA for EXYNOS5440 if LPAE is enabled
  ARM: EXYNOS: change the PHYSMEM_BITS and SECTION_SIZE
  ARM: EXYNOS: skip pm support on exynos5440

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f82a3133 53302bf6

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -1600,8 +1600,7 @@ config LOCAL_TIMERS 
config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 512 if SOC_OMAP5

	default 512 if ARCH_KEYSTONE

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5

	default 392 if ARCH_U8500

	default 352 if ARCH_VT8500

	default 288 if ARCH_SUNXI

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ config SOC_EXYNOS5440 
	bool "SAMSUNG EXYNOS5440"

	default y

	depends on ARCH_EXYNOS5

	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE

	select ARCH_HAS_OPP

	select HAVE_ARM_ARCH_TIMER

	select AUTO_ZRELADDR

arch/arm/mach-exynos/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj- := 


obj-$(CONFIG_ARCH_EXYNOS)	+= common.o



obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_S5P_PM)		+= pm.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

arch/arm/mach-exynos/common.c

+0 −26
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static const char name_exynos5440[] = "EXYNOS5440"; 


static void exynos4_map_io(void);

static void exynos5_map_io(void);

static void exynos5440_map_io(void);

static int exynos_init(void);



static struct cpu_table cpu_ids[] __initdata = {
@@ -95,7 +94,6 @@ static struct cpu_table cpu_ids[] __initdata = { 
	}, {

		.idcode		= EXYNOS5440_SOC_ID,

		.idmask		= EXYNOS5_SOC_MASK,

		.map_io		= exynos5440_map_io,

		.init		= exynos_init,

		.name		= name_exynos5440,

	},
@@ -149,11 +147,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_DIST),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_CMU,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),
@@ -268,20 +261,6 @@ static struct map_desc exynos5_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(EXYNOS5_PA_PMU),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS5_PA_UART),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	},

};



static struct map_desc exynos5440_iodesc0[] __initdata = {

	{

		.virtual	= (unsigned long)S3C_VA_UART,

		.pfn		= __phys_to_pfn(EXYNOS5440_PA_UART0),

		.length		= SZ_512K,

		.type		= MT_DEVICE,

	},

};
@@ -388,11 +367,6 @@ static void __init exynos5_map_io(void) 
		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

}



static void __init exynos5440_map_io(void)

{

	iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0));

}



void __init exynos_init_time(void)

{

	of_clk_init(NULL);

arch/arm/mach-exynos/common.h

+0 −1
Original line number Diff line number Diff line
@@ -97,6 +97,5 @@ struct exynos_pmu_conf { 
};



extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);

extern void s3c_cpu_resume(void);



#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE