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

Commit 9b963f32 authored by Russell King's avatar Russell King
Browse files

Merge branch 'davinci-next-2' of... 

Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
parents 4c4070a3 60d97a84

arch/arm/mach-davinci/board-dm644x-evm.c

+3 −5
Original line number Diff line number Diff line
@@ -440,11 +440,6 @@ evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c) 
	gpio_request(gpio + 7, "nCF_SEL");

	gpio_direction_output(gpio + 7, 1);



	/* irlml6401 switches over 1A, in under 8 msec;

	 * now it can be managed by nDRV_VBUS ...

	 */

	davinci_setup_usb(1000, 8);



	return 0;

}
@@ -705,6 +700,9 @@ static __init void davinci_evm_init(void) 
	davinci_serial_init(&uart_config);

	dm644x_init_asp(&dm644x_evm_snd_data);



	/* irlml6401 switches over 1A, in under 8 msec */

	davinci_setup_usb(1000, 8);



	soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;

	/* Register the fixup for PHY on DaVinci */

	phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,

arch/arm/mach-davinci/board-tnetv107x-evm.c

+57 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>
@@ -37,6 +38,7 @@ 


#define EVM_MMC_WP_GPIO		21

#define EVM_MMC_CD_GPIO		24

#define EVM_SPI_CS_GPIO		54



static int initialize_gpio(int gpio, char *desc)

{
@@ -99,6 +101,12 @@ static const short uart1_pins[] __initdata = { 
	-1

};



static const short ssp_pins[] __initdata = {

	TNETV107X_SSP0_0, TNETV107X_SSP0_1, TNETV107X_SSP0_2,

	TNETV107X_SSP1_0, TNETV107X_SSP1_1, TNETV107X_SSP1_2,

	TNETV107X_SSP1_3, -1

};



static struct mtd_partition nand_partitions[] = {

	/* bootloader (U-Boot, etc) in first 12 sectors */

	{
@@ -196,19 +204,68 @@ static struct matrix_keypad_platform_data keypad_config = { 
	.no_autorepeat	= 0,

};



static void spi_select_device(int cs)

{

	static int gpio;



	if (!gpio) {

		int ret;

		ret = gpio_request(EVM_SPI_CS_GPIO, "spi chipsel");

		if (ret < 0) {

			pr_err("cannot open spi chipsel gpio\n");

			gpio = -ENOSYS;

			return;

		} else {

			gpio = EVM_SPI_CS_GPIO;

			gpio_direction_output(gpio, 0);

		}

	}



	if (gpio < 0)

		return;



	return gpio_set_value(gpio, cs ? 1 : 0);

}



static struct ti_ssp_spi_data spi_master_data = {

	.num_cs	= 2,

	.select	= spi_select_device,

	.iosel	= SSP_PIN_SEL(0, SSP_CLOCK)	| SSP_PIN_SEL(1, SSP_DATA) |

		  SSP_PIN_SEL(2, SSP_CHIPSEL)	| SSP_PIN_SEL(3, SSP_IN)   |

		  SSP_INPUT_SEL(3),

};



static struct ti_ssp_data ssp_config = {

	.out_clock	= 250 * 1000,

	.dev_data	= {

		[1] = {

			.dev_name = "ti-ssp-spi",

			.pdata = &spi_master_data,

			.pdata_size = sizeof(spi_master_data),

		},

	},

};



static struct tnetv107x_device_info evm_device_info __initconst = {

	.serial_config		= &serial_config,

	.mmc_config[1]		= &mmc_config,	/* controller 1 */

	.nand_config[0]		= &nand_config,	/* chip select 0 */

	.keypad_config		= &keypad_config,

	.ssp_config		= &ssp_config,

};



static struct spi_board_info spi_info[] __initconst = {

};



static __init void tnetv107x_evm_board_init(void)

{

	davinci_cfg_reg_list(sdio1_pins);

	davinci_cfg_reg_list(uart1_pins);

	davinci_cfg_reg_list(ssp_pins);



	tnetv107x_devices_init(&evm_device_info);



	spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/devices-tnetv107x.c

+25 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define TNETV107X_SDIO0_BASE			0x08088700

#define TNETV107X_SDIO1_BASE			0x08088800

#define TNETV107X_KEYPAD_BASE			0x08088a00

#define TNETV107X_SSP_BASE			0x08088c00

#define TNETV107X_ASYNC_EMIF_CNTRL_BASE		0x08200000

#define TNETV107X_ASYNC_EMIF_DATA_CE0_BASE	0x30000000

#define TNETV107X_ASYNC_EMIF_DATA_CE1_BASE	0x40000000
@@ -342,6 +343,25 @@ static struct platform_device tsc_device = { 
	.resource	= tsc_resources,

};



static struct resource ssp_resources[] = {

	{

		.start	= TNETV107X_SSP_BASE,

		.end	= TNETV107X_SSP_BASE + 0x1ff,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_TNETV107X_SSP,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device ssp_device = {

	.name		= "ti-ssp",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(ssp_resources),

	.resource	= ssp_resources,

};



void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)

{

	int i, error;
@@ -380,4 +400,9 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info) 
		keypad_device.dev.platform_data = info->keypad_config;

		platform_device_register(&keypad_device);

	}



	if (info->ssp_config) {

		ssp_device.dev.platform_data = info->ssp_config;

		platform_device_register(&ssp_device);

	}

}

arch/arm/mach-davinci/include/mach/tnetv107x.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <linux/serial_8250.h>

#include <linux/input/matrix_keypad.h>

#include <linux/mfd/ti_ssp.h>



#include <mach/mmc.h>

#include <mach/nand.h>
@@ -44,6 +45,7 @@ struct tnetv107x_device_info { 
	struct davinci_mmc_config	*mmc_config[2];  /* 2 controllers */

	struct davinci_nand_pdata	*nand_config[4]; /* 4 chipsels */

	struct matrix_keypad_platform_data *keypad_config;

	struct ti_ssp_data		*ssp_config;

};



extern struct platform_device tnetv107x_wdt_device;

arch/arm/mach-davinci/tnetv107x.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static struct clk_lookup clks[] = { 
	CLK(NULL,		"timer1",		&clk_timer1),

	CLK("tnetv107x_wdt.0",	NULL,			&clk_wdt_arm),

	CLK(NULL,		"clk_wdt_dsp",		&clk_wdt_dsp),

	CLK("ti-ssp.0",		NULL,			&clk_ssp),

	CLK("ti-ssp",		NULL,			&clk_ssp),

	CLK(NULL,		"clk_tdm0",		&clk_tdm0),

	CLK(NULL,		"clk_vlynq",		&clk_vlynq),

	CLK(NULL,		"clk_mcdma",		&clk_mcdma),