Commit 5d7e8af3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits)
  MIPS: Malta: enable Cirrus FB console
  MIPS: add CONFIG_VIRTUALIZATION for virtio support
  MIPS: Implement __read_mostly
  MIPS: ath79: add common WMAC device for AR913X based boards
  MIPS: ath79: Add initial support for the Atheros AP81 reference board
  MIPS: ath79: add common SPI controller device
  SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
  MIPS: ath79: add common GPIO buttons device
  MIPS: ath79: add common watchdog device
  MIPS: ath79: add common GPIO LEDs device
  MIPS: ath79: add initial support for the Atheros PB44 reference board
  MIPS: ath79: utilize the MIPS multi-machine support
  MIPS: ath79: add GPIOLIB support
  MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs
  MIPS: jump label: Add MIPS support.
  MIPS: Use WARN() in uasm for better diagnostics.
  MIPS: Optimize TLB handlers for Octeon CPUs
  MIPS: Add LDX and LWX instructions to uasm.
  MIPS: Use BBIT instructions in TLB handlers
  MIPS: Declare uasm bbit0 and bbit1 functions.
  ...
parents aa891f6b 79aa18d5

arch/mips/Kbuild.platforms

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


platforms += alchemy

platforms += ar7

platforms += ath79

platforms += bcm47xx

platforms += bcm63xx

platforms += cavium-octeon

arch/mips/Kconfig

+37 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config MIPS 
	select HAVE_DMA_API_DEBUG

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select HAVE_ARCH_JUMP_LABEL



menu "Machine selection"
@@ -65,6 +66,22 @@ config AR7 
	  Support for the Texas Instruments AR7 System-on-a-Chip

	  family: TNETD7100, 7200 and 7300.



config ATH79

	bool "Atheros AR71XX/AR724X/AR913X based boards"

	select ARCH_REQUIRE_GPIOLIB

	select BOOT_RAW

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select MIPS_MACHINE

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  Support for the Atheros AR71XX/AR724X/AR913X SoCs.



config BCM47XX

	bool "Broadcom BCM47XX based boards"

	select CEVT_R4K
@@ -717,6 +734,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
endchoice



source "arch/mips/alchemy/Kconfig"

source "arch/mips/ath79/Kconfig"

source "arch/mips/bcm63xx/Kconfig"

source "arch/mips/jazz/Kconfig"

source "arch/mips/jz4740/Kconfig"
@@ -883,6 +901,9 @@ config MIPS_DISABLE_OBSOLETE_IDE 
config SYNC_R4K

	bool



config MIPS_MACHINE

	def_bool n



config NO_IOPORT

	def_bool n
@@ -2400,4 +2421,20 @@ source "security/Kconfig" 


source "crypto/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"

	default n

	---help---

	  Say Y here to get to see options for using your Linux host to run other

	  operating systems inside virtual machines (guests).

	  This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped and disabled.



if VIRTUALIZATION



source drivers/virtio/Kconfig



endif # VIRTUALIZATION



source "lib/Kconfig"

arch/mips/ath79/Kconfig

0 → 100644
+50 −0
Original line number Diff line number Diff line 
if ATH79



menu "Atheros AR71XX/AR724X/AR913X machine selection"



config ATH79_MACH_AP81

	bool "Atheros AP81 reference board"

	select SOC_AR913X

	select ATH79_DEV_AR913X_WMAC

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	help

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

	  Atheros AP81 reference board.



config ATH79_MACH_PB44

	bool "Atheros PB44 reference board"

	select SOC_AR71XX

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	help

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

	  Atheros PB44 reference board.



endmenu



config SOC_AR71XX

	def_bool n



config SOC_AR724X

	def_bool n



config SOC_AR913X

	def_bool n



config ATH79_DEV_AR913X_WMAC

	depends on SOC_AR913X

	def_bool n



config ATH79_DEV_GPIO_BUTTONS

	def_bool n



config ATH79_DEV_LEDS_GPIO

	def_bool n



config ATH79_DEV_SPI

	def_bool n



endif

arch/mips/ath79/Makefile

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#

# Makefile for the Atheros AR71XX/AR724X/AR913X specific parts of the kernel

#

# Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>

# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>

#

# This program is free software; you can redistribute it and/or modify it

# under the terms of the GNU General Public License version 2 as published

# by the Free Software Foundation.



obj-y	:= prom.o setup.o irq.o common.o clock.o gpio.o



obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o



#

# Devices

#

obj-y					+= dev-common.o

obj-$(CONFIG_ATH79_DEV_AR913X_WMAC)	+= dev-ar913x-wmac.o

obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o

obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o

obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o



#

# Machines

#

obj-$(CONFIG_ATH79_MACH_AP81)		+= mach-ap81.o

obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o

arch/mips/ath79/Platform

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Atheros AR71xx/AR724x/AR913x

#



platform-$(CONFIG_ATH79)	+= ath79/

cflags-$(CONFIG_ATH79)		+= -I$(srctree)/arch/mips/include/asm/mach-ath79

load-$(CONFIG_ATH79)		= 0xffffffff80060000

CRA Git | Maintained and supported by SUSTech CRA and CCSE