* [PATCH] ARM: msm: rename two Kconfig macros
@ 2013-03-29 22:01 ` Paul Bolle
0 siblings, 0 replies; 4+ messages in thread
From: Paul Bolle @ 2013-03-29 22:01 UTC (permalink / raw)
To: David Brown, Daniel Walker, Bryan Huntsman, Russell King
Cc: Stephen Boyd, linux-arm-kernel, linux-arm-msm, linux-kernel
Commit 650e3f0d66ade2a614d854765dae3bbc9a87f58d ("ARM: msm: Consolidate
and move DEBUG_LL to DEBUG_LL choice") renamed the Kconfig symbols
MSM_DEBUG_UART1, MSM_DEBUG_UART2, and MSM_DEBUG_UART3 to
DEBUG_MSM_UART1, etc. It also added some references to
CONFIG_DEBUG_MSM_UART1, etc. It did not, however, rename the two
existing references to CONFIG_MSM_DEBUG_UART1 and
CONFIG_MSM_DEBUG_UART3. Do so now.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Untested.
1) Would there actually be a readable way to write this commit
explanation? This explanation even confuses me! I guess it's just a
confusing matter.
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 87e1d01..a92efc8 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 919bfa3..02e0dd7 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -89,7 +89,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.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: msm: rename two Kconfig macros
@ 2013-03-29 22:01 ` Paul Bolle
0 siblings, 0 replies; 4+ messages in thread
From: Paul Bolle @ 2013-03-29 22:01 UTC (permalink / raw)
To: linux-arm-kernel
Commit 650e3f0d66ade2a614d854765dae3bbc9a87f58d ("ARM: msm: Consolidate
and move DEBUG_LL to DEBUG_LL choice") renamed the Kconfig symbols
MSM_DEBUG_UART1, MSM_DEBUG_UART2, and MSM_DEBUG_UART3 to
DEBUG_MSM_UART1, etc. It also added some references to
CONFIG_DEBUG_MSM_UART1, etc. It did not, however, rename the two
existing references to CONFIG_MSM_DEBUG_UART1 and
CONFIG_MSM_DEBUG_UART3. Do so now.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Untested.
1) Would there actually be a readable way to write this commit
explanation? This explanation even confuses me! I guess it's just a
confusing matter.
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 87e1d01..a92efc8 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 919bfa3..02e0dd7 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -89,7 +89,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.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: msm: rename two Kconfig macros
@ 2014-05-15 11:30 ` Paul Bolle
0 siblings, 0 replies; 4+ messages in thread
From: Paul Bolle @ 2014-05-15 11:30 UTC (permalink / raw)
To: David Brown, Daniel Walker, Bryan Huntsman, Russell King
Cc: linux-arm-kernel, linux-arm-msm, linux-kernel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: msm: rename two Kconfig macros
@ 2014-05-15 11:30 ` Paul Bolle
0 siblings, 0 replies; 4+ messages in thread
From: Paul Bolle @ 2014-05-15 11:30 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-15 11:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-29 22:01 [PATCH] ARM: msm: rename two Kconfig macros Paul Bolle
2013-03-29 22:01 ` Paul Bolle
2014-05-15 11:30 Paul Bolle
2014-05-15 11:30 ` Paul Bolle
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.