Commit 6d1e66bb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.10/legacy-signed' of... 

Merge tag 'omap-for-v4.10/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Legacy platform_data removal for omaps for v4.10 merge window.
We've dropped the last legacy boot board-*.c files for mach-omap2
for v4.9 so now we can start removing the unused platform_data.

All of the below has been unused since v4.9 merge window:

- Drop legacy pmic init code
- Apply seq_puts() fixes for legacy mux code, then drop it
- Drop legacy serial init
- Drop legacy i2c init
- Drop legacy PM init
- Drop legacy twl4030 platform init
- Drop legacy USB host init
- Drop legacy muxing for tusb6010, n8x0 is still using it's
  platform init via pdata-quirks.c
- Drop legacy musb init
- Drop hwmod related legacy mux code
- Drop legacy hwmod data for omap3
- Drop legacy smsc911x and smc91x init
- Drop legacy board flash init
- Drop legacy ads7846 init
- Drop legacy sdram timings

* tag 'omap-for-v4.10/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (21 commits)
  ARM: OMAP2+: Drop legacy sdram timings
  ARM: OMAP2+: Drop legacy ads7846 init
  ARM: OMAP2+: Remove legacy board-flash.c
  ARM: OMAP2+: Remove legacy smsc911x and smc91x GPMC support
  ARM: OMAP2+: Remove legacy data from hwmod for omap3
  ARM: OMAP2+: Remove legacy mux code
  ARM: OMAP2+: Remove legacy hwmod mux code
  ARM: OMAP2+: Remove legacy usb-musb.c platform init code
  ARM: OMAP2+: Remove legacy muxing for usb-tusb6010.c
  ARM: OMAP2+: Remove legacy usb-host.c platform init code
  ARM: OMAP2+: Remove legacy twl4030 platform init code
  ARM: OMAP2+: Remove legacy PM init
  ARM: OMAP2+: Remove legacy i2c.c platform init code
  ARM: OMAP2+: Remove legacy serial.c
  ARM: OMAP2+: mux: Use seq_putc() in omap_mux_dbg_signal_show()
  ARM: OMAP2+: mux: Replace three seq_printf() calls by seq_puts()
  ARM: OMAP: kill omap_pmic_init
  ARM: OMAP2: kill omap2_pmic_init
  ARM: OMAP3: kill omap3_pmic_init
  ARM: OMAP3: kill omap3_pmic_get_config and twl_{get,set}_voltage
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a9fa1f7c 19944b3a

arch/arm/mach-omap1/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -31,6 +31,32 @@ config ARCH_OMAP16XX 
	select ARCH_OMAP_OTG

	select CPU_ARM926T



config OMAP_MUX

	bool "OMAP multiplexing support"

	depends on ARCH_OMAP

	default y

	help

	  Pin multiplexing support for OMAP boards. If your bootloader

	  sets the multiplexing correctly, say N. Otherwise, or if unsure,

	  say Y.



config OMAP_MUX_DEBUG

	bool "Multiplexing debug output"

	depends on OMAP_MUX

	help

	  Makes the multiplexing functions print out a lot of debug info.

	  This is useful if you want to find out the correct values of the

	  multiplexing registers.



config OMAP_MUX_WARNINGS

	bool "Warn about pins the bootloader didn't set up"

	depends on OMAP_MUX

	default y

	help

	  Choose Y here to warn whenever driver initialization logic needs

	  to change the pin multiplexing setup.	 When there are no warnings

	  printed, it's safe to deselect OMAP_MUX for your product.



comment "OMAP Board Type"

	depends on ARCH_OMAP1

arch/arm/mach-omap1/i2c.c

+83 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 *

 */



#include <linux/i2c.h>

#include <linux/i2c-omap.h>

#include <mach/mux.h>

#include "soc.h"
@@ -91,6 +92,88 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata, 
	return platform_device_register(pdev);

}



#define OMAP_I2C_MAX_CONTROLLERS 4

static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS];



#define OMAP_I2C_CMDLINE_SETUP	(BIT(31))



/**

 * omap_i2c_bus_setup - Process command line options for the I2C bus speed

 * @str: String of options

 *

 * This function allow to override the default I2C bus speed for given I2C

 * bus with a command line option.

 *

 * Format: i2c_bus=bus_id,clkrate (in kHz)

 *

 * Returns 1 on success, 0 otherwise.

 */

