Commit 8825acd7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: remove dead code 



After the removal of the unused board files, I went through the
omap1 code to look for code that no longer has any callers
and remove that.

In particular, support for the omap7xx/omap8xx family is now
completely unused, so I'm only leaving omap15xx/omap16xx/omap59xx.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Cc: linux-omap@vger.kernel.org
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 21a3e6ee

arch/arm/mach-omap1/clock_data.c

+1 −16
Original line number Diff line number Diff line
@@ -720,8 +720,6 @@ int __init omap1_clk_init(void) 
		cpu_mask |= CK_16XX;

	if (cpu_is_omap1510())

		cpu_mask |= CK_1510;

	if (cpu_is_omap7xx())

		cpu_mask |= CK_7XX;

	if (cpu_is_omap310())

		cpu_mask |= CK_310;
@@ -730,9 +728,6 @@ int __init omap1_clk_init(void) 
	ck_dpll1_p = &ck_dpll1;

	ck_ref_p = &ck_ref;



	if (cpu_is_omap7xx())

		ck_ref.rate = 13000000;



	pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n",

		omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),

		omap_readw(ARM_CKCTL));
@@ -771,12 +766,6 @@ int __init omap1_clk_init(void) 
		}

	}



	if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {

		/* Select slicer output as OMAP input clock */

		omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1,

				OMAP7XX_PCC_UPLD_CTRL);

	}



	/* Amstrad Delta wants BCLK high when inactive */

	if (machine_is_ams_delta())

		omap_writel(omap_readl(ULPD_CLOCK_CTRL) |
@@ -784,10 +773,6 @@ int __init omap1_clk_init(void) 
				ULPD_CLOCK_CTRL);



	/* Turn off DSP and ARM_TIMXO. Make sure ARM_INTHCK is not divided */

	/* (on 730, bit 13 must not be cleared) */

	if (cpu_is_omap7xx())

		omap_writew(omap_readw(ARM_CKCTL) & 0x2fff, ARM_CKCTL);

	else

	omap_writew(omap_readw(ARM_CKCTL) & 0x0fff, ARM_CKCTL);



	/* Put DSP/MPUI into reset until needed */

arch/arm/mach-omap1/common.h

+0 −8
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ 
#include "soc.h"

#include "i2c.h"



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

void omap7xx_map_io(void);

#else

static inline void omap7xx_map_io(void)

{

}

#endif



#ifdef CONFIG_ARCH_OMAP15XX

void omap1510_fpga_init_irq(void);

void omap15xx_map_io(void);

arch/arm/mach-omap1/devices.c

+4 −54
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ static void omap_init_rtc(void) 
static inline void omap_init_rtc(void) {}

#endif



static inline void omap_init_mbox(void) { }



/*-------------------------------------------------------------------------*/



#if IS_ENABLED(CONFIG_MMC_OMAP)
@@ -73,22 +71,16 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
			int controller_nr)

