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

Commit 0180a7d0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'at91-3.4-base+device_board' of... 

Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91 into next/drivers

* 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91:
  ARM: at91: Add external RTC for Flexibity board
  ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board
  ARM: at91: add clock selection parameter for at91_add_device_isi()
  ARM: at91: Update struct atmel_nand_data to support PMECC
  ARM: at91/dma: DMA controller registering with DT support
  ARM: at91/dma: remove platform data from DMA controller
  ARM: at91: code removal of CAP9 SoC

Conflicts:
	arch/arm/mach-at91/at91cap9.c
parents a5f17d1f 948ce6a6

Documentation/feature-removal-schedule.txt

+0 −14
Original line number Diff line number Diff line
@@ -510,17 +510,3 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The 
	convert to using pci_scan_root_bus() so they can supply a list of

	bus resources when the bus is created.

Who:	Bjorn Helgaas <bhelgaas@google.com>
 


----------------------------



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ config ARCH_AT91 
	select CLKDEV_LOOKUP

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 processors.



config ARCH_BCMRING

	bool "Broadcom BCMRING"

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ choice 
		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263, 9g45 and cap9"

		bool "Kernel low-level debugging on 9263 and 9g45"

		depends on HAVE_AT91_DBGU1



	config DEBUG_CLPS711X_UART1

arch/arm/configs/at91cap9_defconfig

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

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91CAP9=y

CONFIG_MACH_AT91CAP9ADK=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

# CONFIG_ARM_THUMB is not set

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 rw"

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_NETDEVICES=y

CONFIG_MII=y

CONFIG_MACB=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_USB_HID is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC_AT91=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91SAM9=y

CONFIG_EXT2_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

arch/arm/mach-at91/Kconfig

+1 −25
Original line number Diff line number Diff line
@@ -102,15 +102,6 @@ config ARCH_AT91SAM9G45 
	select HAVE_AT91_DBGU1

	select AT91_SAM9G45_RESET



config ARCH_AT91CAP9

	bool "AT91CAP9"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9G45_RESET



config ARCH_AT91X40

	bool "AT91x40"

	select ARCH_USES_GETTIMEOFFSET
@@ -447,21 +438,6 @@ endif 


# ----------------------------------------------------------



if ARCH_AT91CAP9



comment "AT91CAP9 Board Type"



config MACH_AT91CAP9ADK

	bool "Atmel AT91CAP9A-DK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138>



endif



# ----------------------------------------------------------



if ARCH_AT91X40



comment "AT91X40 Board Type"
@@ -544,7 +520,7 @@ config AT91_EARLY_DBGU0 
	depends on HAVE_AT91_DBGU0



config AT91_EARLY_DBGU1

	bool "DBGU on 9263, 9g45 and cap9"

	bool "DBGU on 9263 and 9g45"

	depends on HAVE_AT91_DBGU1



config AT91_EARLY_USART0