static int __init omap_i2c_bus_setup(char *str)

{

	int ints[3];



	get_options(str, 3, ints);

	if (ints[0] < 2 || ints[1] < 1 ||

			ints[1] > OMAP_I2C_MAX_CONTROLLERS)

		return 0;

	i2c_pdata[ints[1] - 1].clkrate = ints[2];

	i2c_pdata[ints[1] - 1].clkrate |= OMAP_I2C_CMDLINE_SETUP;



	return 1;

}

__setup("i2c_bus=", omap_i2c_bus_setup);



/*

 * Register busses defined in command line but that are not registered with

 * omap_register_i2c_bus from board initialization code.

 */

int __init omap_register_i2c_bus_cmdline(void)

{

	int i, err = 0;



	for (i = 0; i < ARRAY_SIZE(i2c_pdata); i++)

		if (i2c_pdata[i].clkrate & OMAP_I2C_CMDLINE_SETUP) {

			i2c_pdata[i].clkrate &= ~OMAP_I2C_CMDLINE_SETUP;

			err = omap_i2c_add_bus(&i2c_pdata[i], i + 1);

			if (err)

				goto out;

		}



out:

	return err;

}



/**

 * omap_register_i2c_bus - register I2C bus with device descriptors

 * @bus_id: bus id counting from number 1

 * @clkrate: clock rate of the bus in kHz

 * @info: pointer into I2C device descriptor table or NULL

 * @len: number of descriptors in the table

 *

 * Returns 0 on success or an error code.

 */

int __init omap_register_i2c_bus(int bus_id, u32 clkrate,

			  struct i2c_board_info const *info,

			  unsigned len)

{

	int err;



	BUG_ON(bus_id < 1 || bus_id > OMAP_I2C_MAX_CONTROLLERS);



	if (info) {

		err = i2c_register_board_info(bus_id, info, len);

		if (err)

			return err;

	}



	if (!i2c_pdata[bus_id - 1].clkrate)

		i2c_pdata[bus_id - 1].clkrate = clkrate;



	i2c_pdata[bus_id - 1].clkrate &= ~OMAP_I2C_CMDLINE_SETUP;



	return omap_i2c_add_bus(&i2c_pdata[bus_id - 1], bus_id);

}



static  int __init omap_i2c_cmdline(void)

{

	return omap_register_i2c_bus_cmdline();

arch/arm/mach-omap2/Makefile

+1 −15
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ 
	-I$(srctree)/arch/arm/plat-omap/include



# Common support

obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \

obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o omap-headsmp.o sram.o drm.o
@@ -63,9 +63,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap4-restart.o 
obj-$(CONFIG_SOC_OMAP5)			+= omap4-restart.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap4-restart.o



# Pin multiplexing

obj-$(CONFIG_ARCH_OMAP3)		+= mux34xx.o



# SMS/SDRC

obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o

# obj-$(CONFIG_ARCH_OMAP3)		+= sdrc3xxx.o
@@ -235,26 +232,15 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o 


# Platform specific device init code



omap-flash-$(CONFIG_MTD_NAND_OMAP2)	:= board-flash.o

omap-flash-$(CONFIG_MTD_ONENAND_OMAP2)	:= board-flash.o

obj-y					+= $(omap-flash-y) $(omap-flash-m)



omap-hsmmc-$(CONFIG_MMC_OMAP_HS)	:= hsmmc.o

obj-y					+= $(omap-hsmmc-m) $(omap-hsmmc-y)



obj-y					+= usb-musb.o

obj-y					+= omap_phy_internal.o



obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o

obj-y					+= usb-host.o



onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o

obj-y					+= $(onenand-m) $(onenand-y)



nand-$(CONFIG_MTD_NAND_OMAP2)		:= gpmc-nand.o

obj-y					+= $(nand-m) $(nand-y)
 


smsc911x-$(CONFIG_SMSC911X)		:= gpmc-smsc911x.o

obj-y					+= $(smsc911x-m) $(smsc911x-y)



obj-y					+= common-board-devices.o twl-common.o dss-common.o

arch/arm/mach-omap2/board-flash.c

deleted100644 → 0
+0 −242
Original line number Diff line number Diff line 
/*

 * board-flash.c

 * Modified from mach-omap2/board-3430sdp-flash.c

 *

 * Copyright (C) 2009 Nokia Corporation

 * Copyright (C) 2009 Texas Instruments

 *

 * Vimal Singh <vimalsingh@ti.com>

 *

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

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

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/omap-gpmc.h>

#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/io.h>



#include <linux/platform_data/mtd-nand-omap2.h>

#include <linux/platform_data/mtd-onenand-omap2.h>



#include "soc.h"

#include "common.h"

#include "board-flash.h"



#define REG_FPGA_REV			0x10

#define REG_FPGA_DIP_SWITCH_INPUT2	0x60

#define MAX_SUPPORTED_GPMC_CONFIG	3



#define DEBUG_BASE		0x08000000 /* debug board */



/* various memory sizes */

#define FLASH_SIZE_SDPV1	SZ_64M	/* NOR flash (64 Meg aligned) */

#define FLASH_SIZE_SDPV2	SZ_128M	/* NOR flash (256 Meg aligned) */



static struct physmap_flash_data board_nor_data = {

	.width		= 2,

};



static struct resource board_nor_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device board_nor_device = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

			.platform_data = &board_nor_data,

	},

	.num_resources	= 1,

	.resource	= &board_nor_resource,

};



