diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 13:13:41 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 13:13:41 +1000 |
| commit | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (patch) | |
| tree | f427586e5a1fecd1a21d9f4a5e088f31363f5282 /arch/powerpc/sysdev | |
| parent | 6776426320e151051a16bc7bf86f12d310c9e8ca (diff) | |
| parent | 1dcd8ffc81e80a170625883f63f6a5db3cd0428d (diff) | |
| download | kernel_samsung_smdk4412-3c2ee2d9f41ef43a581b26b677d2b4054ccbd200.tar.gz kernel_samsung_smdk4412-3c2ee2d9f41ef43a581b26b677d2b4054ccbd200.tar.bz2 kernel_samsung_smdk4412-3c2ee2d9f41ef43a581b26b677d2b4054ccbd200.zip | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/gpio.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 95dbc643c4f..adca4affcf1 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -37,6 +37,7 @@ #include <asm/irq.h> #include <asm/time.h> #include <asm/prom.h> +#include <asm/machdep.h> #include <sysdev/fsl_soc.h> #include <mm/mmu_decl.h> #include <asm/cpm2.h> @@ -383,8 +384,9 @@ static int __init setup_rstcr(void) if (!rstcr) printk (KERN_EMERG "Error: reset control register " "not mapped!\n"); - } else - printk (KERN_INFO "rstcr compatible register does not exist!\n"); + } else if (ppc_md.restart == fsl_rstcr_restart) + printk(KERN_ERR "No RSTCR register, warm reboot won't work\n"); + if (np) of_node_put(np); return 0; diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c index 3485288dce3..8e7a7767dd5 100644 --- a/arch/powerpc/sysdev/qe_lib/gpio.c +++ b/arch/powerpc/sysdev/qe_lib/gpio.c @@ -105,14 +105,14 @@ static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc); unsigned long flags; + qe_gpio_set(gc, gpio, val); + spin_lock_irqsave(&qe_gc->lock, flags); __par_io_config_pin(mm_gc->regs, gpio, QE_PIO_DIR_OUT, 0, 0, 0); spin_unlock_irqrestore(&qe_gc->lock, flags); - qe_gpio_set(gc, gpio, val); - return 0; } |