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

Commit 13dda80e 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: (40 commits)
  DaVinci DM365: Adding support for SPI EEPROM
  DaVinci DM365: Adding DM365 SPI support
  DaVinci DM355: Modifications to DM355 SPI support
  DaVinci: SPI: Adding header file for SPI support.
  davinci: dm646x: CDCE clocks: davinci_clk converted to clk_lookup
  davinci: clkdev cleanup: remove clk_lookup wrapper, use clkdev_add_table()
  DaVinci: DM365: Voice codec support for the DM365 SoC
  davinci: clock: let clk->set_rate function sleep
  Add SDA and SCL pin numbers to i2c platform data
  davinci: da8xx/omap-l1xx: Add EDMA platform data for da850/omap-l138
  davinci: build list of unused EDMA events dynamically
  davinci: Fix edma_alloc_channel api for EDMA_CHANNEL_ANY case
  davinci: Keep count of channel controllers on a platform
  davinci: Correct return value of edma_alloc_channel api
  davinci: add CDCE949 support on DM6467 EVM
  davinci: add support for CDCE949 clock synthesizer
  davinci: da850/omap-l138 EVM: register for suspend support
  davinci: da850/omap-l138: add support for SoC suspend
  davinci: add power management support
  DaVinci: DM365: Changing default queue for DM365.
  ...
parents 379e3a82 5f19daa1

arch/arm/mach-davinci/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -91,10 +91,14 @@ config MACH_DAVINCI_DM6467_EVM 
	bool "TI DM6467 EVM"

	default ARCH_DAVINCI_DM646x

	depends on ARCH_DAVINCI_DM646x

	select MACH_DAVINCI_DM6467TEVM

	help

	  Configure this option to specify the whether the board used

	  for development is a DM6467 EVM



config MACH_DAVINCI_DM6467TEVM

	bool



config MACH_DAVINCI_DM365_EVM

	bool "TI DM365 EVM"

	default ARCH_DAVINCI_DM365

arch/arm/mach-davinci/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ obj-$(CONFIG_MACH_SFFSDR) += board-sffsdr.o 
obj-$(CONFIG_MACH_NEUROS_OSD2)		+= board-neuros-osd2.o

obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)	+= board-dm355-evm.o

obj-$(CONFIG_MACH_DM355_LEOPARD)	+= board-dm355-leopard.o

obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM)	+= board-dm646x-evm.o

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
@@ -34,3 +34,4 @@ obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += board-da850-evm.o 
# Power Management

obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_SUSPEND)			+= pm.o sleep.o

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

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static __init void da830_evm_usb_init(void) 
	 * Set up USB clock/mode in the CFGCHIP2 register.

	 * FYI:  CFGCHIP2 is 0x0000ef00 initially.

	 */

	cfgchip2 = __raw_readl(DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP2_REG));

	cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));



	/* USB2.0 PHY reference clock is 24 MHz */

	cfgchip2 &= ~CFGCHIP2_REFFREQ;
@@ -139,7 +139,7 @@ static __init void da830_evm_usb_init(void) 
	cfgchip2 |=  CFGCHIP2_SESENDEN | CFGCHIP2_VBDTCTEN;

#endif



	__raw_writel(cfgchip2, DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP2_REG));

	__raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));



	/* USB_REFCLKIN is not used. */

	ret = davinci_cfg_reg(DA830_USB0_DRVVBUS);

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

+32 −2
Original line number Diff line number Diff line
@@ -46,8 +46,20 @@ 


static struct mtd_partition da850_evm_norflash_partition[] = {

	{

		.name           = "NOR filesystem",

		.name           = "bootloaders + env",

		.offset         = 0,

		.size           = SZ_512K,

		.mask_flags     = MTD_WRITEABLE,

	},

	{

		.name           = "kernel",

		.offset         = MTDPART_OFS_APPEND,

		.size           = SZ_2M,

		.mask_flags     = 0,

	},

	{

		.name           = "filesystem",

		.offset         = MTDPART_OFS_APPEND,

		.size           = MTDPART_SIZ_FULL,

		.mask_flags     = 0,

	},
@@ -77,6 +89,18 @@ static struct platform_device da850_evm_norflash_device = { 
	.resource	= da850_evm_norflash_resource,

};



static struct davinci_pm_config da850_pm_pdata = {

	.sleepcount = 128,

};



static struct platform_device da850_pm_device = {

	.name           = "pm-davinci",

	.dev = {

		.platform_data	= &da850_pm_pdata,

	},

	.id             = -1,

};



/* DA850/OMAP-L138 EVM includes a 512 MByte large-page NAND flash

 * (128K blocks). It may be used instead of the (default) SPI flash

 * to boot, using TI's tools to install the secondary boot loader
@@ -119,6 +143,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = { 
	.parts		= da850_evm_nandflash_partition,

	.nr_parts	= ARRAY_SIZE(da850_evm_nandflash_partition),

	.ecc_mode	= NAND_ECC_HW,

	.ecc_bits	= 4,

	.options	= NAND_USE_FLASH_BBT,

};
@@ -537,7 +562,7 @@ static int __init da850_evm_config_emac(void) 
	if (!machine_is_davinci_da850_evm())

		return 0;



	cfg_chip3_base = DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP3_REG);

	cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);



	val = __raw_readl(cfg_chip3_base);
@@ -696,6 +721,11 @@ static __init void da850_evm_init(void) 
	if (ret)

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

				ret);



	ret = da850_register_pm(&da850_pm_device);

	if (ret)

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

				ret);

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

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

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ static struct platform_device davinci_nand_device = { 
static struct davinci_i2c_platform_data i2c_pdata = {

	.bus_freq	= 400	/* kHz */,

	.bus_delay	= 0	/* usec */,

	.sda_pin        = 15,

	.scl_pin        = 14,

};



static struct snd_platform_data dm355_evm_snd_data;