Commit d9fa15a5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.6/fixes' of... 

Merge tag 'davinci-for-v4.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical

Warning fixes for DaVinci collected while testing
randconfig builds.

* tag 'davinci-for-v4.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: make I2C support optional
  ARM: davinci: DA8xx+DMx combined kernels need PATCH_PHYS_VIRT
  ARM: davinci: avoid unused mityomapl138_pn_info variable
  ARM: davinci: limit DT support to DA850
parents ef2b1d77 8e580411

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ config ARCH_DAVINCI 
	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CPU_ARM926T

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

arch/arm/mach-davinci/Kconfig

+4 −18
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config CP_INTC 


config ARCH_DAVINCI_DMx

	bool

	select CPU_ARM926T



menu "TI DaVinci Implementations"
@@ -32,7 +31,7 @@ config ARCH_DAVINCI_DM646x 


config ARCH_DAVINCI_DA830

	bool "DA830/OMAP-L137/AM17x based system"

	depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR

	depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)

	select ARCH_DAVINCI_DA8XX

	# needed on silicon revs 1.0, 1.1:

	select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
@@ -40,13 +39,12 @@ config ARCH_DAVINCI_DA830 


config ARCH_DAVINCI_DA850

	bool "DA850/OMAP-L138/AM18x based system"

	depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR

	depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)

	select ARCH_DAVINCI_DA8XX

	select CP_INTC



config ARCH_DAVINCI_DA8XX

	bool

	select CPU_ARM926T



config ARCH_DAVINCI_DM365

	bool "DaVinci 365 based system"
@@ -58,7 +56,7 @@ comment "DaVinci Board Type" 
config MACH_DA8XX_DT

	bool "Support DA8XX platforms using device tree"

	default y

	depends on ARCH_DAVINCI_DA8XX

	depends on ARCH_DAVINCI_DA850

	select PINCTRL

	help

	  Say y here to include support for TI DaVinci DA850 based using
@@ -68,8 +66,6 @@ config MACH_DAVINCI_EVM 
	bool "TI DM644x EVM"

	default ARCH_DAVINCI_DM644x

	depends on ARCH_DAVINCI_DM644x

	select EEPROM_AT24

	select I2C

	help

	  Configure this option to specify the whether the board used

	  for development is a DM644x EVM
@@ -77,8 +73,6 @@ config MACH_DAVINCI_EVM 
config MACH_SFFSDR

	bool "Lyrtech SFFSDR"

	depends on ARCH_DAVINCI_DM644x

	select EEPROM_AT24

	select I2C

	help

	  Say Y here to select the Lyrtech Small Form Factor

	  Software Defined Radio (SFFSDR) board.
@@ -109,8 +103,6 @@ config MACH_DAVINCI_DM6467_EVM 
	bool "TI DM6467 EVM"

	default ARCH_DAVINCI_DM646x

	depends on ARCH_DAVINCI_DM646x

	select EEPROM_AT24

	select I2C

	select MACH_DAVINCI_DM6467TEVM

	help

	  Configure this option to specify the whether the board used
@@ -123,8 +115,6 @@ config MACH_DAVINCI_DM365_EVM 
	bool "TI DM365 EVM"

	default ARCH_DAVINCI_DM365

	depends on ARCH_DAVINCI_DM365

	select EEPROM_AT24

	select I2C

	help

	  Configure this option to specify whether the board used

	  for development is a DM365 EVM
@@ -133,9 +123,7 @@ config MACH_DAVINCI_DA830_EVM 
	bool "TI DA830/OMAP-L137/AM17x Reference Platform"

	default ARCH_DAVINCI_DA830

	depends on ARCH_DAVINCI_DA830

	select EEPROM_AT24

	select GPIO_PCF857X

	select I2C

	select GPIO_PCF857X if I2C

	help

	  Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module.
@@ -204,8 +192,6 @@ endchoice 
config MACH_MITYOMAPL138

	bool "Critical Link MityDSP-L138/MityARM-1808 SoM"

	depends on ARCH_DAVINCI_DA850

	select EEPROM_AT24

	select I2C

	help

	  Say Y here to select the Critical Link MityDSP-L138/MityARM-1808

	  System on Module.  Information on this SoM may be found at

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

+6 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static struct platform_device rtc_dev = { 
static struct snd_platform_data dm644x_evm_snd_data;



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



#ifdef CONFIG_I2C

/*

 * I2C GPIO expanders

 */
@@ -612,6 +612,7 @@ static void __init evm_init_i2c(void) 
	i2c_add_driver(&dm6446evm_msp_driver);

	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));

}

#endif



#define VENC_STD_ALL	(V4L2_STD_NTSC | V4L2_STD_PAL)
@@ -780,7 +781,9 @@ static __init void davinci_evm_init(void) 
				pr_warn("%s: Cannot configure AEMIF\n",

					__func__);



#ifdef CONFIG_I2C

			evm_leds[7].default_trigger = "nand-disk";

#endif

			if (HAS_NOR)

				pr_warn("WARNING: both NAND and NOR flash are enabled; disable one of them.\n");

		} else if (HAS_NOR)
@@ -789,9 +792,10 @@ static __init void davinci_evm_init(void) 


	platform_add_devices(davinci_evm_devices,

			     ARRAY_SIZE(davinci_evm_devices));

#ifdef CONFIG_I2C

	evm_init_i2c();



	davinci_setup_mmc(0, &dm6446evm_mmc_config);

#endif

	dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg);



	davinci_serial_init(dm644x_serial_device);

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

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static struct platform_device davinci_nand_device = { 


#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)



#ifdef CONFIG_I2C

/* CPLD Register 0 bits to control ATA */

#define DM646X_EVM_ATA_RST		BIT(0)

#define DM646X_EVM_ATA_PWD		BIT(1)
@@ -316,6 +317,7 @@ static struct at24_platform_data eeprom_info = { 
	.setup          = davinci_get_mac_addr,

	.context	= (void *)0x7f00,

};

#endif



static u8 dm646x_iis_serializer_direction[] = {

       TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE,
@@ -346,6 +348,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { 
	},

};



#ifdef CONFIG_I2C

static struct i2c_client *cpld_client;



static int cpld_video_probe(struct i2c_client *client,
@@ -710,6 +713,7 @@ static void __init evm_init_i2c(void) 
	evm_init_cpld();

	evm_init_video();

}

#endif



#define DM6467T_EVM_REF_FREQ		33000000
@@ -764,7 +768,10 @@ static __init void evm_init(void) 
	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);



#ifdef CONFIG_I2C

	evm_init_i2c();

#endif



	davinci_serial_init(dm646x_serial_device);

	dm646x_init_mcasp0(&dm646x_evm_snd_data[0]);

	dm646x_init_mcasp1(&dm646x_evm_snd_data[1]);

arch/arm/mach-davinci/board-mityomapl138.c

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct factory_config { 


static struct factory_config factory_config;



#ifdef CONFIG_CPU_FREQ

struct part_no_info {

	const char	*part_no;	/* part number string of interest */

	int		max_freq;	/* khz */
@@ -87,7 +88,6 @@ static struct part_no_info mityomapl138_pn_info[] = { 
	},

};



#ifdef CONFIG_CPU_FREQ

static void mityomapl138_cpufreq_init(const char *partnum)

{

	int i, ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE