ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
Subsystems (3)
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
This patch extends exynos_init_time() function to handle Exynos4210 rev0 SoC, which differs in availability of system timers and needs different clocksource initialization.
This makes it possible to use exynos_init_time() function as init_time callback for all Exynos-based boards, including Universal_C210, which originally had to use samsung_timer_init().
--- arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-exynos/common.h | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)
arch/arm/mach-exynos/Kconfig +2 -1
@@ -250,6 +250,7 @@ config MACH_ARMLEX4210 config MACH_UNIVERSAL_C210 bool "Mobile UNIVERSAL_C210 Board" select CLKSRC_MMIO + select CLKSRC_SAMSUNG_PWM select CPU_EXYNOS4210 select EXYNOS4_SETUP_FIMC select EXYNOS4_SETUP_FIMD0
@@ -281,7 +282,6 @@ config MACH_UNIVERSAL_C210 select S5P_DEV_TV select S5P_GPIO_INT select S5P_SETUP_MIPIPHY - select SAMSUNG_HRT help Machine support for Samsung Mobile Universal S5PC210 Reference Board.
@@ -410,6 +410,7 @@ config MACH_EXYNOS4_DT depends on ARCH_EXYNOS4 select ARM_AMBA select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 select CPU_EXYNOS4210 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD select PINCTRL
arch/arm/mach-exynos/common.c +29 -1
@@ -10,12 +10,14 @@*/ #include <linux/kernel.h> +#include <linux/bitops.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/irqchip.h> #include <linux/io.h> #include <linux/device.h> #include <linux/gpio.h> +#include <clocksource/samsung_pwm.h> #include <linux/sched.h> #include <linux/serial_core.h> #include <linux/of.h>
@@ -302,6 +304,13 @@ static struct map_desc exynos5440_iodesc0[] __initdata = { }, }; +static struct samsung_pwm_variant exynos4_pwm_variant = { + .bits =32 , + .div_base =0 , + .has_tint_cstat = true, + .tclk_mask =0 , +}; +void exynos4_restart (char mode,const char *cmd) {__raw_writel (0x1 ,S5P_SWRESET );
@@ -442,8 +451,20 @@ static void __init exynos5440_map_io(void)iotable_init (exynos5440_iodesc0,ARRAY_SIZE (exynos5440_iodesc0)); } +void __init exynos_set_timer_source (u8 channels) +{ + exynos4_pwm_variant.output_mask =BIT (SAMSUNG_PWM_NUM ) -1 ; + exynos4_pwm_variant.output_mask &= ~channels; +} +void __init exynos_init_time (void ) { +unsigned int timer_irqs[SAMSUNG_PWM_NUM ] = { +EXYNOS4_IRQ_TIMER0_VIC ,EXYNOS4_IRQ_TIMER1_VIC , +EXYNOS4_IRQ_TIMER2_VIC ,EXYNOS4_IRQ_TIMER3_VIC , +EXYNOS4_IRQ_TIMER4_VIC , + }; +if (of_have_populated_dt ()) {#ifdef CONFIG_OF of_clk_init (NULL );
@@ -455,7 +476,14 @@ void __init exynos_init_time(void)exynos4_clk_init (NULL , !soc_is_exynos4210 (),S5P_VA_CMU ,readl (S5P_VA_CHIPID +8 ) &1 );exynos4_clk_register_fixed_ext (xxti_f, xusbxti_f);#endif -mct_init (S5P_VA_SYSTIMER ,EXYNOS4_IRQ_MCT_G0 ,EXYNOS4_IRQ_MCT_L0 ,EXYNOS4_IRQ_MCT_L1 ); +#ifdef CONFIG_CLKSRC_SAMSUNG_PWM +if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_0 ) +samsung_pwm_clocksource_init (S3C_VA_TIMER , + timer_irqs, &exynos4_pwm_variant); + else +#endif +mct_init (S5P_VA_SYSTIMER ,EXYNOS4_IRQ_MCT_G0 , +EXYNOS4_IRQ_MCT_L0 ,EXYNOS4_IRQ_MCT_L1 ); } }
arch/arm/mach-exynos/common.h +2 -0
@@ -32,6 +32,8 @@ void exynos4_clk_register_fixed_ext(unsigned long, unsigned long);void exynos_firmware_init (void ); +void exynos_set_timer_source (u8 channels); +#ifdef CONFIG_PM_GENERIC_DOMAINS int exynos_pm_late_initcall (void );#else
arch/arm/mach-exynos/mach-universal_c210.c +2 -3
@@ -41,7 +41,6 @@#include <plat/mfc.h> #include <plat/sdhci.h> #include <plat/fimc-core.h> -#include <plat/samsung-time.h> #include <plat/camport.h> #include <mach/map.h>
@@ -1094,7 +1093,7 @@ static void __init universal_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (universal_uartcfgs,ARRAY_SIZE (universal_uartcfgs)); -samsung_set_timer_source (SAMSUNG_PWM2 ,SAMSUNG_PWM4 ); +exynos_set_timer_source (BIT (2 ) |BIT (4 )); xxti_f =0 ; xusbxti_f =24000000 ; }
@@ -1154,7 +1153,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") .map_io = universal_map_io, .init_machine = universal_machine_init, .init_late = exynos_init_late, - .init_time = samsung_timer_init, + .init_time = exynos_init_time, .reserve = &universal_reserve, .restart = exynos4_restart,MACHINE_END
Signature · 1 line
1.8.2.1
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
Hi Kukjin,
Quoted 10 lines · On Wednesday 15 of May 2013 17:08:04 Tomasz Figa wrote:
This patch extends
exynos_init_time()function to handle Exynos4210 rev0 SoC, which differs in availability of system timers and needs different clocksource initialization.This makes it possible to use
exynos_init_time()function asinit_timecallback for all Exynos-based boards, includingUniversal_C210, which originally had to usesamsung_timer_init().Signed-off-by Tomasz Figa <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Quoted 7 lines
--- arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-exynos/common.h | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)
Could you pick this patch to your fixes branch?
This is a fix of a regression in handling Exynos4210 rev0 SoC (e.g. Universal C210 board) introduced by patches merged to 3.10.
Best regards,
Tomasz
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
Quoted 3 lines · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 19 lines · On Wednesday 15 of May 2013 17:08:04 Tomasz Figa wrote:
Quoted 10 lines
This patch extends
exynos_init_time()function to handle Exynos4210 rev0 SoC, which differs in availability of system timers and needs different clocksource initialization.This makes it possible to use
exynos_init_time()function asinit_timecallback for all Exynos-based boards, includingUniversal_C210, which originally had to usesamsung_timer_init().Signed-off-by Tomasz Figa <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Quoted 7 lines
--- arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-exynos/common.h | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)
Quoted 2 lines
Could you pick this patch to your fixes branch?
Yeah, I will after looking at.
Quoted 3 lines
This is a fix of a regression in handling Exynos4210 rev0 SoC (e.g. Universal C210 board) introduced by patches merged to 3.10.
OK, I see but I didn't review yet and I will within a couple of days ;-)
- Kukjin
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
In reply to Tomasz FigaQuoted 28 lines · Kukjin Kim
Quoted 3 lines · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 2 lines · On Wednesday 15 of May 2013 17:08:04 Tomasz Figa wrote:
Quoted 1 line
This patch extends
exynos_init_time()function to handle Exynos4210rev0
Quoted 1 line
Quoted 1 line
SoC, which differs in availability of system timers and needs
different
Quoted 16 lines
Quoted 15 lines
clocksource initialization.
This makes it possible to use
exynos_init_time()function asinit_timecallback for all Exynos-based boards, includingUniversal_C210, which originally had to usesamsung_timer_init().Signed-off-by Tomasz Figa <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-exynos/common.h | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)
Quoted 9 lines
Quoted 2 lines
Could you pick this patch to your fixes branch?
Yeah, I will after looking at.
Quoted 3 lines
This is a fix of a regression in handling Exynos4210 rev0 SoC (e.g. Universal C210 board) introduced by patches merged to 3.10.
OK, I see but I didn't review yet and I will within a couple of days ;-)
OK, looks fine, this will be sent to upstream during -rc for v3.10.
But, Tomasz, as you know, non-DT supporting files will be gone away in v3.11, just note.
Thanks.
- Kukjin
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
Hi Kukjin,
Quoted 37 lines · On Thursday 23 of May 2013 10:11:17 Kukjin Kim wrote:
Quoted 36 lines · Kukjin Kim
Quoted 1 line · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 2 lines · On Wednesday 15 of May 2013 17:08:04 Tomasz Figa wrote:
Quoted 1 line
This patch extends
exynos_init_time()function to handle Exynos4210rev0
Quoted 1 line
Quoted 1 line
SoC, which differs in availability of system timers and needs
different
Quoted 21 lines
Quoted 13 lines
clocksource initialization.
This makes it possible to use
exynos_init_time()function asinit_timecallback for all Exynos-based boards, includingUniversal_C210, which originally had to usesamsung_timer_init().Signed-off-by Tomasz Figa <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30Quoted 6 lines
+++++++++++++++++++++++++++++-
arch/arm/mach-exynos/common.h| 2 ++
arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)Could you pick this patch to your fixes branch?
Quoted 8 lines
Quoted 6 lines
Yeah, I will after looking at.
Quoted 2 lines
This is a fix of a regression in handling Exynos4210 rev0 SoC (e.g. Universal C210 board) introduced by patches merged to 3.10.
OK, I see but I didn't review yet and I will within a couple of days ;-)
OK, looks fine, this will be sent to upstream during -rc for v3.10.
Thanks.
Quoted 2 lines
But, Tomasz, as you know, non-DT supporting files will be gone away in v3.11, just note.
Sure. This is a good thing.
In 3.11 Universal C210 will be supported only using device tree, but for 3.10 we need this patch to make the old board file still work.
Best regards,
Signature · 4 lines
Tomasz Figa Linux Kernel Developer Samsung R&D Institute Poland Samsung Electronics
PATCH 1/1 ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
In reply to Kukjin KimHello,
Quoted 36 lines · Kukjin Kim
Quoted 35 lines · Kukjin Kim
Quoted 3 lines · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 2 lines · On Wednesday 15 of May 2013 17:08:04 Tomasz Figa wrote:
Quoted 1 line
This patch extends
exynos_init_time()function to handle Exynos4210rev0
Quoted 1 line
Quoted 1 line
SoC, which differs in availability of system timers and needs
different
Quoted 16 lines
Quoted 8 lines
clocksource initialization.
This makes it possible to use
exynos_init_time()function asinit_timecallback for all Exynos-based boards, includingUniversal_C210, which originally had to usesamsung_timer_init().Signed-off-by Tomasz Figa <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Quoted 7 lines
--- arch/arm/mach-exynos/Kconfig | 3 ++- arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-exynos/common.h | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 5 ++--- 4 files changed, 35 insertions(+), 5 deletions(-)Quoted 2 lines
Could you pick this patch to your fixes branch?
Yeah, I will after looking at.
Quoted 3 lines
This is a fix of a regression in handling Exynos4210 rev0 SoC (e.g. Universal C210 board) introduced by patches merged to 3.10.
Quoted 6 lines
Quoted 2 lines
OK, I see but I didn't review yet and I will within a couple of days ;-)
OK, looks fine, this will be sent to upstream during -rc for v3.10.
But, Tomasz, as you know, non-DT supporting files will be gone away in v3.11, just note.
This patch is needed to get REV0 4210 based board working both in DT and non-DT
modes.
Best regards
Signature · 2 lines
Marek Szyprowski Samsung R&D Institute Poland