Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux (f0af7245) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/arm/Samsung-S3C24XX/GPIO.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,21 @@ Introduction
		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
		-------

Documentation/arm/Samsung-S3C24XX/Overview.txt

+33 −2

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

		The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
		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
		-------------
		@@ -38,6 +39,22 @@ Layout
		Register, kernel and platform data definitions are held in the
		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
		--------
		@@ -159,6 +176,17 @@ NAND
		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
		------

		@@ -178,6 +206,9 @@ GPIO
		The core contains support for manipulating the GPIO, see the
		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
		----------------

arch/arm/mach-footbridge/cats-pci.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@ static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };

		static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
		{
		if (dev->irq >= 255)
		return -1; /* not a valid interrupt. */

		if (dev->irq >= 128)
		return dev->irq & 0x1f;

arch/arm/mach-s3c2410/mach-bast.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -562,7 +562,7 @@ static struct platform_device *bast_devices[] __initdata = {
		&bast_sio,
		};

		static struct clk *bast_clocks[] = {
		static struct clk *bast_clocks[] __initdata = {
		&s3c24xx_dclk0,
		&s3c24xx_dclk1,
		&s3c24xx_clkout0,

arch/arm/mach-s3c2410/mach-vr1000.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ static struct platform_device *vr1000_devices[] __initdata = {
		&vr1000_led3,
		};

		static struct clk *vr1000_clocks[] = {
		static struct clk *vr1000_clocks[] __initdata = {
		&s3c24xx_dclk0,
		&s3c24xx_dclk1,
		&s3c24xx_clkout0,