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

Commit 44d51a02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'davinci-for-linus' of... 

Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  davinci: dm646x EVM: Specify reserved EDMA channel/slots
  davinci: da8xx/omapl EVM: Specify reserved channels/slots
  davinci: support for EDMA resource sharing
  davinci: edma: provide ability to detect insufficient CC info data
  davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities
  davinci: DM365: fixed second serial port
  Davinci: tnetv107x evm board initial support
  Davinci: tnetv107x initial gpio support
  Davinci: tnetv107x soc support
  Davinci: tnetv107x decompresser uart definitions
  Davinci: generalized debug macros
parents 2d530569 cce3dddb

arch/arm/mach-davinci/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ config ARCH_DAVINCI_DM365 
	select AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_TNETV107X

	select CPU_V6

	select CP_INTC

	bool "TNETV107X based system"



comment "DaVinci Board Type"



config MACH_DAVINCI_EVM
@@ -173,6 +178,13 @@ config DA850_UI_RMII 


endchoice



config MACH_TNETV107X

	bool "TI TNETV107X Reference Platform"

	default ARCH_DAVINCI_TNETV107X

	depends on ARCH_DAVINCI_TNETV107X

	help

	  Say Y here to select the TI TNETV107X Evaluation Module.



config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

	depends on ARCH_DAVINCI

arch/arm/mach-davinci/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ obj-$(CONFIG_ARCH_DAVINCI_DM646x) += dm646x.o devices.o 
obj-$(CONFIG_ARCH_DAVINCI_DM365)	+= dm365.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DA830)        += da830.o devices-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_DA850)        += da850.o devices-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_TNETV107X)    += tnetv107x.o devices-tnetv107x.o

obj-$(CONFIG_ARCH_DAVINCI_TNETV107X)    += gpio-tnetv107x.o



obj-$(CONFIG_AINTC)			+= irq.o

obj-$(CONFIG_CP_INTC)			+= cp_intc.o
@@ -30,6 +32,7 @@ obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM) += board-dm646x-evm.o cdce949.o 
obj-$(CONFIG_MACH_DAVINCI_DM365_EVM)	+= board-dm365-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA830_EVM)	+= board-da830-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA850_EVM)	+= board-da850-evm.o

obj-$(CONFIG_MACH_TNETV107X)		+= board-tnetv107x-evm.o



# Power Management

obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o

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

+31 −1
Original line number Diff line number Diff line
@@ -494,12 +494,42 @@ static struct davinci_i2c_platform_data da830_evm_i2c_0_pdata = { 
	.bus_delay	= 0,	/* usec */

};



/*

 * The following EDMA channels/slots are not being used by drivers (for

 * example: Timer, GPIO, UART events etc) on da830/omap-l137 EVM, hence

 * they are being reserved for codecs on the DSP side.

 */

static const s16 da830_dma_rsv_chans[][2] = {

	/* (offset, number) */

	{ 8,  2},

	{12,  2},

	{24,  4},

	{30,  2},

	{-1, -1}

};



static const s16 da830_dma_rsv_slots[][2] = {

	/* (offset, number) */

	{ 8,  2},

	{12,  2},

	{24,  4},

	{30, 26},

	{-1, -1}

};



static struct edma_rsv_info da830_edma_rsv[] = {

	{

		.rsv_chans	= da830_dma_rsv_chans,

		.rsv_slots	= da830_dma_rsv_slots,

	},

};



static __init void da830_evm_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;

	int ret;



	ret = da8xx_register_edma();

	ret = da830_register_edma(da830_edma_rsv);

	if (ret)

		pr_warning("da830_evm_init: edma registration failed: %d\n",

				ret);

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

+51 −1
Original line number Diff line number Diff line
@@ -637,6 +637,56 @@ static int __init da850_evm_config_emac(void) 
}

device_initcall(da850_evm_config_emac);



/*

 * The following EDMA channels/slots are not being used by drivers (for

 * example: Timer, GPIO, UART events etc) on da850/omap-l138 EVM, hence

 * they are being reserved for codecs on the DSP side.

 */

static const s16 da850_dma0_rsv_chans[][2] = {

	/* (offset, number) */

	{ 8,  6},

	{24,  4},

	{30,  2},

	{-1, -1}

};



static const s16 da850_dma0_rsv_slots[][2] = {

	/* (offset, number) */

	{ 8,  6},

	{24,  4},

	{30, 50},

	{-1, -1}

};



static const s16 da850_dma1_rsv_chans[][2] = {

	/* (offset, number) */

	{ 0, 28},

	{30,  2},

	{-1, -1}

};



static const s16 da850_dma1_rsv_slots[][2] = {

	/* (offset, number) */

	{ 0, 28},

	{30, 90},

	{-1, -1}

};



static struct edma_rsv_info da850_edma_cc0_rsv = {

	.rsv_chans	= da850_dma0_rsv_chans,

	.rsv_slots	= da850_dma0_rsv_slots,

};



static struct edma_rsv_info da850_edma_cc1_rsv = {

	.rsv_chans	= da850_dma1_rsv_chans,

	.rsv_slots	= da850_dma1_rsv_slots,

};



static struct edma_rsv_info *da850_edma_rsv[2] = {

	&da850_edma_cc0_rsv,

	&da850_edma_cc1_rsv,

};



static __init void da850_evm_init(void)

{

	int ret;
@@ -646,7 +696,7 @@ static __init void da850_evm_init(void) 
		pr_warning("da850_evm_init: TPS65070 PMIC init failed: %d\n",

				ret);



	ret = da8xx_register_edma();

	ret = da850_register_edma(da850_edma_rsv);

	if (ret)

		pr_warning("da850_evm_init: edma registration failed: %d\n",

				ret);

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

+35 −0
Original line number Diff line number Diff line
@@ -721,6 +721,39 @@ static struct davinci_uart_config uart_config __initdata = { 
#define DM646X_EVM_PHY_MASK		(0x2)

#define DM646X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */



/*

 * The following EDMA channels/slots are not being used by drivers (for

 * example: Timer, GPIO, UART events etc) on dm646x, hence they are being

 * reserved for codecs on the DSP side.

 */

static const s16 dm646x_dma_rsv_chans[][2] = {

	/* (offset, number) */

	{ 0,  4},

	{13,  3},

	{24,  4},

	{30,  2},

	{54,  3},

	{-1, -1}

};



static const s16 dm646x_dma_rsv_slots[][2] = {

	/* (offset, number) */

	{ 0,  4},

	{13,  3},

	{24,  4},

	{30,  2},

	{54,  3},

	{128, 384},

	{-1, -1}

};



static struct edma_rsv_info dm646x_edma_rsv[] = {

	{

		.rsv_chans	= dm646x_dma_rsv_chans,

		.rsv_slots	= dm646x_dma_rsv_slots,

	},

};



static __init void evm_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;
@@ -732,6 +765,8 @@ static __init void evm_init(void) 


	platform_device_register(&davinci_nand_device);



	dm646x_init_edma(dm646x_edma_rsv);



	if (HAS_ATA)

		davinci_init_ide();