aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/cpm_uart/cpm_uart_cpm2.h
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-07-17 17:59:06 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-10-03 20:36:35 -0500
commit7ae870368d198affa249ed3382a8a288167ce885 (patch)
tree8c8ee001f8b4e39ca45696938a7e4c2f9d0b243e /drivers/serial/cpm_uart/cpm_uart_cpm2.h
parenta94b89a4813bddf85c052f8d04021688c5dfe0d7 (diff)
downloadkernel_samsung_crespo-7ae870368d198affa249ed3382a8a288167ce885.zip
kernel_samsung_crespo-7ae870368d198affa249ed3382a8a288167ce885.tar.gz
kernel_samsung_crespo-7ae870368d198affa249ed3382a8a288167ce885.tar.bz2
[POWERPC] cpm_uart: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set.
The existing OF glue code was crufty and broken. Rather than fix it, it has been removed, and the serial driver now talks to the device tree directly. The non-CONFIG_PPC_CPM_NEW_BINDING code can go away once CPM platforms are dropped from arch/ppc (which will hopefully be soon), and existing arch/powerpc boards that I wasn't able to test on for this patchset get converted (which should be even sooner). Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_cpm2.h')
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm2.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index 1b3219f..e7717ec 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -13,12 +13,14 @@
#include <asm/cpm2.h>
/* defines for IRQs */
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
#define SMC1_IRQ SIU_INT_SMC1
#define SMC2_IRQ SIU_INT_SMC2
#define SCC1_IRQ SIU_INT_SCC1
#define SCC2_IRQ SIU_INT_SCC2
#define SCC3_IRQ SIU_INT_SCC3
#define SCC4_IRQ SIU_INT_SCC4
+#endif
static inline void cpm_set_brg(int brg, int baud)
{