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

Commit 366b6e8c authored by Abhimanyu Kapur's avatar Abhimanyu Kapur Committed by Matt Wagantall
Browse files

arm: msm: drop the upstream kernel mach-msm code 



In accordance with upstream plans drop all files under
mach-msm. This is done as the upstream community is
moving all code to mach-qcom and we will maintain all
internal code within mach-msm.

Change-Id: Ic3f202307ab37d749b57e71119990de7088ee78a
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 35cb695a

arch/arm/mach-msm/Makefile

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_PROC_COMM) += clock.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o



obj-$(CONFIG_ARCH_MSM7X00A) += irq.o

obj-$(CONFIG_ARCH_QSD8X50) += sirc.o



obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o



obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o

obj-$(CONFIG_MSM_SMD) += last_radio_log.o



obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o

obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o

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_MSM_GPIOMUX) += gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o

arch/arm/mach-msm/Makefile.boot

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
  zreladdr-y		+= 0x10008000

params_phys-y		:= 0x10000100

initrd_phys-y		:= 0x10800000

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

deleted100644 → 0
+0 −104
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/board-halibut.c

 *

 * Copyright (C) 2007 Google, Inc.

 * Author: Brian Swetland <swetland@google.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/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/io.h>

#include <linux/delay.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/flash.h>

#include <asm/setup.h>



#include <mach/irqs.h>

#include <mach/msm_iomap.h>



#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>



#include "devices.h"

#include "common.h"



static struct resource smc91x_resources[] = {

	[0] = {

		.start	= 0x9C004300,

		.end	= 0x9C004400,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= MSM_GPIO_TO_INT(49),

		.end	= MSM_GPIO_TO_INT(49),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};



static struct platform_device *devices[] __initdata = {

	&msm_clock_7x01a,

	&msm_device_gpio_7201,

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_nand,

	&msm_device_hsusb,

	&msm_device_i2c,

	&smc91x_device,

};



static void __init halibut_init_early(void)

{

	arch_ioremap_caller = __msm_ioremap_caller;

}



static void __init halibut_init_irq(void)

{

	msm_init_irq();

}



static void __init halibut_init(void)

{

	platform_add_devices(devices, ARRAY_SIZE(devices));

}



static void __init halibut_map_io(void)

{

	msm_map_common_io();

}



static void __init halibut_init_late(void)

{

	smd_debugfs_init();

}



MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

	.atag_offset	= 0x100,

	.map_io		= halibut_map_io,

	.init_early	= halibut_init_early,

	.init_irq	= halibut_init_irq,

	.init_machine	= halibut_init,

	.init_late	= halibut_init_late,

	.init_time	= msm7x01_timer_init,

MACHINE_END

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

deleted100644 → 0
+0 −191
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2010, 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/gpio.h>

#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/smsc911x.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/clkdev.h>

#include <linux/memblock.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/memory.h>

#include <asm/setup.h>



#include <mach/clk.h>

#include <mach/msm_iomap.h>

#include <mach/dma.h>



#include <mach/vreg.h>

#include "devices.h"

#include "gpiomux.h"

#include "proc_comm.h"

#include "common.h"



static void __init msm7x30_fixup(struct tag *tag, char **cmdline)

{

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

		if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) {

			tag->u.mem.start = 0;

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

		}

}



static void __init msm7x30_reserve(void)

{

	memblock_remove(0x0, SZ_2M);

}



static int hsusb_phy_init_seq[] = {

	0x30, 0x32,	/* Enable and set Pre-Emphasis Depth to 20% */

	0x02, 0x36,	/* Disable CDR Auto Reset feature */

	-1

};



static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)

{

	int ret;



	if (assert) {

		ret = clk_reset(link_clk, CLK_RESET_ASSERT);

		if (ret)

			pr_err("usb hs_clk assert failed\n");

	} else {

		ret = clk_reset(link_clk, CLK_RESET_DEASSERT);

		if (ret)

			pr_err("usb hs_clk deassert failed\n");

	}

	return ret;

}



static int hsusb_phy_clk_reset(struct clk *phy_clk)

{

	int ret;



	ret = clk_reset(phy_clk, CLK_RESET_ASSERT);

	if (ret) {

		pr_err("usb phy clk assert failed\n");

		return ret;

	}

	usleep_range(10000, 12000);

	ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);

	if (ret)

		pr_err("usb phy clk deassert failed\n");

	return ret;

}



static struct msm_otg_platform_data msm_otg_pdata = {

	.phy_init_seq		= hsusb_phy_init_seq,

