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

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

Merge branch 'v3.5-samsung-fixes-1' of... 

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

* 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry
  ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping
  ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
parents 5ae95aef 58c553d4

arch/arm/mach-exynos/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ config MACH_SMDKV310 
	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_DEV_AHCI

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_KEYPAD

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_PWM

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_FIMD0
@@ -264,7 +264,7 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_ONENAND

	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select S5P_DEV_TV

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_DRM

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C1
@@ -303,7 +303,7 @@ config MACH_NURI 
	select S5P_DEV_MFC

	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select S5P_DEV_USB_EHCI

	select S5P_SETUP_MIPIPHY

	select S5P_SETUP_MIPIPHY

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_DRM

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_FIMD0
@@ -341,7 +341,7 @@ config MACH_ORIGEN 
	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_PWM

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

arch/arm/plat-samsung/include/plat/map-s3c.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define S3C24XX_VA_WATCHDOG	S3C_VA_WATCHDOG

#define S3C24XX_VA_WATCHDOG	S3C_VA_WATCHDOG





#define S3C2412_VA_SSMC		S3C_ADDR_CPU(0x00000000)

#define S3C2412_VA_SSMC		S3C_ADDR_CPU(0x00000000)

#define S3C2412_VA_EBI		S3C_ADDR_CPU(0x00010000)

#define S3C2412_VA_EBI		S3C_ADDR_CPU(0x00100000)





#define S3C2410_PA_UART		(0x50000000)

#define S3C2410_PA_UART		(0x50000000)

#define S3C24XX_PA_UART		S3C2410_PA_UART

#define S3C24XX_PA_UART		S3C2410_PA_UART

arch/arm/plat-samsung/include/plat/watchdog-reset.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ static inline void arch_wdt_reset(void) 




	__raw_writel(0, S3C2410_WTCON);	  /* disable watchdog, to be safe  */

	__raw_writel(0, S3C2410_WTCON);	  /* disable watchdog, to be safe  */





	if (s3c2410_wdtclk)

	if (!IS_ERR(s3c2410_wdtclk))

		clk_enable(s3c2410_wdtclk);

		clk_enable(s3c2410_wdtclk);





	/* put initial values into count and data */

	/* put initial values into count and data */