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

Commit 7b7adc4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32

: (40 commits)
  unicore32: rewrite arch-specific tlb.h to use asm-generic version
  unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
  unicore32: replace unicore32-specific iomap functions with generic lib implementation
  unicore32 machine related: add frame buffer driver for pkunity-v3 soc
  unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
  unicore32 io: redefine __REG(x) and re-use readl/writel funcs
  unicore32 i8042 upgrade and bugfix: adjust resource request region type
  unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call
  unicore32 i8042: adjust io funcs of i8042-unicore32io.h
  unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
  unicore32: modify function names and parameters for irq_chips
  unicore32: remove unused lines in arch/unicore32/include/asm/irq.h
  unicore32 time.c: change calculate method for clock_event_device
  unicore32: ADD MAINTAINER for unicore32 architecture
  unicore32 machine related files: ps2 driver
  unicore32 machine related files: pci bus handling
  unicore32 machine related files: hardware registers
  unicore32 machine related files: core files
  unicore32 additional architecture files: boot process
  unicore32 additional architecture files: low-level lib: misc
  ...

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 31598e87 289d6b0e

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -4907,6 +4907,15 @@ S: Maintained 
F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h



PKUNITY SOC DRIVERS

M:	Guan Xuetao <gxt@mprc.pku.edu.cn>

W:	http://mprc.pku.edu.cn/~guanxuetao/linux

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git

F:	drivers/input/serio/i8042-unicore32io.h

F:	drivers/i2c/busses/i2c-puv3.c

F:	drivers/video/fb-puv3.c



PMC SIERRA MaxRAID DRIVER

M:	Anil Ravindranath <anil_ravindranath@pmc-sierra.com>

L:	linux-scsi@vger.kernel.org
@@ -6270,6 +6279,13 @@ F: drivers/uwb/ 
F:	include/linux/uwb.h

F:	include/linux/uwb/



UNICORE32 ARCHITECTURE:

M:	Guan Xuetao <gxt@mprc.pku.edu.cn>

W:	http://mprc.pku.edu.cn/~guanxuetao/linux

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git

F:	arch/unicore32/



UNIFDEF

M:	Tony Finch <dot@dotat.at>

W:	http://dotat.at/prog/unifdef

arch/unicore32/.gitignore

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

# Generated include files

#

include/generated

#

# Generated ld script file

#

kernel/vmlinux.lds

#

# Generated images in boot

#

boot/Image

boot/zImage

boot/uImage

#

# Generated files in boot/compressed

#

boot/compressed/piggy.S

boot/compressed/piggy.gzip

boot/compressed/vmlinux

boot/compressed/vmlinux.lds

arch/unicore32/Kconfig

0 → 100644
+275 −0
Original line number Diff line number Diff line 
config UNICORE32

	def_bool y

	select HAVE_MEMBLOCK

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_GENERIC_HARDIRQS

	select HAVE_DMA_ATTRS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_IRQ_PROBE

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select ARCH_WANT_FRAME_POINTERS

	help

	  UniCore-32 is 32-bit Instruction Set Architecture,

	  including a series of low-power-consumption RISC chip

	  designs licensed by PKUnity Ltd.

	  Please see web page at <http://www.pkunity.com/>.



config HAVE_PWM

	bool



config GENERIC_GPIO

	def_bool y



config GENERIC_CLOCKEVENTS

	bool



config GENERIC_CSUM

	def_bool y



config GENERIC_IOMAP

	def_bool y



config NO_IOPORT

	bool



config STACKTRACE_SUPPORT

	def_bool y



config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config LOCKDEP_SUPPORT

	def_bool y



config RWSEM_GENERIC_SPINLOCK

	def_bool y



config RWSEM_XCHGADD_ALGORITHM

	bool



config ARCH_HAS_ILOG2_U32

	bool



config ARCH_HAS_ILOG2_U64

	bool



config ARCH_HAS_CPUFREQ

	bool



config GENERIC_HWEIGHT

	def_bool y



config GENERIC_CALIBRATE_DELAY

	def_bool y



config ARCH_MAY_HAVE_PC_FDC

	bool



config NEED_DMA_MAP_STATE

       def_bool y



source "init/Kconfig"



source "kernel/Kconfig.freezer"



menu "System Type"



config MMU

	def_bool y



config ARCH_FPGA

	bool



config ARCH_PUV3

	def_bool y

	select CPU_UCV2

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ



# CONFIGs for ARCH_PUV3



if ARCH_PUV3



choice

	prompt "Board Selection"

	default PUV3_DB0913



config PUV3_FPGA_DLX200

	select ARCH_FPGA

	bool "FPGA board"



config PUV3_DB0913

	bool "DEBUG board (0913)"



config PUV3_NB0916

	bool "NetBook board (0916)"

	select HAVE_PWM