	.mode                   = USB_DR_MODE_PERIPHERAL,

	.otg_control		= OTG_PHY_CONTROL,

	.link_clk_reset		= hsusb_link_clk_reset,

	.phy_clk_reset		= hsusb_phy_clk_reset,

};



struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {

#ifdef CONFIG_SERIAL_MSM_CONSOLE

	[49] = { /* UART2 RFR */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_2 | GPIOMUX_VALID,

	},

	[50] = { /* UART2 CTS */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_2 | GPIOMUX_VALID,

	},

	[51] = { /* UART2 RX */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_2 | GPIOMUX_VALID,

	},

	[52] = { /* UART2 TX */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_2 | GPIOMUX_VALID,

	},

#endif

};



static struct platform_device *devices[] __initdata = {

	&msm_clock_7x30,

	&msm_device_gpio_7x30,

#if defined(CONFIG_SERIAL_MSM)

        &msm_device_uart2,

#endif

	&msm_device_smd,

	&msm_device_otg,

	&msm_device_hsusb,

	&msm_device_hsusb_host,

};



static void __init msm7x30_init_irq(void)

{

	msm_init_irq();

}



static void __init msm7x30_init(void)

{

	msm_device_otg.dev.platform_data = &msm_otg_pdata;

	msm_device_hsusb.dev.parent = &msm_device_otg.dev;

	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;



	platform_add_devices(devices, ARRAY_SIZE(devices));

}



static void __init msm7x30_map_io(void)

{

	msm_map_msm7x30_io();

}



static void __init msm7x30_init_late(void)

{

	smd_debugfs_init();

}



MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")

	.atag_offset = 0x100,

	.fixup = msm7x30_fixup,

	.reserve = msm7x30_reserve,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_machine = msm7x30_init,

	.init_late = msm7x30_init_late,

	.init_time	= msm7x30_timer_init,

MACHINE_END



MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")

	.atag_offset = 0x100,

	.fixup = msm7x30_fixup,

	.reserve = msm7x30_reserve,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_machine = msm7x30_init,

	.init_late = msm7x30_init_late,

	.init_time	= msm7x30_timer_init,

MACHINE_END



MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")

	.atag_offset = 0x100,

	.fixup = msm7x30_fixup,

	.reserve = msm7x30_reserve,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_machine = msm7x30_init,

	.init_late = msm7x30_init_late,

	.init_time	= msm7x30_timer_init,

MACHINE_END

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

deleted100644 → 0
+0 −248
Original line number Diff line number Diff line 
/* Copyright (c) 2009-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/gpio.h>

#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/err.h>

#include <linux/clkdev.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/io.h>

#include <asm/setup.h>



#include <mach/irqs.h>

#include <mach/sirc.h>

#include <mach/vreg.h>

#include <mach/clk.h>

#include <linux/platform_data/mmc-msm_sdcc.h>



#include "devices.h"

#include "common.h"



static const resource_size_t qsd8x50_surf_smc91x_base __initconst = 0x70000300;

static const unsigned        qsd8x50_surf_smc91x_gpio __initconst = 156;



/* Leave smc91x resources empty here, as we'll fill them in

 * at run-time: they vary from board to board, and the true

 * configuration won't be known until boot.

 */

static struct resource smc91x_resources[] = {

	[0] = {

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.flags = IORESOURCE_IRQ,

	},

};



static struct platform_device smc91x_device = {

	.name           = "smc91x",

	.id             = 0,

	.num_resources  = ARRAY_SIZE(smc91x_resources),

	.resource       = smc91x_resources,

};



static int __init msm_init_smc91x(void)

{

	if (machine_is_qsd8x50_surf()) {

		smc91x_resources[0].start = qsd8x50_surf_smc91x_base;

		smc91x_resources[0].end   = qsd8x50_surf_smc91x_base + 0xff;

		smc91x_resources[1].start =

			gpio_to_irq(qsd8x50_surf_smc91x_gpio);

		smc91x_resources[1].end   =

			gpio_to_irq(qsd8x50_surf_smc91x_gpio);

		platform_device_register(&smc91x_device);

	}



	return 0;

}

module_init(msm_init_smc91x);



static int hsusb_phy_init_seq[] = {

	0x08, 0x31,	/* Increase HS Driver Amplitude */

	0x20, 0x32,	/* Enable and set Pre-Emphasis Depth to 10% */

	-1

};



static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)

