Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cfe68e authored by Georgi Djakov's avatar Georgi Djakov Committed by Linus Walleij
Browse files

ARM: msm: Update the references to DEBUG_MSM_UARTx 



The Kconfig options DEBUG_MSM_UART1, DEBUG_MSM_UART2, DEBUG_MSM_UART3,
MSM_DEBUG_UART1, MSM_DEBUG_UART2 and MSM_DEBUG_UART3 are removed, but
they are still referenced in the following files:
	arch/arm/mach-msm/io.c,
	arch/arm/mach-msm/board-trout.c
	arch/arm/mach-msm/board-trout-gpio.c

Fix this by updating the reference to the new Kconfig option.

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarGeorgi Djakov <gdjakov@mm-sol.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 262334ae

arch/arm/mach-msm/board-trout-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 
	}



static struct msm_gpio_chip msm_gpio_banks[] = {

#if defined(CONFIG_MSM_DEBUG_UART1)

#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9a00000)

	/* H2W pins <-> UART1 */

	TROUT_GPIO_BANK("MISC2", 0x00,   TROUT_GPIO_MISC2_BASE, 0x40),

#else

arch/arm/mach-msm/board-trout.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void __init trout_map_io(void) 
	msm_map_common_io();

	iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc));



#ifdef CONFIG_MSM_DEBUG_UART3

#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9c00000)

	/* route UART3 to the "H2W" extended usb connector */

	writeb(0x80, TROUT_CPLD_BASE + 0x00);

#endif

arch/arm/mach-msm/io.c

+2 −4
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ static struct map_desc msm_io_desc[] __initdata = { 
		.length =   MSM_SHARED_RAM_SIZE,

		.type =     MT_DEVICE,

	},

#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \

		defined(CONFIG_DEBUG_MSM_UART3)

#if defined(CONFIG_DEBUG_MSM_UART)

	{

		/* Must be last: virtual and pfn filled in by debug_ll_addr() */

		.length = SZ_4K,
@@ -76,8 +75,7 @@ void __init msm_map_common_io(void) 
	 * pages are peripheral interface or not.

	 */

	asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0));

#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \

		defined(CONFIG_DEBUG_MSM_UART3)

#if defined(CONFIG_DEBUG_MSM_UART)

#ifdef CONFIG_MMU

	debug_ll_addr(&msm_io_desc[size - 1].pfn,

		      &msm_io_desc[size - 1].virtual);