config PUV3_SMW0919

	bool "Security Mini-Workstation board (0919)"



endchoice



config PUV3_PM

	def_bool y if !ARCH_FPGA



endif



source "arch/unicore32/mm/Kconfig"



comment "Floating poing support"



config UNICORE_FPU_F64

	def_bool y if !ARCH_FPGA



endmenu



menu "Bus support"



config PCI

	bool "PCI Support"

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or

	  VESA. If you have PCI, say Y, otherwise N.



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"



endmenu



menu "Kernel Features"



source "kernel/time/Kconfig"



source "kernel/Kconfig.preempt"



source "kernel/Kconfig.hz"



source "mm/Kconfig"



config LEDS

	def_bool y

	depends on GENERIC_GPIO



config ALIGNMENT_TRAP

	def_bool y

	help

	  Unicore processors can not fetch/store information which is not

	  naturally aligned on the bus, i.e., a 4 byte fetch must start at an

	  address divisible by 4. On 32-bit Unicore processors, these non-aligned

	  fetch/store instructions will be emulated in software if you say

	  here, which has a severe performance impact. This is necessary for

	  correct operation of some network protocols. With an IP-only

	  configuration it is safe to say N, otherwise say Y.



endmenu



menu "Boot options"



config CMDLINE

	string "Default kernel command string"

	default ""



config CMDLINE_FORCE

	bool "Always use the default kernel command string"

	depends on CMDLINE != ""

	help

	  Always use the default kernel command string, even if the boot

	  loader passes other arguments to the kernel.

	  This is useful if you cannot or don't want to change the

	  command-line options your boot loader passes to the kernel.



	  If unsure, say N.



endmenu



menu "Userspace binary formats"



source "fs/Kconfig.binfmt"



endmenu



menu "Power management options"



source "kernel/power/Kconfig"



if ARCH_HAS_CPUFREQ

source "drivers/cpufreq/Kconfig"

endif



config ARCH_SUSPEND_POSSIBLE

	def_bool y if !ARCH_FPGA



config ARCH_HIBERNATION_POSSIBLE

	def_bool y if !ARCH_FPGA



endmenu



source "net/Kconfig"



if ARCH_PUV3



config PUV3_GPIO

	bool

	depends on !ARCH_FPGA

	select GENERIC_GPIO

	select GPIO_SYSFS if EXPERIMENTAL

	default y



config PUV3_PWM

	tristate

	default BACKLIGHT_PWM

	help

	  Enable support for NB0916 PWM controllers



config PUV3_RTC

	tristate "PKUnity v3 RTC Support"

	depends on !ARCH_FPGA



if PUV3_NB0916



menu "PKUnity NetBook-0916 Features"



config I2C_BATTERY_BQ27200

	tristate "I2C Battery BQ27200 Support"

	select PUV3_I2C

	select POWER_SUPPLY

	select BATTERY_BQ27x00



config I2C_EEPROM_AT24

	tristate "I2C EEPROMs AT24 support"

	select PUV3_I2C

	select MISC_DEVICES

	select EEPROM_AT24



config LCD_BACKLIGHT

	tristate "LCD Backlight support"

	select BACKLIGHT_LCD_SUPPORT

	select BACKLIGHT_PWM



endmenu



endif



endif



source "drivers/Kconfig"



source "fs/Kconfig"



source "arch/unicore32/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"

arch/unicore32/Kconfig.debug

0 → 100644
+68 −0
Original line number Diff line number Diff line 
menu "Kernel hacking"



source "lib/Kconfig.debug"



config STRICT_DEVMEM

	bool "Filter access to /dev/mem"

	depends on MMU

	---help---

	  If this option is disabled, you allow userspace (root) access to all

	  of memory, including kernel and userspace memory. Accidental

	  access to this is obviously disastrous, but specific access can

	  be used by people debugging the kernel.



	  If this option is switched on, the /dev/mem file only allows

	  userspace access to memory mapped peripherals.



          If in doubt, say Y.



config EARLY_PRINTK

	def_bool DEBUG_OCD

	help

	  Write kernel log output directly into the ocd or to a serial port.



	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized. For normal operation

	  it is not recommended because it looks ugly and doesn't cooperate

	  with klogd/syslogd or the X server. You should normally N here,

	  unless you want to debug such a crash.



config DEBUG_STACK_USAGE

	bool "Enable stack utilization instrumentation"

	depends on DEBUG_KERNEL

	help

	  Enables the display of the minimum amount of free stack which each

	  task has ever had available in the sysrq-T output.



# These options are only for real kernel hackers who want to get their hands dirty.