{

	int ret;



	if (assert) {

		ret = clk_reset(link_clk, CLK_RESET_ASSERT);

		if (ret)

			pr_err("usb hs_clk assert failed\n");

	} else {

		ret = clk_reset(link_clk, CLK_RESET_DEASSERT);

		if (ret)

			pr_err("usb hs_clk deassert failed\n");

	}

	return ret;

}



static int hsusb_phy_clk_reset(struct clk *phy_clk)

{

	int ret;



	ret = clk_reset(phy_clk, CLK_RESET_ASSERT);

	if (ret) {

		pr_err("usb phy clk assert failed\n");

		return ret;

	}

	usleep_range(10000, 12000);

	ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);

	if (ret)

		pr_err("usb phy clk deassert failed\n");

	return ret;

}



static struct msm_otg_platform_data msm_otg_pdata = {

	.phy_init_seq		= hsusb_phy_init_seq,

	.mode                   = USB_DR_MODE_PERIPHERAL,

	.otg_control		= OTG_PHY_CONTROL,

	.link_clk_reset		= hsusb_link_clk_reset,

	.phy_clk_reset		= hsusb_phy_clk_reset,

};



static struct platform_device *devices[] __initdata = {

	&msm_clock_8x50,

	&msm_device_gpio_8x50,

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_otg,

	&msm_device_hsusb,

	&msm_device_hsusb_host,

};



static struct msm_mmc_gpio sdc1_gpio_cfg[] = {

	{51, "sdc1_dat_3"},

	{52, "sdc1_dat_2"},

	{53, "sdc1_dat_1"},

	{54, "sdc1_dat_0"},

	{55, "sdc1_cmd"},

	{56, "sdc1_clk"}

};



static struct vreg *vreg_mmc;

static unsigned long vreg_sts;



static uint32_t msm_sdcc_setup_power(struct device *dv, unsigned int vdd)

{

	int rc = 0;

	struct platform_device *pdev;



	pdev = container_of(dv, struct platform_device, dev);



	if (vdd == 0) {

		if (!vreg_sts)

			return 0;



		clear_bit(pdev->id, &vreg_sts);



		if (!vreg_sts) {

			rc = vreg_disable(vreg_mmc);

			if (rc)

				pr_err("vreg_mmc disable failed for slot "

						"%d: %d\n", pdev->id, rc);

		}

		return 0;

	}



	if (!vreg_sts) {

		rc = vreg_set_level(vreg_mmc, 2900);

		if (rc)

			pr_err("vreg_mmc set level failed for slot %d: %d\n",

					pdev->id, rc);

		rc = vreg_enable(vreg_mmc);

		if (rc)

			pr_err("vreg_mmc enable failed for slot %d: %d\n",

					pdev->id, rc);

	}

	set_bit(pdev->id, &vreg_sts);

	return 0;

}



static struct msm_mmc_gpio_data sdc1_gpio = {

	.gpio = sdc1_gpio_cfg,

	.size = ARRAY_SIZE(sdc1_gpio_cfg),

};



static struct msm_mmc_platform_data qsd8x50_sdc1_data = {

	.ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

	.translate_vdd	= msm_sdcc_setup_power,

	.gpio_data = &sdc1_gpio,

};



static void __init qsd8x50_init_mmc(void)

{

	vreg_mmc = vreg_get(NULL, "gp5");



	if (IS_ERR(vreg_mmc)) {

		pr_err("vreg get for vreg_mmc failed (%ld)\n",

				PTR_ERR(vreg_mmc));

		return;

	}



	msm_add_sdcc(1, &qsd8x50_sdc1_data, 0, 0);

}



static void __init qsd8x50_map_io(void)

{

	msm_map_qsd8x50_io();

}



static void __init qsd8x50_init_irq(void)

{

	msm_init_irq();

	msm_init_sirc();

}



static void __init qsd8x50_init(void)

{

	msm_device_otg.dev.platform_data = &msm_otg_pdata;

	msm_device_hsusb.dev.parent = &msm_device_otg.dev;

	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;

	platform_add_devices(devices, ARRAY_SIZE(devices));

	qsd8x50_init_mmc();

}



static void __init qsd8x50_init_late(void)

{

	smd_debugfs_init();

}



MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")

	.atag_offset = 0x100,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_machine = qsd8x50_init,

	.init_late = qsd8x50_init_late,

	.init_time	= qsd8x50_timer_init,

MACHINE_END



MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5")

	.atag_offset = 0x100,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_machine = qsd8x50_init,

	.init_late = qsd8x50_init_late,

	.init_time	= qsd8x50_timer_init,

MACHINE_END