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

Commit 85d5c4a3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

* 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
  ARM: EXYNOS: use s5p-timer for UniversalC210 board
parents d2919c65 28b874a8

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ config MACH_ARMLEX4210 
config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_EXYNOS4210

	select S5P_HRT

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK

	select S5P_GPIO_INT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

arch/arm/mach-exynos/clock-exynos5.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static struct clk exynos5_clk_pdma1 = { 
	.name		= "dma",

	.devname	= "dma-pl330.1",

	.enable		= exynos5_clk_ip_fsys_ctrl,

	.ctrlbit	= (1 << 1),

	.ctrlbit	= (1 << 2),

};



static struct clk exynos5_clk_mdma1 = {

arch/arm/mach-exynos/mach-universal_c210.c

+3 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <plat/pd.h>

#include <plat/regs-fb-v4.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/camport.h>

#include <plat/mipi_csis.h>
@@ -1063,6 +1064,7 @@ static void __init universal_map_io(void) 
	exynos_init_io(NULL, 0);

	s3c24xx_init_clocks(24000000);

	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));

	s5p_set_timer_source(S5P_PWM2, S5P_PWM4);

}



static void s5p_tv_setup(void)
@@ -1113,7 +1115,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") 
	.map_io		= universal_map_io,

	.handle_irq	= gic_handle_irq,

	.init_machine	= universal_machine_init,

	.timer		= &exynos4_timer,

	.timer		= &s5p_timer,

	.reserve        = &universal_reserve,

	.restart	= exynos4_restart,

MACHINE_END