From: Paul Bolle <pebolle@tiscali.nl> To: David Brown <davidb@codeaurora.org>, Daniel Walker <dwalker@fifo99.com>, Bryan Huntsman <bryanh@codeaurora.org>, Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: msm: rename two Kconfig macros Date: Thu, 15 May 2014 13:30:11 +0200 [thread overview] Message-ID: <1400153411.9119.7.camel@x220> (raw) Commit 650e3f0d66ad ("ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice") appears to have renamed MSM_DEBUG_UART1 MSM_DEBUG_UART2 MSM_DEBUG_UART3 to DEBUG_MSM_UART1 DEBUG_MSM_UART2 DEBUG_MSM_UART3 It missed a check for CONFIG_MSM_DEBUG_UART1 and a check for CONFIG_MSM_DEBUG_UART3 in the code. Rename these too. Fixes: 650e3f0d66ad ("ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice") Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested. These few lines were, well, broken since v3.3. Did no one notice? arch/arm/mach-msm/board-trout-gpio.c | 2 +- arch/arm/mach-msm/board-trout.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c index 87e1d01edecc..a92efc83cdb7 100644 --- a/arch/arm/mach-msm/board-trout-gpio.c +++ b/arch/arm/mach-msm/board-trout-gpio.c @@ -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_UART1) /* H2W pins <-> UART1 */ TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x40), #else diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index 015d544aa017..27121b391275 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -90,7 +90,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 +#ifdef CONFIG_DEBUG_MSM_UART3 /* route UART3 to the "H2W" extended usb connector */ writeb(0x80, TROUT_CPLD_BASE + 0x00); #endif -- 1.9.0
WARNING: multiple messages have this Message-ID (diff)
From: pebolle@tiscali.nl (Paul Bolle) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: msm: rename two Kconfig macros Date: Thu, 15 May 2014 13:30:11 +0200 [thread overview] Message-ID: <1400153411.9119.7.camel@x220> (raw) Commit 650e3f0d66ad ("ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice") appears to have renamed MSM_DEBUG_UART1 MSM_DEBUG_UART2 MSM_DEBUG_UART3 to DEBUG_MSM_UART1 DEBUG_MSM_UART2 DEBUG_MSM_UART3 It missed a check for CONFIG_MSM_DEBUG_UART1 and a check for CONFIG_MSM_DEBUG_UART3 in the code. Rename these too. Fixes: 650e3f0d66ad ("ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice") Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested. These few lines were, well, broken since v3.3. Did no one notice? arch/arm/mach-msm/board-trout-gpio.c | 2 +- arch/arm/mach-msm/board-trout.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c index 87e1d01edecc..a92efc83cdb7 100644 --- a/arch/arm/mach-msm/board-trout-gpio.c +++ b/arch/arm/mach-msm/board-trout-gpio.c @@ -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_UART1) /* H2W pins <-> UART1 */ TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x40), #else diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index 015d544aa017..27121b391275 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -90,7 +90,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 +#ifdef CONFIG_DEBUG_MSM_UART3 /* route UART3 to the "H2W" extended usb connector */ writeb(0x80, TROUT_CPLD_BASE + 0x00); #endif -- 1.9.0
next reply other threads:[~2014-05-15 11:30 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-05-15 11:30 Paul Bolle [this message] 2014-05-15 11:30 ` [PATCH] ARM: msm: rename two Kconfig macros Paul Bolle -- strict thread matches above, loose matches on Subject: below -- 2013-03-29 22:01 Paul Bolle 2013-03-29 22:01 ` Paul Bolle
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=1400153411.9119.7.camel@x220 \ --to=pebolle@tiscali.nl \ --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 \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ /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: linkBe 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.