Commit 24e93941 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'clps711x/soc2' into next/soc 

From Alexander Shiyan:

The main direction of this patchset - approaching the platform to the
possibility of using configurations with multiple platforms in a single
kernel. Added support of the majority of the necessary kernel symbol.
Also part of the driver code used only for the platform was moved to the
board code and converted to the use of standard drivers.

* clps711x/soc2:
  MAINTAINERS: Add ARM CLPS711X entry
  ARM: clps711x: Update defconfig due latest changes and new kernel symbols
  ARM: clps711x: Rename board files to match functionality
  ARM: clps711x: edb7211: Add support for NOR-Flash
  ARM: clps711x: Moving backlight controls of framebuffer driver to the board
  ARM: clps711x: p720t: Special driver for handling NAND memory is removed
  ARM: clps711x: Moving power management of framebuffer driver to the board
  ARM: clps711x: autcpu12: Special driver for handling NAND memory is removed
  ARM: clps711x: Unused empty "ACK" calls for IRQ-chips removed
  ARM: clps711x: Add FIQ interrupt handling
  ARM: clps711x: Implement usage "MULTI_IRQ_HANDLER" kernel option for a platform
  ARM: clps711x: Implement usage "SPARSE_IRQ" kernel option for a platform
  ARM: clps711x: cdb89712: Special driver for handling memory is removed
  ARM: clps711x: Always select AUTO_ZRELADDR for a platform
  ARM: clps711x: p720t: Unneeded inclusion of head-sa1100.S removed
  ARM: clps711x: Transform clps711x-framebuffer to platform driver and use it
  ARM: clps711x: p720t: Using "leds-gpio" driver for LED control
  ARM: clps711x: Using platform_driver for ethernet device
parents cab18d19 386ab516

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -713,6 +713,12 @@ S: Maintained 
F:	arch/arm/mach-cns3xxx/

T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git



ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE

M:	Alexander Shiyan <shc_work@mail.ru>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Odd Fixes

F:	arch/arm/mach-clps711x/



ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE

M:	Hartley Sweeten <hsweeten@visionengravers.com>

M:	Ryan Mallon <rmallon@gmail.com>

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -369,11 +369,14 @@ config ARCH_CLPS711X 
	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select AUTO_ZRELADDR

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_ARM720T

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for Cirrus Logic 711x/721x/731x based boards.

arch/arm/boot/compressed/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ ifeq ($(CONFIG_ARCH_SHARK),y) 
OBJS		+= head-shark.o ofw-shark.o

endif



ifeq ($(CONFIG_ARCH_P720T),y)

# Borrow this code from SA1100

OBJS		+= head-sa1100.o

endif



ifeq ($(CONFIG_ARCH_SA1100),y)

OBJS		+= head-sa1100.o

endif

arch/arm/configs/clps711x_defconfig

+21 −9
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_KERNEL_LZMA=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_RD_LZMA=y

CONFIG_EMBEDDED=y

CONFIG_SLOB=y

CONFIG_JUMP_LABEL=y

# CONFIG_LBDAF is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_MSDOS_PARTITION is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_CLPS711X=y

CONFIG_ARCH_AUTCPU12=y

CONFIG_ARCH_CDB89712=y
@@ -12,8 +16,10 @@ CONFIG_ARCH_CLEP7312=y 
CONFIG_ARCH_EDB7211=y

CONFIG_ARCH_P720T=y

CONFIG_ARCH_FORTUNET=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

# CONFIG_COREDUMP is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -22,6 +28,7 @@ CONFIG_INET=y 
CONFIG_IRDA=y

CONFIG_IRTTY_SIR=y

CONFIG_EP7211_DONGLE=y

# CONFIG_WIRELESS is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y
@@ -31,24 +38,21 @@ CONFIG_MTD_JEDECPROBE=y 
CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_CDB89712=y

CONFIG_MTD_AUTCPU12=y

CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPIO=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

CONFIG_CS89x0=y

CONFIG_CS89x0_PLATFORM=y

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_FUJITSU is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_RACAL is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set
@@ -59,14 +63,22 @@ CONFIG_CS89x0=y 
# CONFIG_VT is not set

CONFIG_SERIAL_CLPS711X_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_SPI=y

CONFIG_GPIO_GENERIC_PLATFORM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_CLPS711X=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_PLATFORM=y

# CONFIG_USB_SUPPORT is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_CRAMFS=y

CONFIG_MINIX_FS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_FTRACE is not set

arch/arm/mach-clps711x/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config ARCH_AUTCPU12 


config ARCH_CDB89712

	bool "CDB89712"

	select ISA

	help

	  This is an evaluation board from Cirrus for the CS89712 processor.

	  The board includes 2 serial ports, Ethernet, IRDA, and expansion
@@ -25,7 +24,6 @@ config ARCH_EDB7211 
	bool "EDB7211"

	select ARCH_SELECT_MEMORY_MODEL

	select ARCH_SPARSEMEM_ENABLE

	select ISA

	help

	  Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211

	  evaluation board.

CRA Git | Maintained and supported by SUSTech CRA and CCSE