static void

__init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)

{

	int err;



	board_nor_data.parts	= nor_parts;

	board_nor_data.nr_parts	= nr_parts;



	/* Configure start address and size of NOR device */

	if (omap_rev() >= OMAP3430_REV_ES1_0) {

		err = gpmc_cs_request(cs, FLASH_SIZE_SDPV2 - 1,

				(unsigned long *)&board_nor_resource.start);

		board_nor_resource.end = board_nor_resource.start

					+ FLASH_SIZE_SDPV2 - 1;

	} else {

		err = gpmc_cs_request(cs, FLASH_SIZE_SDPV1 - 1,

				(unsigned long *)&board_nor_resource.start);

		board_nor_resource.end = board_nor_resource.start

					+ FLASH_SIZE_SDPV1 - 1;

	}

	if (err < 0) {

		pr_err("NOR: Can't request GPMC CS\n");

		return;

	}

	if (platform_device_register(&board_nor_device) < 0)

		pr_err("Unable to register NOR device\n");

}



#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

static struct omap_onenand_platform_data board_onenand_data = {

	.dma_channel	= -1,   /* disable DMA in OMAP OneNAND driver */

};



void

__init board_onenand_init(struct mtd_partition *onenand_parts,

				u8 nr_parts, u8 cs)

{

	board_onenand_data.cs		= cs;

	board_onenand_data.parts	= onenand_parts;

	board_onenand_data.nr_parts	= nr_parts;



	gpmc_onenand_init(&board_onenand_data);

}

#endif /* IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) */



#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)



/* Note that all values in this struct are in nanoseconds */

struct gpmc_timings nand_default_timings[1] = {

	{

		.sync_clk = 0,



		.cs_on = 0,

		.cs_rd_off = 36,

		.cs_wr_off = 36,



		.we_on = 6,

		.oe_on = 6,



		.adv_on = 6,

		.adv_rd_off = 24,

		.adv_wr_off = 36,



		.we_off = 30,

		.oe_off = 48,



		.access = 54,

		.rd_cycle = 72,

		.wr_cycle = 72,



		.wr_access = 30,

		.wr_data_mux_bus = 0,

	},

};



static struct omap_nand_platform_data board_nand_data;



void

__init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,

				int nand_type, struct gpmc_timings *gpmc_t)

{

	board_nand_data.cs		= cs;

	board_nand_data.parts		= nand_parts;

	board_nand_data.nr_parts	= nr_parts;

	board_nand_data.devsize		= nand_type;



	board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;

	gpmc_nand_init(&board_nand_data, gpmc_t);

}

#endif /* IS_ENABLED(CONFIG_MTD_NAND_OMAP2) */



/**

 * get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get

 * the various cs values.

 */

static u8 get_gpmc0_type(void)

