Commit dc30f7c3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

From Kukjin Kim:

- Consolidate uncompress subroutines and s5p64x0-uncompress
- Cleanup watchdog support on Samsung to support multiplatform

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

:
  ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header
  ARM: SAMSUNG: Remove legacy watchdog reset code
  ARM: SAMSUNG: Let platforms use the new watchdog reset driver
  ARM: SAMSUNG: Add watchdog reset driver
  ARM: SAMSUNG: Use local definitions of watchdog registers
  watchdog: s3c2410_wdt: Use local register definitions
  ARM: S5P64X0: Use common uncompress.h part for plat-samsung
  ARM: SAMSUNG: Consolidate uncompress subroutine

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3c373f99 db3824e6

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ config ARCH_S3C64XX 
	select SAMSUNG_CLKSRC

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_WDT_RESET

	select USB_ARCH_HAS_OHCI

	help

	  Samsung S3C64XX series based systems
@@ -744,6 +745,7 @@ config ARCH_S5P64X0 
	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select SAMSUNG_WDT_RESET

	help

	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  SMDK6450.
@@ -760,6 +762,7 @@ config ARCH_S5PC100 
	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select SAMSUNG_WDT_RESET

	help

	  Samsung S5PC100 series based systems

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

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#include <asm/mach-types.h>



#include <mach/map.h>



volatile u8 *uart_base;



#include <plat/uncompress.h>



static unsigned int __raw_readl(unsigned int ptr)

arch/arm/mach-s3c24xx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config CPU_S3C2410 
	select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX

	select S3C2410_PM if PM

	select SAMSUNG_HRT

	select SAMSUNG_WDT_RESET

	help

	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.
@@ -81,6 +82,7 @@ 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/include/mach/uncompress.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ static void arch_detect_cpu(void) 
		fifo_mask = S3C2410_UFSTAT_TXMASK;

		fifo_max = 15 << S3C2410_UFSTAT_TXSHIFT;

	}



	uart_base = (volatile u8 *) S3C_PA_UART +

		(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);

}



#endif /* __ASM_ARCH_UNCOMPRESS_H */

arch/arm/mach-s3c24xx/s3c2410.c

+2 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ void __init s3c2410_init_clocks(int xtal) 
	s3c2410_baseclk_add();

	s3c24xx_register_clock(&s3c2410_armclk);

	clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup));

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}



struct bus_type s3c2410_subsys = {
@@ -201,7 +202,7 @@ void s3c2410_restart(char mode, const char *cmd) 
		soft_restart(0);

	}



	arch_wdt_reset();

	samsung_wdt_reset();



	/* we'll take a jump through zero as a poor second */

	soft_restart(0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE