UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
286,603 Commits 6 Branches 34 Tags 3.2 GiB
Commit Graph

7 Commits

Author SHA1 Message Date
Russell King 7b9dd47136 Merge branch 'restart' into for-linus 
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
 2012-01-05 13:25:27 +00:00
Russell King d9ca5839fd ARM: restart: sa1100: use new restart hook 
Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-05 12:57:19 +00:00
Bjorn Helgaas 2b97479591 ARM: mach-sa1100: fix implicit use of page.h 
Fixes this build error:

arch/arm/mach-sa1100/nanoengine.c:75:11: error: 'PAGE_SHIFT' undeclared here (not in a function)

CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-03 17:12:48 +00:00
Nicolas Pitre 17f4425d5b ARM: mach-sa1100: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:13 -04:00
Marcelo Roberto Jimenez b080ac8ad4 ARM: 6459/2: sa1100: Add nanoEngine PCI support. 
This patch adds nanoEngine's PCI support.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2010-12-21 14:53:46 +00:00
Marcelo Roberto Jimenez fa87672ab3 ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. 
This patch adds nanoEngine PCMCIA support, with support for two sockets.

In order to have a fully functional pcmcia subsystem in a BSE
nanoEngine board you should carefully read this:

http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/

Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2010-12-21 14:53:45 +00:00
Marcelo Roberto Jimenez 9f15d2caca ARM: 6447/3: sa1100: Put nanoEngine support back in the kernel 
Adds Bright Star Engineering's nanoEngine board support to the kernel.
Also:
- Adds the nanoEngine memory chip to arch/arm/mach-sa1100/cpu-sa1110.c
  (Micron MT48LC8M16A2TG-75).
- Increase in the sdram_params->name[] field length to accomodate the
  name of the memory chip.
- Clean up of header content and order of
  arch/arm/mach-sa1100/cpu-sa1110.c

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2010-12-21 14:53:34 +00:00