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

Commit 647f95fa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'msm-cleanup-for-arm-soc' of... 

Merge tag 'msm-cleanup-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup

Merge "MSM cleanups" from Linus Walleij:

This cleans out some cruft code in the MSM architecture.

* tag 'msm-cleanup-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: msm: Update the references to DEBUG_MSM_UARTx
  ARM: msm: remove reference to MSM_SERIAL_DEBUGGER
  ARM: msm: delete dangling mahimahi board file

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fff74a93 77cfe68e

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

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
/* 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

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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);