From cdaf29cfd8d76bc6133b1a1d127d029a966df66c Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Mon, 6 Feb 2012 13:19:19 +0100 Subject: ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4 Different boards may use differenct UART ports for debugging. To be able to add different debug UART configurations (e.g. UART2), rename the existing general DEBUG_IMX6Q_UART to DEBUG_IMX6Q_UART4. Signed-off-by: Dirk Behme Signed-off-by: Shawn Guo --- arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/plat-mxc') diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 6e192c4..8ddda36 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S @@ -24,7 +24,7 @@ #define UART_PADDR MX51_UART1_BASE_ADDR #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) #define UART_PADDR MX53_UART1_BASE_ADDR -#elif defined (CONFIG_DEBUG_IMX6Q_UART) +#elif defined (CONFIG_DEBUG_IMX6Q_UART4) #define UART_PADDR MX6Q_UART4_BASE_ADDR #endif -- cgit v1.1 From 89857353f9264785517393753ec9e77dba144734 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 2 Feb 2012 10:12:00 +0800 Subject: ARM: mxc: make imx_dma_is_general_purpose more generic for sdma sdma device names vary for different SoC. So we just check whether it includes "sdma" substring. Signed-off-by: Richard Zhao Acked-by: Sascha Hauer Signed-off-by: Shawn Guo --- arch/arm/plat-mxc/include/mach/dma.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/plat-mxc') diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h index 233d0a5..1b90803 100644 --- a/arch/arm/plat-mxc/include/mach/dma.h +++ b/arch/arm/plat-mxc/include/mach/dma.h @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || + return strstr(dev_name(chan->device->dev), "sdma") || !strcmp(dev_name(chan->device->dev), "imx-dma"); } -- cgit v1.1