Commit 7203781c authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/cpu' into x86/core

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
parents 671eef85 af2e1f27
Loading
Loading
Loading
Loading
+15 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,21 @@ Introduction
  data-sheet/users manual to find out the complete list.
  data-sheet/users manual to find out the complete list.




GPIOLIB
-------

  With the event of the GPIOLIB in drivers/gpio, support for some
  of the GPIO functions such as reading and writing a pin will
  be removed in favour of this common access method.

  Once all the extant drivers have been converted, the functions
  listed below will be removed (they may be marked as __deprecated
  in the near future).

  - s3c2410_gpio_getpin
  - s3c2410_gpio_setpin


Headers
Headers
-------
-------


+33 −2
Original line number Original line Diff line number Diff line
@@ -8,9 +8,10 @@ Introduction


  The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
  The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
  S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported.
  S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported.

  Support for the S3C2400 and S3C24A0 series are in progress.


  Support for the S3C2400 series is in progress.


Configuration
Configuration
-------------
-------------
@@ -38,6 +39,22 @@ Layout
  Register, kernel and platform data definitions are held in the
  Register, kernel and platform data definitions are held in the
  arch/arm/mach-s3c2410 directory./include/mach
  arch/arm/mach-s3c2410 directory./include/mach


arch/arm/plat-s3c24xx:

  Files in here are either common to all the s3c24xx family,
  or are common to only some of them with names to indicate this
  status. The files that are not common to all are generally named
  with the initial cpu they support in the series to ensure a short
  name without any possibility of confusion with newer devices.

  As an example, initially s3c244x would cover s3c2440 and s3c2442, but
  with the s3c2443 which does not share many of the same drivers in
  this directory, the name becomes invalid. We stick to s3c2440-<x>
  to indicate a driver that is s3c2440 and s3c2442 compatible.

  This does mean that to find the status of any given SoC, a number
  of directories may need to be searched.



Machines
Machines
--------
--------
@@ -159,6 +176,17 @@ NAND
  For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt
  For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt




SD/MMC
------

  The SD/MMC hardware pre S3C2443 is supported in the current
  kernel, the driver is drivers/mmc/host/s3cmci.c and supports
  1 and 4 bit SD or MMC cards.

  The SDIO behaviour of this driver has not been fully tested. There is no
  current support for hardware SDIO interrupts.


Serial
Serial
------
------


@@ -178,6 +206,9 @@ GPIO
  The core contains support for manipulating the GPIO, see the
  The core contains support for manipulating the GPIO, see the
  documentation in GPIO.txt in the same directory as this file.
  documentation in GPIO.txt in the same directory as this file.


  Newer kernels carry GPIOLIB, and support is being moved towards
  this with some of the older support in line to be removed.



Clock Management
Clock Management
----------------
----------------
+6 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org


    git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
    git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git


  - Note that it is highly important to install the mke2fs.conf file
    that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If
    you have edited the /etc/mke2fs.conf file installed on your system,
    you will need to merge your changes with the version from e2fsprogs
    1.41.x.

  - Create a new filesystem using the ext4dev filesystem type:
  - Create a new filesystem using the ext4dev filesystem type:


    	# mke2fs -t ext4dev /dev/hda1
    	# mke2fs -t ext4dev /dev/hda1
+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes
it possible to fit quite a lot of data to the flash.
it possible to fit quite a lot of data to the flash.


Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.
Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.
It does not need stuff like ckfs.ext2. UBIFS automatically replays its
It does not need stuff like fsck.ext2. UBIFS automatically replays its
journal and recovers from crashes, ensuring that the on-flash data
journal and recovers from crashes, ensuring that the on-flash data
structures are consistent.
structures are consistent.


+17 −16
Original line number Original line Diff line number Diff line
Kernel driver ibmaem
Kernel driver ibmaem
======================
======================


This driver talks to the IBM Systems Director Active Energy Manager, known
henceforth as AEM.

Supported systems:
Supported systems:
  * Any recent IBM System X server with Active Energy Manager support.
  * Any recent IBM System X server with AEM support.
    This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
    This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
    x3950 M2, and certain HS2x/LS2x/QS2x blades.  The IPMI host interface
    x3950 M2, and certain HS2x/LS2x/QS2x blades.  The IPMI host interface
    driver ("ipmi-si") needs to be loaded for this driver to do anything.
    driver ("ipmi-si") needs to be loaded for this driver to do anything.
@@ -14,24 +17,22 @@ Author: Darrick J. Wong
Description
Description
-----------
-----------


This driver implements sensor reading support for the energy and power
This driver implements sensor reading support for the energy and power meters
meters available on various IBM System X hardware through the BMC.  All
available on various IBM System X hardware through the BMC.  All sensor banks
sensor banks will be exported as platform devices; this driver can talk
will be exported as platform devices; this driver can talk to both v1 and v2
to both v1 and v2 interfaces.  This driver is completely separate from the
interfaces.  This driver is completely separate from the older ibmpex driver.
older ibmpex driver.


The v1 AEM interface has a simple set of features to monitor energy use.
The v1 AEM interface has a simple set of features to monitor energy use.  There
There is a register that displays an estimate of raw energy consumption
is a register that displays an estimate of raw energy consumption since the
since the last BMC reset, and a power sensor that returns average power
last BMC reset, and a power sensor that returns average power use over a
use over a configurable interval.
configurable interval.


The v2 AEM interface is a bit more sophisticated, being able to present
The v2 AEM interface is a bit more sophisticated, being able to present a wider
a wider range of energy and power use registers, the power cap as
range of energy and power use registers, the power cap as set by the AEM
set by the AEM software, and temperature sensors.
software, and temperature sensors.


Special Features
Special Features
----------------
----------------


The "power_cap" value displays the current system power cap, as set by
The "power_cap" value displays the current system power cap, as set by the AEM
the Active Energy Manager software.  Setting the power cap from the host
software.  Setting the power cap from the host is not currently supported.
is not currently supported.
Loading