{

	if (controller_nr == 0) {

		if (cpu_is_omap7xx()) {

			omap_cfg_reg(MMC_7XX_CMD);

			omap_cfg_reg(MMC_7XX_CLK);

			omap_cfg_reg(MMC_7XX_DAT0);

		} else {

		omap_cfg_reg(MMC_CMD);

		omap_cfg_reg(MMC_CLK);

		omap_cfg_reg(MMC_DAT0);

		}



		if (cpu_is_omap1710()) {

			omap_cfg_reg(M15_1710_MMC_CLKI);

			omap_cfg_reg(P19_1710_MMC_CMDDIR);

			omap_cfg_reg(P20_1710_MMC_DATDIR0);

		}

		if (mmc_controller->slots[0].wires == 4 && !cpu_is_omap7xx()) {

		if (mmc_controller->slots[0].wires == 4) {

			omap_cfg_reg(MMC_DAT1);

			/* NOTE: DAT2 can be on W10 (here) or M15 */

			if (!mmc_controller->slots[0].nomux)
@@ -154,8 +146,6 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, 
	res[3].name = "tx";

	res[3].flags = IORESOURCE_DMA;



	if (cpu_is_omap7xx())

		data->slots[0].features = MMC_OMAP7XX;

	if (cpu_is_omap15xx())

		data->slots[0].features = MMC_OMAP15XX;

	if (cpu_is_omap16xx())
@@ -224,43 +214,6 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 


/*-------------------------------------------------------------------------*/



/* OMAP7xx SPI support */

#if IS_ENABLED(CONFIG_SPI_OMAP_100K)



struct platform_device omap_spi1 = {

	.name           = "omap1_spi100k",

	.id             = 1,

};



struct platform_device omap_spi2 = {

	.name           = "omap1_spi100k",

	.id             = 2,

};



static void omap_init_spi100k(void)

{

	if (!cpu_is_omap7xx())

		return;



	omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);

	if (omap_spi1.dev.platform_data)

		platform_device_register(&omap_spi1);



	omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);

	if (omap_spi2.dev.platform_data)

		platform_device_register(&omap_spi2);

}



#else

static inline void omap_init_spi100k(void)

{

}

#endif



/*-------------------------------------------------------------------------*/



static inline void omap_init_sti(void) {}



/* Numbering for the SPI-capable controllers when used for SPI:

 * spi		= 1

 * uwire	= 2
@@ -363,10 +316,7 @@ static int __init omap1_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */



	omap_init_mbox();

	omap_init_rtc();

	omap_init_spi100k();

	omap_init_sti();

	omap_init_uwire();

	omap1_init_rng();

arch/arm/mach-omap1/dma.c

+2 −23
Original line number Diff line number Diff line
@@ -261,22 +261,6 @@ static const struct platform_device_info omap_dma_dev_info = { 
	.num_res = 1,

};



/* OMAP730, OMAP850 */

static const struct dma_slave_map omap7xx_sdma_map[] = {

	{ "omap-mcbsp.1", "tx", SDMA_FILTER_PARAM(8) },

	{ "omap-mcbsp.1", "rx", SDMA_FILTER_PARAM(9) },

	{ "omap-mcbsp.2", "tx", SDMA_FILTER_PARAM(10) },

	{ "omap-mcbsp.2", "rx", SDMA_FILTER_PARAM(11) },

	{ "mmci-omap.0", "tx", SDMA_FILTER_PARAM(21) },

	{ "mmci-omap.0", "rx", SDMA_FILTER_PARAM(22) },

	{ "omap_udc", "rx0", SDMA_FILTER_PARAM(26) },

	{ "omap_udc", "rx1", SDMA_FILTER_PARAM(27) },

	{ "omap_udc", "rx2", SDMA_FILTER_PARAM(28) },

	{ "omap_udc", "tx0", SDMA_FILTER_PARAM(29) },

	{ "omap_udc", "tx1", SDMA_FILTER_PARAM(30) },

	{ "omap_udc", "tx2", SDMA_FILTER_PARAM(31) },

};



/* OMAP1510, OMAP1610*/

static const struct dma_slave_map omap1xxx_sdma_map[] = {

	{ "omap-mcbsp.1", "tx", SDMA_FILTER_PARAM(8) },
@@ -371,13 +355,8 @@ static int __init omap1_system_dma_init(void) 
	p.dma_attr = d;

	p.errata = configure_dma_errata();



	if (cpu_is_omap7xx()) {

		p.slave_map = omap7xx_sdma_map;

		p.slavecnt = ARRAY_SIZE(omap7xx_sdma_map);

	} else {

	p.slave_map = omap1xxx_sdma_map;

	p.slavecnt = ARRAY_SIZE(omap1xxx_sdma_map);

	}



	ret = platform_device_add_data(pdev, &p, sizeof(p));

	if (ret) {

arch/arm/mach-omap1/i2c.c

+3 −11
Original line number Diff line number Diff line
@@ -25,14 +25,9 @@ static struct platform_device omap_i2c_devices[1] = { 


static void __init omap1_i2c_mux_pins(int bus_id)

{

	if (cpu_is_omap7xx()) {

		omap_cfg_reg(I2C_7XX_SDA);

		omap_cfg_reg(I2C_7XX_SCL);

	} else {

	omap_cfg_reg(I2C_SDA);

	omap_cfg_reg(I2C_SCL);

}

}



int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata,

				int bus_id)
@@ -68,9 +63,6 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata, 


	/* how the cpu bus is wired up differs for 7xx only */



	if (cpu_is_omap7xx())

		pdata->flags |= OMAP_I2C_FLAG_BUS_SHIFT_1;

	else

	pdata->flags |= OMAP_I2C_FLAG_BUS_SHIFT_2;



	pdev->dev.platform_data = pdata;