{

	u8 cs = 0;

	void __iomem *fpga_map_addr;



	fpga_map_addr = ioremap(DEBUG_BASE, 4096);

	if (!fpga_map_addr)

		return -ENOMEM;



	if (!(readw_relaxed(fpga_map_addr + REG_FPGA_REV)))

		/* we dont have an DEBUG FPGA??? */

		/* Depend on #defines!! default to strata boot return param */

		goto unmap;



	/* S8-DIP-OFF = 1, S8-DIP-ON = 0 */

	cs = readw_relaxed(fpga_map_addr + REG_FPGA_DIP_SWITCH_INPUT2) & 0xf;



	/* ES2.0 SDP's onwards 4 dip switches are provided for CS */

	if (omap_rev() >= OMAP3430_REV_ES1_0)

		/* change (S8-1:4=DS-2:0) to (S8-4:1=DS-2:0) */

		cs = ((cs & 8) >> 3) | ((cs & 4) >> 1) |

			((cs & 2) << 1) | ((cs & 1) << 3);

	else

		/* change (S8-1:3=DS-2:0) to (S8-3:1=DS-2:0) */

		cs = ((cs & 4) >> 2) | (cs & 2) | ((cs & 1) << 2);

unmap:

	iounmap(fpga_map_addr);

	return cs;

}



/**

 * board_flash_init - Identify devices connected to GPMC and register.

 *

 * @return - void.

 */

void __init board_flash_init(struct flash_partitions partition_info[],

			char chip_sel_board[][GPMC_CS_NUM], int nand_type)

{

	u8		cs = 0;

	u8		norcs = GPMC_CS_NUM + 1;

	u8		nandcs = GPMC_CS_NUM + 1;

	u8		onenandcs = GPMC_CS_NUM + 1;

	u8		idx;

	unsigned char	*config_sel = NULL;



	/* REVISIT: Is this return correct idx for 2430 SDP?

	 * for which cs configuration matches for 2430 SDP?

	 */

	idx = get_gpmc0_type();

	if (idx >= MAX_SUPPORTED_GPMC_CONFIG) {

		pr_err("%s: Invalid chip select: %d\n", __func__, cs);

		return;

	}

	config_sel = (unsigned char *)(chip_sel_board[idx]);



	while (cs < GPMC_CS_NUM) {

		switch (config_sel[cs]) {

		case PDC_NOR:

			if (norcs > GPMC_CS_NUM)

				norcs = cs;

			break;

		case PDC_NAND:

			if (nandcs > GPMC_CS_NUM)

				nandcs = cs;

			break;

		case PDC_ONENAND:

			if (onenandcs > GPMC_CS_NUM)

				onenandcs = cs;

			break;

		}

		cs++;

	}



	if (norcs > GPMC_CS_NUM)

		pr_err("NOR: Unable to find configuration in GPMC\n");

	else

		board_nor_init(partition_info[0].parts,

				partition_info[0].nr_parts, norcs);



	if (onenandcs > GPMC_CS_NUM)

		pr_err("OneNAND: Unable to find configuration in GPMC\n");

	else

		board_onenand_init(partition_info[1].parts,

					partition_info[1].nr_parts, onenandcs);



	if (nandcs > GPMC_CS_NUM)

		pr_err("NAND: Unable to find configuration in GPMC\n");

	else

		board_nand_init(partition_info[2].parts,

			partition_info[2].nr_parts, nandcs,

			nand_type, nand_default_timings);

}

arch/arm/mach-omap2/board-flash.h

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 *  board-sdp.h

 *

 *  Information structures for SDP-specific board config data

 *

 *  Copyright (C) 2009 Nokia Corporation

 *  Copyright (C) 2009 Texas Instruments

 *

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

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

 * published by the Free Software Foundation.

 */

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>



#define PDC_NOR		1

#define PDC_NAND	2

#define PDC_ONENAND	3

#define DBG_MPDB	4



struct flash_partitions {

	struct mtd_partition *parts;

	int nr_parts;

};



#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) || IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

extern void board_flash_init(struct flash_partitions [],

				char chip_sel[][GPMC_CS_NUM], int nand_type);

#else

static inline void board_flash_init(struct flash_partitions part[],

				char chip_sel[][GPMC_CS_NUM], int nand_type)

{

}

#endif



#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)

extern void board_nand_init(struct mtd_partition *nand_parts,

		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);

extern struct gpmc_timings nand_default_timings[];

#else

static inline void board_nand_init(struct mtd_partition *nand_parts,

		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t)

{

}

#define	nand_default_timings	NULL

#endif



#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

extern void board_onenand_init(struct mtd_partition *nand_parts,

					u8 nr_parts, u8 cs);

#else

static inline void board_onenand_init(struct mtd_partition *nand_parts,

					u8 nr_parts, u8 cs)

{

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE