History

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: OMAP: rx51: fix USB ARM: OMAP: mcbsp: Fix possible memory corruption arm/imx: fix power button on imx51 babbage board ARM: imx: fix cpufreq build errors ARM: mx5: add __initconst for fec pdata MXC PWM: should active during DOZE/WAIT/DBG mode ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS ARM: EXYNOS: Fix for stall in case of cpu hotplug or sleep ARM: S5PV210: Set 1000ns as PWM backlight period on SMDKV210 ARM: SAMSUNG: remove duplicated header include

Linus Torvalds committed 14 years ago

Commit 3f5fcf62 parents b0d78ee 98bf55c11 files · +26 −13Browse files

Unified · Split

11 files
  1. arch/arm/mach-exynos/mct.c +10 −3
  2. arch/arm/mach-mx5/board-mx51_babbage.c +1 −1
  3. arch/arm/mach-mx5/board-mx53_evk.c +1 −1
  4. arch/arm/mach-mx5/board-mx53_loco.c +1 −1
  5. arch/arm/mach-mx5/board-mx53_smd.c +1 −1
  6. arch/arm/mach-omap2/board-rx51-peripherals.c +1 −1
  7. arch/arm/mach-omap2/mcbsp.c +3 −3
  8. arch/arm/mach-s5pv210/mach-smdkv210.c +1 −0
  9. arch/arm/plat-mxc/cpufreq.c +1 −0
  10. arch/arm/plat-mxc/pwm.c +6 −1
  11. arch/arm/plat-samsung/dev-backlight.c +0 −1
arch/arm/mach-exynos/mct.c+10−3
@@ -44,8 +44,6 @@ struct mct_clock_event_device { · 43 unmodified lines
4444 char name[10];
4545 };
4646
47−static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);
48−
4947 static void exynos4_mct_write(unsigned int value, void *addr)
5048 {
5149 void __iomem *stat_addr;
@@ -264,6 +262,9 @@ static void exynos4_clockevent_init(void) · 212 unmodified lines
264262 }
265263
266264 #ifdef CONFIG_LOCAL_TIMERS
265+
266+static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);
267+
267268 /* Clock event handling */
268269 static void exynos4_mct_tick_stop(struct mct_clock_event_device *mevt)
269270 {
@@ -428,9 +429,13 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) · 158 unmodified lines
428429
429430 void local_timer_stop(struct clock_event_device *evt)
430431 {
432+ unsigned int cpu = smp_processor_id();
431433 evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
432434 if (mct_int_type == MCT_INT_SPI)
433− disable_irq(evt->irq);
435+ if (cpu == 0)
436+ remove_irq(evt->irq, &mct_tick0_event_irq);
437+ else
438+ remove_irq(evt->irq, &mct_tick1_event_irq);
434439 else
435440 disable_percpu_irq(IRQ_MCT_LOCALTIMER);
436441 }
@@ -443,6 +448,7 @@ static void __init exynos4_timer_resources(void) · 6 unmodified lines
443448
444449 clk_rate = clk_get_rate(mct_clk);
445450
451+#ifdef CONFIG_LOCAL_TIMERS
446452 if (mct_int_type == MCT_INT_PPI) {
447453 int err;
448454
@@ -452,6 +458,7 @@ static void __init exynos4_timer_resources(void) · 3 unmodified lines
452458 WARN(err, "MCT: can't request IRQ %d (%d)\n",
453459 IRQ_MCT_LOCALTIMER, err);
454460 }
461+#endif /* CONFIG_LOCAL_TIMERS */
455462 }
456463
457464 static void __init exynos4_timer_init(void)
arch/arm/mach-mx5/board-mx51_babbage.c+1−1
@@ -362,7 +362,7 @@ static void __init mx51_babbage_init(void) · 361 unmodified lines
362362 {
363363 iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
364364 iomux_v3_cfg_t power_key = NEW_PAD_CTRL(MX51_PAD_EIM_A27__GPIO2_21,
365− PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP);
365+ PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH);
366366
367367 imx51_soc_init();
368368
arch/arm/mach-mx5/board-mx53_evk.c+1−1
@@ -106,7 +106,7 @@ static inline void mx53_evk_fec_reset(void) · 105 unmodified lines
106106 gpio_set_value(MX53_EVK_FEC_PHY_RST, 1);
107107 }
108108
109−static struct fec_platform_data mx53_evk_fec_pdata = {
109+static const struct fec_platform_data mx53_evk_fec_pdata __initconst = {
110110 .phy = PHY_INTERFACE_MODE_RMII,
111111 };
112112
arch/arm/mach-mx5/board-mx53_loco.c+1−1
@@ -242,7 +242,7 @@ static inline void mx53_loco_fec_reset(void) · 241 unmodified lines
242242 gpio_set_value(LOCO_FEC_PHY_RST, 1);
243243 }
244244
245−static struct fec_platform_data mx53_loco_fec_data = {
245+static const struct fec_platform_data mx53_loco_fec_data __initconst = {
246246 .phy = PHY_INTERFACE_MODE_RMII,
247247 };
248248
arch/arm/mach-mx5/board-mx53_smd.c+1−1
@@ -104,7 +104,7 @@ static inline void mx53_smd_fec_reset(void) · 103 unmodified lines
104104 gpio_set_value(SMD_FEC_PHY_RST, 1);
105105 }
106106
107−static struct fec_platform_data mx53_smd_fec_data = {
107+static const struct fec_platform_data mx53_smd_fec_data __initconst = {
108108 .phy = PHY_INTERFACE_MODE_RMII,
109109 };
110110
arch/arm/mach-omap2/board-rx51-peripherals.c+1−1
@@ -193,7 +193,7 @@ static struct platform_device rx51_charger_device = { · 192 unmodified lines
193193 static void __init rx51_charger_init(void)
194194 {
195195 WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
196− GPIOF_OUT_INIT_LOW, "isp1704_reset"));
196+ GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
197197
198198 platform_device_register(&rx51_charger_device);
199199 }
arch/arm/mach-omap2/mcbsp.c+3−3
@@ -145,6 +145,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) · 144 unmodified lines
145145 pdata->reg_size = 4;
146146 pdata->has_ccr = true;
147147 }
148+ pdata->set_clk_src = omap2_mcbsp_set_clk_src;
149+ if (id == 1)
150+ pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;
148151
149152 if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
150153 if (id == 2)
@@ -174,9 +177,6 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) · 23 unmodified lines
174177 name, oh->name);
175178 return PTR_ERR(pdev);
176179 }
177− pdata->set_clk_src = omap2_mcbsp_set_clk_src;
178− if (id == 1)
179− pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;
180180 omap_mcbsp_count++;
181181 return 0;
182182 }
arch/arm/mach-s5pv210/mach-smdkv210.c+1−0
@@ -273,6 +273,7 @@ static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = { · 272 unmodified lines
273273
274274 static struct platform_pwm_backlight_data smdkv210_bl_data = {
275275 .pwm_id = 3,
276+ .pwm_period_ns = 1000,
276277 };
277278
278279 static void __init smdkv210_map_io(void)
arch/arm/plat-mxc/cpufreq.c+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 * the CPU clock speed on the fly.
1818 */
1919
20+#include <linux/module.h>
2021 #include <linux/cpufreq.h>
2122 #include <linux/clk.h>
2223 #include <linux/err.h>
arch/arm/plat-mxc/pwm.c+6−1
@@ -32,6 +32,9 @@ · 31 unmodified lines
3232 #define MX3_PWMSAR 0x0C /* PWM Sample Register */
3333 #define MX3_PWMPR 0x10 /* PWM Period Register */
3434 #define MX3_PWMCR_PRESCALER(x) (((x - 1) & 0xFFF) << 4)
35+#define MX3_PWMCR_DOZEEN (1 << 24)
36+#define MX3_PWMCR_WAITEN (1 << 23)
37+#define MX3_PWMCR_DBGEN (1 << 22)
3538 #define MX3_PWMCR_CLKSRC_IPG_HIGH (2 << 16)
3639 #define MX3_PWMCR_CLKSRC_IPG (1 << 16)
3740 #define MX3_PWMCR_EN (1 << 0)
@@ -77,7 +80,9 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) · 39 unmodified lines
7780 writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR);
7881 writel(period_cycles, pwm->mmio_base + MX3_PWMPR);
7982
80− cr = MX3_PWMCR_PRESCALER(prescale) | MX3_PWMCR_EN;
83+ cr = MX3_PWMCR_PRESCALER(prescale) |
84+ MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
85+ MX3_PWMCR_DBGEN | MX3_PWMCR_EN;
8186
8287 if (cpu_is_mx25())
8388 cr |= MX3_PWMCR_CLKSRC_IPG;
arch/arm/plat-samsung/dev-backlight.c+0−1
@@ -15,7 +15,6 @@ · 14 unmodified lines
1515 #include <linux/slab.h>
1616 #include <linux/io.h>
1717 #include <linux/pwm_backlight.h>
18−#include <linux/slab.h>
1918
2019 #include <plat/devs.h>
2120 #include <plat/gpio-cfg.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t