config DEBUG_LL

	bool "Kernel low-level debugging functions"

	depends on DEBUG_KERNEL

	help

	  Say Y here to include definitions of printascii, printch, printhex

	  in the kernel.  This is helpful if you are debugging code that

	  executes before the console is initialized.



config DEBUG_OCD

	bool "Kernel low-level debugging via On-Chip-Debugger"

	depends on DEBUG_LL

	default y

	help

	  Say Y here if you want the debug print routines to direct their

	  output to the UniCore On-Chip-Debugger channel using CP #1.



config DEBUG_OCD_BREAKPOINT

	bool "Breakpoint support via On-Chip-Debugger"

	depends on DEBUG_OCD



config DEBUG_UART

	int "Kernel low-level debugging messages via serial port"

	depends on DEBUG_LL

	range 0 1

	default "0"

	help

	  Choice for UART for kernel low-level using PKUnity UARTS,

	  should be between zero and one. The port must have been

	  initialised by the boot-loader before use.



endmenu

arch/unicore32/Makefile

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

# arch/unicore32/Makefile

#

# This file is included by the global makefile so that you can add your own

# architecture-specific flags and dependencies.

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 2002~2010 by Guan Xue-tao

#

ifneq ($(SUBARCH),$(ARCH))

	ifeq ($(CROSS_COMPILE),)

		CROSS_COMPILE := $(call cc-cross-prefix, unicore32-linux-)

	endif

endif



LDFLAGS_vmlinux		:= -p --no-undefined -X



OBJCOPYFLAGS		:= -O binary -R .note -R .note.gnu.build-id -R .comment -S



# Never generate .eh_frame

KBUILD_CFLAGS		+= $(call cc-option,-fno-dwarf2-cfi-asm)



# Never use hard float in kernel

KBUILD_CFLAGS		+= -msoft-float



ifeq ($(CONFIG_FRAME_POINTER),y)

KBUILD_CFLAGS		+= -mno-sched-prolog

endif



CHECKFLAGS		+= -D__unicore32__



head-y			:= arch/unicore32/kernel/head.o

head-y			+= arch/unicore32/kernel/init_task.o



core-y			+= arch/unicore32/kernel/

core-y			+= arch/unicore32/mm/



libs-y			+= arch/unicore32/lib/



ASM_GENERATED_DIR	:= $(srctree)/arch/unicore32/include/generated

LINUXINCLUDE		+= -I$(ASM_GENERATED_DIR)



ASM_GENERIC_HEADERS	:= atomic.h auxvec.h

ASM_GENERIC_HEADERS	+= bitsperlong.h bug.h bugs.h

ASM_GENERIC_HEADERS	+= cputime.h current.h

ASM_GENERIC_HEADERS	+= device.h div64.h

ASM_GENERIC_HEADERS	+= emergency-restart.h errno.h

ASM_GENERIC_HEADERS	+= fb.h fcntl.h ftrace.h

ASM_GENERIC_HEADERS	+= hardirq.h hw_irq.h

ASM_GENERIC_HEADERS	+= ioctl.h ioctls.h ipcbuf.h irq_regs.h

ASM_GENERIC_HEADERS	+= kdebug.h kmap_types.h

ASM_GENERIC_HEADERS	+= local.h

ASM_GENERIC_HEADERS	+= mman.h module.h msgbuf.h

ASM_GENERIC_HEADERS	+= param.h parport.h percpu.h poll.h posix_types.h

ASM_GENERIC_HEADERS	+= resource.h

ASM_GENERIC_HEADERS	+= scatterlist.h sections.h segment.h sembuf.h serial.h

ASM_GENERIC_HEADERS	+= setup.h shmbuf.h shmparam.h

ASM_GENERIC_HEADERS	+= siginfo.h signal.h sizes.h

ASM_GENERIC_HEADERS	+= socket.h sockios.h stat.h statfs.h swab.h syscalls.h

ASM_GENERIC_HEADERS	+= termbits.h termios.h topology.h types.h

ASM_GENERIC_HEADERS	+= ucontext.h unaligned.h user.h

ASM_GENERIC_HEADERS	+= vga.h

ASM_GENERIC_HEADERS	+= xor.h



archprepare:

ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR)))

	$(Q)mkdir -p $(ASM_GENERATED_DIR)/asm

	$(Q)$(foreach a, $(ASM_GENERIC_HEADERS),	\

		echo '#include <asm-generic/$a>'	\

			> $(ASM_GENERATED_DIR)/asm/$a; )

endif



boot			:= arch/unicore32/boot



# Default target when executing plain make

KBUILD_IMAGE		:= zImage



all:	$(KBUILD_IMAGE)



zImage Image uImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



MRPROPER_DIRS		+= $(ASM_GENERATED_DIR)



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



define archhelp

  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

  echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'

  echo  '  uImage        - U-Boot wrapped zImage'

endef