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

Commit c00d4ffd authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'orion' into devel 



* orion: (26 commits)
  [ARM] Orion: implement power-off method for QNAP TS-109/209
  [ARM] Orion: add support for QNAP TS-109/TS-209
  [ARM] Orion: I2C support
  [I2C] i2c-mv64xxx: Don't set i2c_adapter.retries
  [I2C] Split mv643xx I2C platform support
  [ARM] Orion: enable CONFIG_RTC_DRV_M41T80 for D-Link DNS-323
  [ARM] Orion defconfig
  [ARM] Orion: add support for Orion/MV88F5181 based D-Link DNS-323
  [ARM] Orion: MV88F5181 support bits
  [ARM] Orion: Buffalo/Revogear Kurobox Pro support
  [ARM] OrionNAS RD board support
  [ARM] Orion: support for Marvell Orion-2 (88F5281) Development Board
  [ARM] Orion: common platform setup for Gigabit Ethernet port
  [ARM] Orion: platform device registration for UART, USB and NAND
  [ARM] Orion: system timer support
  [ARM] Orion edge GPIO IRQ support
  [ARM] Orion: IRQ support
  [ARM] Orion: provide GPIO method for enabling hardware assisted blinking
  [ARM] Orion: GPIO support
  [ARM] Orion: programable address map support
  ...

Conflicts:

	arch/arm/Kconfig
	arch/arm/Makefile

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents d0d42df2 8f86dda3

arch/arm/Kconfig

+14 −2
Original line number Diff line number Diff line
@@ -334,6 +334,16 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_ORION

	bool "Marvell Orion"

	depends on MMU

	select PCI

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Marvell Orion System on Chip family.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	help
@@ -454,6 +464,8 @@ source "arch/arm/mach-omap1/Kconfig" 


source "arch/arm/mach-omap2/Kconfig"



source "arch/arm/mach-orion/Kconfig"



source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"
@@ -732,7 +744,7 @@ config LEDS 
		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

		   ARCH_KS8695

		   ARCH_KS8695 || MACH_RD88F5182

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.
@@ -967,7 +979,7 @@ config FPE_FASTFPE 


config VFP

	bool "VFP-format floating point maths"

	depends on CPU_V6 || CPU_ARM926T || CPU_V7

	depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON

	help

	  Say Y to include VFP support code in the kernel. This is needed

	  if your hardware includes a VFP unit.

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ endif 
 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_ORION)	   := orion

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm



ifeq ($(CONFIG_ARCH_EBSA110),y)

arch/arm/boot/compressed/head.S

+14 −1
Original line number Diff line number Diff line
@@ -623,6 +623,12 @@ proc_types: 
		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_flush



		.word	0x56055310		@ Feroceon

		.word	0xfffffff0

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush



		@ These match on the architecture ID



		.word	0x00020000		@ ARMv4T
@@ -641,7 +647,7 @@ proc_types: 
		.word	0x000f0000

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_flush

		b	__armv5tej_mmu_cache_flush



		.word	0x0007b000		@ ARMv6

		.word	0x000ff000
@@ -821,6 +827,13 @@ iflush: 
		mcr	p15, 0, r10, c7, c10, 4	@ drain WB

		mov	pc, lr



__armv5tej_mmu_cache_flush:

1:		mrc	p15, 0, r15, c7, c14, 3	@ test,clean,invalidate D cache

		bne	1b

		mcr	p15, 0, r0, c7, c5, 0	@ flush I cache

		mcr	p15, 0, r0, c7, c10, 4	@ drain WB

		mov	pc, lr



__armv4_mmu_cache_flush:

		mov	r2, #64*1024		@ default: 32K dcache size (*2)

		mov	r11, #32		@ default: 32 byte line size

arch/arm/configs/orion_defconfig

0 → 100644
+1384 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-orion/Kconfig

0 → 100644
+41 −0
Original line number Diff line number Diff line 
if ARCH_ORION



menu "Orion Implementations"



config MACH_DB88F5281

	bool "Marvell Orion-2 Development Board"

	select I2C_BOARDINFO

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Orion-2 (88F5281) Development Board



config MACH_RD88F5182

	bool "Marvell Orion-NAS Reference Design"

	select I2C_BOARDINFO

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Orion-NAS (88F5182) RD2



config MACH_KUROBOX_PRO

	bool "KuroBox Pro"

	select I2C_BOARDINFO

	help

	  Say 'Y' here if you want your kernel to support the

	  KuroBox Pro platform.



config MACH_DNS323

	bool "D-Link DNS-323"

	select I2C_BOARDINFO

	help

	  Say 'Y' here if you want your kernel to support the

	  D-Link DNS-323 platform.



config MACH_TS209

	bool "QNAP TS-109/TS-209"

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-109/TS-209 platform.



endmenu



endif