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

Commit 2b3a47d7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-cleanup' of... 

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

 into next/cleanup

Pull "Samsung cleanup for 3.18" from Kukjin Kim:

- remove unused <mach/memory.h> in exynos
- local <mach/regs-clock.h> for s5pv210
- cleanup boot address calculate for exynos
- remove separate restart code for s3c24xx

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: remove separate restart code
  ARM: EXYNOS: Do not calculate boot address twice
  ARM: S5PV210: move <mach/regs-clock.h> into mach-s5pv210/
  ARM: EXYNOS: remove unused <mach/memory.h>
parents 28fd8372 f6361c6b

arch/arm/mach-exynos/include/mach/memory.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS4 - Memory definitions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H __FILE__



#define PLAT_PHYS_OFFSET		UL(0x40000000)



#ifndef CONFIG_ARM_LPAE

/* Maximum of 256MiB in one bank */

#define MAX_PHYSMEM_BITS	32

#define SECTION_SIZE_BITS	28

#else

#define MAX_PHYSMEM_BITS	36

#define SECTION_SIZE_BITS	31

#endif



#endif /* __ASM_ARCH_MEMORY_H */

arch/arm/mach-exynos/platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) 
				ret = PTR_ERR(boot_reg);

				goto fail;

			}

			__raw_writel(boot_addr, cpu_boot_reg(core_id));

			__raw_writel(boot_addr, boot_reg);

		}



		call_firmware_op(cpu_boot, core_id);
@@ -313,7 +313,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) 


			if (IS_ERR(boot_reg))

				break;

			__raw_writel(boot_addr, cpu_boot_reg(core_id));

			__raw_writel(boot_addr, boot_reg);

		}

	}

}

arch/arm/mach-s3c24xx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ config CPU_S3C2410 
	select S3C2410_DMA if S3C24XX_DMA

	select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ

	select S3C2410_PM if PM

	select SAMSUNG_WDT_RESET

	help

	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.
@@ -76,7 +75,6 @@ config CPU_S3C2442 
config CPU_S3C244X

	def_bool y

	depends on CPU_S3C2440 || CPU_S3C2442

	select SAMSUNG_WDT_RESET



config CPU_S3C2443

	bool "SAMSUNG S3C2443"

arch/arm/mach-s3c24xx/common.c

+0 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <plat/devs.h>

#include <plat/cpu-freq.h>

#include <plat/pwm-core.h>

#include <plat/watchdog-reset.h>



#include "common.h"
@@ -513,7 +512,6 @@ struct platform_device s3c2443_device_dma = { 
void __init s3c2410_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif
@@ -535,7 +533,6 @@ void __init s3c2416_init_clocks(int xtal) 
void __init s3c2440_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif
@@ -543,7 +540,6 @@ void __init s3c2440_init_clocks(int xtal) 
void __init s3c2442_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif

arch/arm/mach-s3c24xx/common.h

+0 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ extern int s3c2410a_init(void); 
extern void s3c2410_map_io(void);

extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2410_init_clocks(int xtal);

extern void s3c2410_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2410_init_irq(void);

#else

#define s3c2410_init_clocks NULL
@@ -38,7 +37,6 @@ extern void s3c2412_map_io(void); 
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2412_init_clocks(int xtal);

extern  int s3c2412_baseclk_add(void);

extern void s3c2412_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2412_init_irq(void);

#else

#define s3c2412_init_clocks NULL
@@ -53,7 +51,6 @@ extern void s3c2416_map_io(void); 
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2416_init_clocks(int xtal);

extern  int s3c2416_baseclk_add(void);

extern void s3c2416_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2416_init_irq(void);



extern struct syscore_ops s3c2416_irq_syscore_ops;
@@ -67,7 +64,6 @@ extern struct syscore_ops s3c2416_irq_syscore_ops; 
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)

extern void s3c244x_map_io(void);

extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c244x_restart(enum reboot_mode mode, const char *cmd);

#else

#define s3c244x_init_uarts NULL

#endif
@@ -98,7 +94,6 @@ extern void s3c2443_map_io(void); 
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2443_init_clocks(int xtal);

extern  int s3c2443_baseclk_add(void);

extern void s3c2443_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2443_init_irq(void);

#else

#define s3c2443_init_clocks NULL