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

Commit 0607fa58 authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Remove non-DT targets from 8960 



Remove the non-DT targets supported by 8960. This makes 8960 a
device tree only target.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent c446407c

arch/arm/mach-msm/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ config ARCH_MSM8X60 
config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_SCORPIONMP

	select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)

	select ARM_GIC

	select CPU_V7

	select MSM_V2_TLMM
@@ -112,18 +111,6 @@ config MACH_QSD8X50A_ST1_5 
	help

	  Support for the Qualcomm ST1.5.



config MACH_MSM8960_SIM

	depends on ARCH_MSM8960

	bool "MSM8960 Simulator"

	help

	  Support for the Qualcomm MSM8960 simulator.



config MACH_MSM8960_RUMI3

	depends on ARCH_MSM8960

	bool "MSM8960 RUMI3"

	help

	  Support for the Qualcomm MSM8960 RUMI3 emulator.



endmenu



config MSM_SMD_PKG3

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o 
obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o

obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o

obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o

obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o

obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o



obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o

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

deleted100644 → 0
+0 −110
Original line number Diff line number Diff line 
/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 *

 */

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/clkdev.h>

#include <linux/memblock.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>

#include <asm/setup.h>



#include <mach/board.h>

#include <mach/msm_iomap.h>



#include "devices.h"

#include "common.h"



static void __init msm8960_fixup(struct tag *tag, char **cmdline,

		struct meminfo *mi)

{

	for (; tag->hdr.size; tag = tag_next(tag))

		if (tag->hdr.tag == ATAG_MEM &&

				tag->u.mem.start == 0x40200000) {

			tag->u.mem.start = 0x40000000;

			tag->u.mem.size += SZ_2M;

		}

}



static void __init msm8960_reserve(void)

{

	memblock_remove(0x40000000, SZ_2M);

}



static void __init msm8960_map_io(void)

{

	msm_map_msm8960_io();

}



static void __init msm8960_init_irq(void)

{

	gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE,

		 (void *)MSM_QGIC_CPU_BASE);



	if (machine_is_msm8960_rumi3())

		writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);

}



static struct platform_device *sim_devices[] __initdata = {

	&msm8960_device_uart_gsbi2,

};



static struct platform_device *rumi3_devices[] __initdata = {

	&msm8960_device_uart_gsbi5,

};



static void __init msm8960_sim_init(void)

{

	platform_add_devices(sim_devices, ARRAY_SIZE(sim_devices));

}



static void __init msm8960_rumi3_init(void)

{

	platform_add_devices(rumi3_devices, ARRAY_SIZE(rumi3_devices));

}



static void __init msm8960_init_late(void)

{

	smd_debugfs_init();

}



MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")

	.fixup = msm8960_fixup,

	.reserve = msm8960_reserve,

	.map_io = msm8960_map_io,

	.init_irq = msm8960_init_irq,

	.timer = &msm8960_timer,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8960_sim_init,

	.init_late = msm8960_init_late,

MACHINE_END



MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")

	.fixup = msm8960_fixup,

	.reserve = msm8960_reserve,

	.map_io = msm8960_map_io,

	.init_irq = msm8960_init_irq,

	.timer = &msm8960_timer,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8960_rumi3_init,

	.init_late = msm8960_init_late,

MACHINE_END

arch/arm/mach-msm/common.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


extern struct sys_timer msm7x01_timer;

extern struct sys_timer msm7x30_timer;

extern struct sys_timer msm8960_timer;

extern struct sys_timer msm_dt_timer;

extern struct sys_timer qsd8x50_timer;

arch/arm/mach-msm/devices-msm8960.c

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 */



#include <linux/kernel.h>

#include <linux/platform_device.h>



#include <linux/dma-mapping.h>

#include <mach/irqs-8960.h>

#include <mach/board.h>



#include "devices.h"



#define MSM_GSBI2_PHYS		0x16100000

#define MSM_UART2DM_PHYS	(MSM_GSBI2_PHYS + 0x40000)



#define MSM_GSBI5_PHYS		0x16400000

#define MSM_UART5DM_PHYS	(MSM_GSBI5_PHYS + 0x40000)



static struct resource resources_uart_gsbi2[] = {

	{

		.start	= GSBI2_UARTDM_IRQ,

		.end	= GSBI2_UARTDM_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= MSM_UART2DM_PHYS,

		.end	= MSM_UART2DM_PHYS + PAGE_SIZE - 1,

		.name	= "uart_resource",

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MSM_GSBI2_PHYS,

		.end	= MSM_GSBI2_PHYS + PAGE_SIZE - 1,

		.name	= "gsbi_resource",

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device msm8960_device_uart_gsbi2 = {

	.name	= "msm_serial",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(resources_uart_gsbi2),

	.resource	= resources_uart_gsbi2,

};



static struct resource resources_uart_gsbi5[] = {

	{

		.start	= GSBI5_UARTDM_IRQ,

		.end	= GSBI5_UARTDM_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= MSM_UART5DM_PHYS,

		.end	= MSM_UART5DM_PHYS + PAGE_SIZE - 1,

		.name	= "uart_resource",

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MSM_GSBI5_PHYS,

		.end	= MSM_GSBI5_PHYS + PAGE_SIZE - 1,

		.name	= "gsbi_resource",

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device msm8960_device_uart_gsbi5 = {

	.name	= "msm_serial",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(resources_uart_gsbi5),

	.resource	= resources_uart_gsbi5,

};