Commit 117a6df3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v3.15/soc' of... 

Merge tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci SoC updates for v3.15" from Sekhar Nori:

This pull request removes da8xx_omapl_defconfig
enabling all ARMv5 davinci devices to be built
using davinci_all_defconfig

* tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: remove da8xx_omapl_defconfig
  ARM: davinci: da8xx: fix multiple watchdog device registration
  ARM: davinci: add da8xx specific configs to davinci_all_defconfig
  ARM: davinci: enable da8xx build concurrently with older devices

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9d6eccb9 4b9e44f8

arch/arm/configs/da8xx_omapl_defconfig

deleted100644 → 0
+0 −139
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_DAVINCI=y

CONFIG_ARCH_DAVINCI_DA830=y

CONFIG_ARCH_DAVINCI_DA850=y

CONFIG_MACH_DA8XX_DT=y

CONFIG_MACH_MITYOMAPL138=y

CONFIG_MACH_OMAPL138_HAWKBOARD=y

CONFIG_DAVINCI_RESET_CLOCKS=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_LEDS=y

CONFIG_USE_OF=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_PERFORMANCE=m

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_IDLE=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_LRO is not set

CONFIG_NETFILTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_FW_LOADER is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=1

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=m

CONFIG_BLK_DEV_SD=m

CONFIG_NETDEVICES=y

CONFIG_TUN=m

CONFIG_LXT_PHY=y

CONFIG_LSI_ET1011C_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_TI_DAVINCI_EMAC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_NETCONSOLE=y

CONFIG_NETPOLL_TRAP=y

CONFIG_INPUT_MOUSEDEV=m

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_ATKBD=m

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_XTKBD=m

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_VT_CONSOLE is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=3

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DAVINCI=y

CONFIG_PINCTRL_SINGLE=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DUMMY=y

CONFIG_REGULATOR_TPS6507X=y

CONFIG_FB=y

CONFIG_FB_DA8XX=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SOC=m

CONFIG_SND_DAVINCI_SOC=m

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_DMADEVICES=y

CONFIG_TI_EDMA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_XFS_FS=m

CONFIG_INOTIFY=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_CRAMFS=y

CONFIG_MINIX_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_SMB_FS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=m

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_CCITT=m

CONFIG_CRC_T10DIF=m

arch/arm/configs/davinci_all_defconfig

+20 −0
Original line number Diff line number Diff line
@@ -20,9 +20,14 @@ CONFIG_ARCH_DAVINCI_DM644x=y 
CONFIG_ARCH_DAVINCI_DM355=y

CONFIG_ARCH_DAVINCI_DM646x=y

CONFIG_ARCH_DAVINCI_DM365=y

CONFIG_ARCH_DAVINCI_DA830=y

CONFIG_ARCH_DAVINCI_DA850=y

CONFIG_MACH_DA8XX_DT=y

CONFIG_MACH_SFFSDR=y

CONFIG_MACH_NEUROS_OSD2=y

CONFIG_MACH_DM355_LEOPARD=y

CONFIG_MACH_MITYOMAPL138=y

CONFIG_MACH_OMAPL138_HAWKBOARD=y

CONFIG_DAVINCI_MUX_DEBUG=y

CONFIG_DAVINCI_MUX_WARNINGS=y

CONFIG_DAVINCI_RESET_CLOCKS=y
@@ -32,8 +37,16 @@ CONFIG_PREEMPT=y 
CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_LEDS=y

CONFIG_USE_OF=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_AUTO_ZRELADDR=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_PERFORMANCE=m

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_IDLE=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -71,6 +84,7 @@ CONFIG_TUN=m 
CONFIG_LXT_PHY=y

CONFIG_LSI_ET1011C_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_TI_DAVINCI_EMAC=y

CONFIG_DM9000=y

# CONFIG_NETDEV_1000 is not set
@@ -97,15 +111,21 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=3

# CONFIG_HW_RANDOM is not set

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DAVINCI=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIO_PCF857X=y

CONFIG_WATCHDOG=y

CONFIG_DAVINCI_WATCHDOG=m

CONFIG_MFD_DM355EVM_MSP=y

CONFIG_TPS6507X=y

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TPS6507X=y

CONFIG_FB=y

CONFIG_FB_DA8XX=y

CONFIG_FIRMWARE_EDID=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

arch/arm/mach-davinci/Makefile.boot

+7 −13
Original line number Diff line number Diff line 
ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)

ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)

$(error Cannot enable DaVinci and DA8XX platforms concurrently)

else

   zreladdr-y	+= 0xc0008000

params_phys-y	:= 0xc0000100

initrd_phys-y	:= 0xc0800000

endif

else

   zreladdr-y	+= 0x80008000

params_phys-y	:= 0x80000100

initrd_phys-y	:= 0x80800000

endif
 
zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX)		+= 0xc0008000

params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)	:= 0xc0000100

initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)	:= 0xc0800000



zreladdr-$(CONFIG_ARCH_DAVINCI_DMx)		+= 0x80008000

params_phys-$(CONFIG_ARCH_DAVINCI_DMx)		:= 0x80000100

initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx)		:= 0x80800000

arch/arm/mach-davinci/davinci.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata); 
#define DM646X_ASYNC_EMIF_CONTROL_BASE	0x20008000

#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000



int davinci_init_wdt(void);



/* DM355 function declarations */

void dm355_init(void);

void dm355_init_spi0(unsigned chipselect_mask,

arch/arm/mach-davinci/devices.c

+2 −15
Original line number Diff line number Diff line
@@ -313,9 +313,9 @@ void davinci_restart(enum reboot_mode mode, const char *cmd) 
	davinci_watchdog_reset(&davinci_wdt_device);

}



static void davinci_init_wdt(void)

int davinci_init_wdt(void)

{

	platform_device_register(&davinci_wdt_device);

	return platform_device_register(&davinci_wdt_device);

}



static struct platform_device davinci_gpio_device = {
@@ -348,16 +348,3 @@ struct davinci_timer_instance davinci_timer_instance[2] = { 
	},

};

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



static int __init davinci_init_devices(void)

{

	/* please keep these calls, and their implementations above,

	 * in alphabetical order so they're easier to sort through.

	 */

	davinci_init_wdt();



	return 0;

}

arch_initcall(davinci_init_devices);

CRA Git | Maintained and supported by SUSTech CRA and CCSE