mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
Merge branch 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
This commit is contained in:
commit
98bf55c4ab
3 changed files with 11 additions and 4 deletions
|
@ -44,8 +44,6 @@ struct mct_clock_event_device {
|
||||||
char name[10];
|
char name[10];
|
||||||
};
|
};
|
||||||
|
|
||||||
static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);
|
|
||||||
|
|
||||||
static void exynos4_mct_write(unsigned int value, void *addr)
|
static void exynos4_mct_write(unsigned int value, void *addr)
|
||||||
{
|
{
|
||||||
void __iomem *stat_addr;
|
void __iomem *stat_addr;
|
||||||
|
@ -264,6 +262,9 @@ static void exynos4_clockevent_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_LOCAL_TIMERS
|
#ifdef CONFIG_LOCAL_TIMERS
|
||||||
|
|
||||||
|
static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);
|
||||||
|
|
||||||
/* Clock event handling */
|
/* Clock event handling */
|
||||||
static void exynos4_mct_tick_stop(struct mct_clock_event_device *mevt)
|
static void exynos4_mct_tick_stop(struct mct_clock_event_device *mevt)
|
||||||
{
|
{
|
||||||
|
@ -428,9 +429,13 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt)
|
||||||
|
|
||||||
void local_timer_stop(struct clock_event_device *evt)
|
void local_timer_stop(struct clock_event_device *evt)
|
||||||
{
|
{
|
||||||
|
unsigned int cpu = smp_processor_id();
|
||||||
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
|
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
|
||||||
if (mct_int_type == MCT_INT_SPI)
|
if (mct_int_type == MCT_INT_SPI)
|
||||||
disable_irq(evt->irq);
|
if (cpu == 0)
|
||||||
|
remove_irq(evt->irq, &mct_tick0_event_irq);
|
||||||
|
else
|
||||||
|
remove_irq(evt->irq, &mct_tick1_event_irq);
|
||||||
else
|
else
|
||||||
disable_percpu_irq(IRQ_MCT_LOCALTIMER);
|
disable_percpu_irq(IRQ_MCT_LOCALTIMER);
|
||||||
}
|
}
|
||||||
|
@ -443,6 +448,7 @@ static void __init exynos4_timer_resources(void)
|
||||||
|
|
||||||
clk_rate = clk_get_rate(mct_clk);
|
clk_rate = clk_get_rate(mct_clk);
|
||||||
|
|
||||||
|
#ifdef CONFIG_LOCAL_TIMERS
|
||||||
if (mct_int_type == MCT_INT_PPI) {
|
if (mct_int_type == MCT_INT_PPI) {
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -452,6 +458,7 @@ static void __init exynos4_timer_resources(void)
|
||||||
WARN(err, "MCT: can't request IRQ %d (%d)\n",
|
WARN(err, "MCT: can't request IRQ %d (%d)\n",
|
||||||
IRQ_MCT_LOCALTIMER, err);
|
IRQ_MCT_LOCALTIMER, err);
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_LOCAL_TIMERS */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init exynos4_timer_init(void)
|
static void __init exynos4_timer_init(void)
|
||||||
|
|
|
@ -273,6 +273,7 @@ static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = {
|
||||||
|
|
||||||
static struct platform_pwm_backlight_data smdkv210_bl_data = {
|
static struct platform_pwm_backlight_data smdkv210_bl_data = {
|
||||||
.pwm_id = 3,
|
.pwm_id = 3,
|
||||||
|
.pwm_period_ns = 1000,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init smdkv210_map_io(void)
|
static void __init smdkv210_map_io(void)
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/pwm_backlight.h>
|
#include <linux/pwm_backlight.h>
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
|
Loading…
Reference in a new issue