All of lore.kernel.org
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
	linux-arm-msm@vger.kernel.org, Daniel Walker <dwalker@fifo99.com>
Cc: David Brown <davidb@codeaurora.org>,
	Bryan Huntsman <bryanh@codeaurora.org>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 3/3] ARM: msm: delete dangling debug UART code
Date: Tue,  8 Jul 2014 17:11:43 +0200	[thread overview]
Message-ID: <1404832303-14850-4-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org>

The config symbols CONFIG_MSM_DEBUG_UART1 and *UART3 are used
in the Trout board code, but these symbols are not defined anywhere
in the kernel so cleaning them out.

This is not to be confused with CONFIG_DEBUG_MSM_UART1 and
CONFIG_DEBUG_MSM_UART2 which do exist.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-trout-gpio.c | 5 -----
 arch/arm/mach-msm/board-trout.c      | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index 2c25050209ce..cc3f26a64f81 100644
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -94,13 +94,8 @@ 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)
-	/* H2W pins <-> UART1 */
-	TROUT_GPIO_BANK("MISC2", 0x00,   TROUT_GPIO_MISC2_BASE, 0x40),
-#else
 	/* H2W pins <-> UART3, Bluetooth <-> UART1 */
 	TROUT_GPIO_BANK("MISC2", 0x00,   TROUT_GPIO_MISC2_BASE, 0x80),
-#endif
 	/* I2C pull */
 	TROUT_GPIO_BANK("MISC3", 0x02,   TROUT_GPIO_MISC3_BASE, 0x04),
 	TROUT_GPIO_BANK("MISC4", 0x04,   TROUT_GPIO_MISC4_BASE, 0),
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index f72b07de2152..96226570715f 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -87,11 +87,6 @@ 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
-	/* route UART3 to the "H2W" extended usb connector */
-	writeb(0x80, TROUT_CPLD_BASE + 0x00);
-#endif
 }
 
 static void __init trout_init_late(void)
-- 
1.9.3

WARNING: multiple messages have this Message-ID (diff)
From: linus.walleij@linaro.org (Linus Walleij)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: msm: delete dangling debug UART code
Date: Tue,  8 Jul 2014 17:11:43 +0200	[thread overview]
Message-ID: <1404832303-14850-4-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org>

The config symbols CONFIG_MSM_DEBUG_UART1 and *UART3 are used
in the Trout board code, but these symbols are not defined anywhere
in the kernel so cleaning them out.

This is not to be confused with CONFIG_DEBUG_MSM_UART1 and
CONFIG_DEBUG_MSM_UART2 which do exist.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-trout-gpio.c | 5 -----
 arch/arm/mach-msm/board-trout.c      | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index 2c25050209ce..cc3f26a64f81 100644
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -94,13 +94,8 @@ 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)
-	/* H2W pins <-> UART1 */
-	TROUT_GPIO_BANK("MISC2", 0x00,   TROUT_GPIO_MISC2_BASE, 0x40),
-#else
 	/* H2W pins <-> UART3, Bluetooth <-> UART1 */
 	TROUT_GPIO_BANK("MISC2", 0x00,   TROUT_GPIO_MISC2_BASE, 0x80),
-#endif
 	/* I2C pull */
 	TROUT_GPIO_BANK("MISC3", 0x02,   TROUT_GPIO_MISC3_BASE, 0x04),
 	TROUT_GPIO_BANK("MISC4", 0x04,   TROUT_GPIO_MISC4_BASE, 0),
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index f72b07de2152..96226570715f 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -87,11 +87,6 @@ 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
-	/* route UART3 to the "H2W" extended usb connector */
-	writeb(0x80, TROUT_CPLD_BASE + 0x00);
-#endif
 }
 
 static void __init trout_init_late(void)
-- 
1.9.3

  parent reply	other threads:[~2014-07-08 15:14 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-08 15:11 [PATCH 0/3] minor MSM cleanup Linus Walleij
2014-07-08 15:11 ` Linus Walleij
2014-07-08 15:11 ` [PATCH 1/3] ARM: msm: delete dangling mahimahi board file Linus Walleij
2014-07-08 15:11   ` Linus Walleij
2014-07-14 23:43   ` dwalker
2014-07-14 23:43     ` dwalker at fifo99.com
2014-07-08 15:11 ` [PATCH 2/3] ARM: msm: remove reference to MSM_SERIAL_DEBUGGER Linus Walleij
2014-07-08 15:11   ` Linus Walleij
2014-07-08 15:11 ` Linus Walleij [this message]
2014-07-08 15:11   ` [PATCH 3/3] ARM: msm: delete dangling debug UART code Linus Walleij
2014-07-08 16:09   ` Georgi Djakov
2014-07-08 16:09     ` Georgi Djakov
2014-07-10  9:09     ` Linus Walleij
2014-07-10  9:09       ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1404832303-14850-4-git-send-email-linus.walleij@linaro.org \
    --to=linus.walleij@linaro.org \
    --cc=bryanh@codeaurora.org \
    --cc=davidb@codeaurora.org \
    --cc=dwalker@fifo99.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.