[PATCH 0/3] minor MSM cleanup

[PATCH 0/3] minor MSM cleanup

[Linus Walleij]

Hi MSM folks,

here are some weird things I found when looking through the mach-msm
folder, can you have a look at this and see if it's as unused as it
looks to me?

Linus Walleij (3):
  ARM: msm: delete dangling mahimahi board file
  ARM: msm: remove reference to MSM_SERIAL_DEBUGGER
  ARM: msm: delete dangling debug UART code

 arch/arm/mach-msm/board-mahimahi.c   | 83 ------------------------------------
 arch/arm/mach-msm/board-msm7x30.c    |  2 +-
 arch/arm/mach-msm/board-trout-gpio.c |  5 ---
 arch/arm/mach-msm/board-trout.c      |  5 ---
 4 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-mahimahi.c

-- 
1.9.3

[PATCH 0/3] minor MSM cleanup

[Linus Walleij]

Hi MSM folks,

here are some weird things I found when looking through the mach-msm
folder, can you have a look at this and see if it's as unused as it
looks to me?

Linus Walleij (3):
  ARM: msm: delete dangling mahimahi board file
  ARM: msm: remove reference to MSM_SERIAL_DEBUGGER
  ARM: msm: delete dangling debug UART code

 arch/arm/mach-msm/board-mahimahi.c   | 83 ------------------------------------
 arch/arm/mach-msm/board-msm7x30.c    |  2 +-
 arch/arm/mach-msm/board-trout-gpio.c |  5 ---
 arch/arm/mach-msm/board-trout.c      |  5 ---
 4 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-mahimahi.c

-- 
1.9.3

[PATCH 1/3] ARM: msm: delete dangling mahimahi board file

[Linus Walleij]

This board file is not compiled, and includes header files that
do not even exist so it can't be made to compile easily either.
I assume it is a merge mistake, thus deleting it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-mahimahi.c | 83 --------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-mahimahi.c

diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c
deleted file mode 100644
index 873c3ca3cd7e..000000000000
--- a/arch/arm/mach-msm/board-mahimahi.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* linux/arch/arm/mach-msm/board-mahimahi.c
- *
- * Copyright (C) 2009 Google, Inc.
- * Copyright (C) 2009 HTC Corporation.
- * Author: Dima Zavin <dima@android.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/memblock.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-
-#include <mach/hardware.h>
-
-#include "board-mahimahi.h"
-#include "devices.h"
-#include "proc_comm.h"
-#include "common.h"
-
-static uint debug_uart;
-
-module_param_named(debug_uart, debug_uart, uint, 0);
-
-static struct platform_device *devices[] __initdata = {
-#if !defined(CONFIG_MSM_SERIAL_DEBUGGER)
-	&msm_device_uart1,
-#endif
-	&msm_device_uart_dm1,
-	&msm_device_nand,
-};
-
-static void __init mahimahi_init(void)
-{
-	platform_add_devices(devices, ARRAY_SIZE(devices));
-}
-
-static void __init mahimahi_fixup(struct tag *tags, char **cmdline)
-{
-	memblock_add(PHYS_OFFSET, 219*SZ_1M);
-	memblock_add(MSM_HIGHMEM_BASE, MSM_HIGHMEM_SIZE);
-}
-
-static void __init mahimahi_map_io(void)
-{
-	msm_map_common_io();
-	msm_clock_init();
-}
-
-static void __init mahimahi_init_late(void)
-{
-	smd_debugfs_init();
-}
-
-void msm_timer_init(void);
-
-MACHINE_START(MAHIMAHI, "mahimahi")
-	.atag_offset	= 0x100,
-	.fixup		= mahimahi_fixup,
-	.map_io		= mahimahi_map_io,
-	.init_irq	= msm_init_irq,
-	.init_machine	= mahimahi_init,
-	.init_late	= mahimahi_init_late,
-	.init_time	= msm_timer_init,
-MACHINE_END
-- 
1.9.3

[PATCH 1/3] ARM: msm: delete dangling mahimahi board file

[Linus Walleij]

This board file is not compiled, and includes header files that
do not even exist so it can't be made to compile easily either.
I assume it is a merge mistake, thus deleting it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-mahimahi.c | 83 --------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-mahimahi.c

diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c
deleted file mode 100644
index 873c3ca3cd7e..000000000000
--- a/arch/arm/mach-msm/board-mahimahi.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* linux/arch/arm/mach-msm/board-mahimahi.c
- *
- * Copyright (C) 2009 Google, Inc.
- * Copyright (C) 2009 HTC Corporation.
- * Author: Dima Zavin <dima@android.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/memblock.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-
-#include <mach/hardware.h>
-
-#include "board-mahimahi.h"
-#include "devices.h"
-#include "proc_comm.h"
-#include "common.h"
-
-static uint debug_uart;
-
-module_param_named(debug_uart, debug_uart, uint, 0);
-
-static struct platform_device *devices[] __initdata = {
-#if !defined(CONFIG_MSM_SERIAL_DEBUGGER)
-	&msm_device_uart1,
-#endif
-	&msm_device_uart_dm1,
-	&msm_device_nand,
-};
-
-static void __init mahimahi_init(void)
-{
-	platform_add_devices(devices, ARRAY_SIZE(devices));
-}
-
-static void __init mahimahi_fixup(struct tag *tags, char **cmdline)
-{
-	memblock_add(PHYS_OFFSET, 219*SZ_1M);
-	memblock_add(MSM_HIGHMEM_BASE, MSM_HIGHMEM_SIZE);
-}
-
-static void __init mahimahi_map_io(void)
-{
-	msm_map_common_io();
-	msm_clock_init();
-}
-
-static void __init mahimahi_init_late(void)
-{
-	smd_debugfs_init();
-}
-
-void msm_timer_init(void);
-
-MACHINE_START(MAHIMAHI, "mahimahi")
-	.atag_offset	= 0x100,
-	.fixup		= mahimahi_fixup,
-	.map_io		= mahimahi_map_io,
-	.init_irq	= msm_init_irq,
-	.init_machine	= mahimahi_init,
-	.init_late	= mahimahi_init_late,
-	.init_time	= msm_timer_init,
-MACHINE_END
-- 
1.9.3

[PATCH 2/3] ARM: msm: remove reference to MSM_SERIAL_DEBUGGER

[Linus Walleij]

This is a dangling symbol in the kernel: there is no config option
for the MSM_SERIAL_DEBUGGER anywhere in the kernel.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-msm7x30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 245884319d2e..8f5ecdc4f3ce 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -124,7 +124,7 @@ struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
 static struct platform_device *devices[] __initdata = {
 	&msm_clock_7x30,
 	&msm_device_gpio_7x30,
-#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
+#if defined(CONFIG_SERIAL_MSM)
         &msm_device_uart2,
 #endif
 	&msm_device_smd,
-- 
1.9.3

[PATCH 2/3] ARM: msm: remove reference to MSM_SERIAL_DEBUGGER

[Linus Walleij]

This is a dangling symbol in the kernel: there is no config option
for the MSM_SERIAL_DEBUGGER anywhere in the kernel.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-msm/board-msm7x30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 245884319d2e..8f5ecdc4f3ce 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -124,7 +124,7 @@ struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
 static struct platform_device *devices[] __initdata = {
 	&msm_clock_7x30,
 	&msm_device_gpio_7x30,
-#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
+#if defined(CONFIG_SERIAL_MSM)
         &msm_device_uart2,
 #endif
 	&msm_device_smd,
-- 
1.9.3

[PATCH 3/3] ARM: msm: delete dangling debug UART code

[Linus Walleij]

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

[PATCH 3/3] ARM: msm: delete dangling debug UART code

[Linus Walleij]

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

Re: [PATCH 3/3] ARM: msm: delete dangling debug UART code

[Georgi Djakov]

Hi,

On 07/08/2014 06:11 PM, Linus Walleij wrote:
> 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.
>

I have sent a similar patch: https://lkml.org/lkml/2014/5/26/406

Thanks,
Georgi

[PATCH 3/3] ARM: msm: delete dangling debug UART code

[Georgi Djakov]

Hi,

On 07/08/2014 06:11 PM, Linus Walleij wrote:
> 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.
>

I have sent a similar patch: https://lkml.org/lkml/2014/5/26/406

Thanks,
Georgi

Re: [PATCH 3/3] ARM: msm: delete dangling debug UART code

[Linus Walleij]

On Tue, Jul 8, 2014 at 6:09 PM, Georgi Djakov <gdjakov@mm-sol.com> wrote:
> On 07/08/2014 06:11 PM, Linus Walleij wrote:
>>
>> 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.
>
> I have sent a similar patch: https://lkml.org/lkml/2014/5/26/406

OK I trashed this patch and applied your patch on top of the others instead.

I'll send a pull request for the sum total to ARM SoC soon-ish so this
doesn't fall to the floor.

Yours,
Linus Walleij

[PATCH 3/3] ARM: msm: delete dangling debug UART code

[Linus Walleij]

On Tue, Jul 8, 2014 at 6:09 PM, Georgi Djakov <gdjakov@mm-sol.com> wrote:
> On 07/08/2014 06:11 PM, Linus Walleij wrote:
>>
>> 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.
>
> I have sent a similar patch: https://lkml.org/lkml/2014/5/26/406

OK I trashed this patch and applied your patch on top of the others instead.

I'll send a pull request for the sum total to ARM SoC soon-ish so this
doesn't fall to the floor.

Yours,
Linus Walleij

Re: [PATCH 1/3] ARM: msm: delete dangling mahimahi board file

[dwalker]

Already was submitted by someoen else.


https://lkml.org/lkml/2014/5/14/631

[PATCH 1/3] ARM: msm: delete dangling mahimahi board file

[dwalker at fifo99.com]

Already was submitted by someoen else.


https://lkml.org/lkml/2014/5/14/631