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

Commit 74b87210 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
parents 4bddaf66 baffe169

Documentation/DocBook/libata.tmpl

+16 −33
Original line number Diff line number Diff line
@@ -107,10 +107,6 @@ void (*dev_config) (struct ata_port *, struct ata_device *); 
	issue of SET FEATURES - XFER MODE, and prior to operation.

	</para>

	<para>

	Called by ata_device_add() after ata_dev_identify() determines

	a device is present.

	</para>

	<para>

	This entry may be specified as NULL in ata_port_operations.

	</para>
@@ -154,8 +150,8 @@ unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned in 


	<sect2><title>Taskfile read/write</title>

	<programlisting>

void (*tf_load) (struct ata_port *ap, struct ata_taskfile *tf);

void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_tf_load) (struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf);

	</programlisting>



	<para>
@@ -164,36 +160,35 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); 
	hardware registers / DMA buffers, to obtain the current set of

	taskfile register values.

	Most drivers for taskfile-based hardware (PIO or MMIO) use

	ata_tf_load() and ata_tf_read() for these hooks.

	ata_sff_tf_load() and ata_sff_tf_read() for these hooks.

	</para>



	</sect2>



	<sect2><title>PIO data read/write</title>

	<programlisting>

void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);

void (*sff_data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);

	</programlisting>



	<para>

All bmdma-style drivers must implement this hook.  This is the low-level

operation that actually copies the data bytes during a PIO data

transfer.

Typically the driver

will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or

ata_mmio_data_xfer().

Typically the driver will choose one of ata_sff_data_xfer_noirq(),

ata_sff_data_xfer(), or ata_sff_data_xfer32().

	</para>



	</sect2>



	<sect2><title>ATA command execute</title>

	<programlisting>

void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_exec_command)(struct ata_port *ap, struct ata_taskfile *tf);

	</programlisting>



	<para>

	causes an ATA command, previously loaded with

	->tf_load(), to be initiated in hardware.

	Most drivers for taskfile-based hardware use ata_exec_command()

	Most drivers for taskfile-based hardware use ata_sff_exec_command()

	for this hook.

	</para>
@@ -218,8 +213,8 @@ command. 


	<sect2><title>Read specific ATA shadow registers</title>

	<programlisting>

u8   (*check_status)(struct ata_port *ap);

u8   (*check_altstatus)(struct ata_port *ap);

u8   (*sff_check_status)(struct ata_port *ap);

u8   (*sff_check_altstatus)(struct ata_port *ap);

	</programlisting>



	<para>
@@ -227,20 +222,14 @@ u8 (*check_altstatus)(struct ata_port *ap); 
	hardware.  On some hardware, reading the Status register has

	the side effect of clearing the interrupt condition.

	Most drivers for taskfile-based hardware use

	ata_check_status() for this hook.

	</para>

	<para>

	Note that because this is called from ata_device_add(), at

	least a dummy function that clears device interrupts must be

	provided for all drivers, even if the controller doesn't

	actually have a taskfile status register.

	ata_sff_check_status() for this hook.

	</para>



	</sect2>



	<sect2><title>Select ATA device on bus</title>

	<programlisting>

void (*dev_select)(struct ata_port *ap, unsigned int device);

void (*sff_dev_select)(struct ata_port *ap, unsigned int device);

	</programlisting>



	<para>
@@ -251,9 +240,7 @@ void (*dev_select)(struct ata_port *ap, unsigned int device); 
	</para>

	<para>

	Most drivers for taskfile-based hardware use

	ata_std_dev_select() for this hook.  Controllers which do not

	support second drives on a port (such as SATA contollers) will

	use ata_noop_dev_select().

	ata_sff_dev_select() for this hook.

	</para>



	</sect2>
@@ -441,13 +428,13 @@ void (*irq_clear) (struct ata_port *); 
	to struct ata_host_set.

	</para>

	<para>

	Most legacy IDE drivers use ata_interrupt() for the

	Most legacy IDE drivers use ata_sff_interrupt() for the

	irq_handler hook, which scans all ports in the host_set,

	determines which queued command was active (if any), and calls

	ata_host_intr(ap,qc).

	ata_sff_host_intr(ap,qc).

	</para>

	<para>

	Most legacy IDE drivers use ata_bmdma_irq_clear() for the

	Most legacy IDE drivers use ata_sff_irq_clear() for the

	irq_clear() hook, which simply clears the interrupt and error

	flags in the DMA status register.

	</para>
@@ -496,10 +483,6 @@ void (*host_stop) (struct ata_host_set *host_set); 
	data from port at this time.

	</para>

	<para>

	Many drivers use ata_port_stop() as this hook, which frees the

	PRD table.

	</para>

	<para>

	->host_stop() is called after all ->port_stop() calls

have completed.  The hook must finalize hardware shutdown, release DMA

and other resources, etc.

Documentation/feature-removal-schedule.txt

+23 −23
Original line number Diff line number Diff line
@@ -520,29 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com> 


----------------------------



What:	corgikbd, spitzkbd, tosakbd driver

When:	2.6.35

Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c

Why:	We now have a generic GPIO based matrix keyboard driver that

	are fully capable of handling all the keys on these devices.

	The original drivers manipulate the GPIO registers directly

	and so are difficult to maintain.

Who:	Eric Miao <eric.y.miao@gmail.com>



----------------------------



What:	corgi_ssp and corgi_ts driver

When:	2.6.35

Files:	arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c

Why:	The corgi touchscreen is now deprecated in favour of the generic

	ads7846.c driver. The noise reduction technique used in corgi_ts.c,

	that's to wait till vsync before ADC sampling, is also integrated into

	ads7846 driver now. Provided that the original driver is not generic

	and is difficult to maintain, it will be removed later.

Who:	Eric Miao <eric.y.miao@gmail.com>



----------------------------



What:	capifs

When:	February 2011

Files:	drivers/isdn/capi/capifs.*
@@ -589,3 +566,26 @@ Why: Useful in 2003, implementation is a hack. 
	Generally invoked by accident today.

	Seen as doing more harm than good.

Who:	Len Brown <len.brown@intel.com>



----------------------------



What:	video4linux /dev/vtx teletext API support

When:	2.6.35

Files:	drivers/media/video/saa5246a.c drivers/media/video/saa5249.c

	include/linux/videotext.h

Why:	The vtx device nodes have been superseded by vbi device nodes

	for many years. No applications exist that use the vtx support.

	Of the two i2c drivers that actually support this API the saa5249

	has been impossible to use for a year now and no known hardware

	that supports this device exists. The saa5246a is theoretically

	supported by the old mxb boards, but it never actually worked.



	In summary: there is no hardware that can use this API and there

	are no applications actually implementing this API.



	The vtx support still reserves minors 192-223 and we would really

	like to reuse those for upcoming new functionality. In the unlikely

	event that new hardware appears that wants to use the functionality

	provided by the vtx API, then that functionality should be build

	around the sliced VBI API instead.

Who:	Hans Verkuil <hverkuil@xs4all.nl>

Documentation/i2c/writing-clients

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ structure at all. You should use this to keep device-specific data. 
	/* retrieve the value */

	void *i2c_get_clientdata(const struct i2c_client *client);



Note that starting with kernel 2.6.34, you don't have to set the `data' field

to NULL in remove() or if probe() failed anymore. The i2c-core does this

automatically on these occasions. Those are also the only times the core will

touch this field.





Accessing the client

====================

Documentation/input/elantech.txt

+4 −4
Original line number Diff line number Diff line
@@ -333,14 +333,14 @@ byte 0: 
byte 1:



   bit   7   6   5   4   3   2   1   0

        x15 x14 x13 x12 x11 x10 x9  x8

         .   .   .   .   .  x10 x9  x8



byte 2:



   bit   7   6   5   4   3   2   1   0

        x7  x6  x5  x4  x4  x2  x1  x0



         x15..x0 = absolute x value (horizontal)

         x10..x0 = absolute x value (horizontal)



byte 3:
@@ -350,14 +350,14 @@ byte 3: 
byte 4:



   bit   7   6   5   4   3   2   1   0

        y15 y14 y13 y12 y11 y10 y8  y8

         .   .   .   .   .   .  y9  y8



byte 5:



   bit   7   6   5   4   3   2   1   0

        y7  y6  y5  y4  y3  y2  y1  y0



         y15..y0 = absolute y value (vertical)

         y9..y0 = absolute y value (vertical)





4.2.2 Two finger touch

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -1000,6 +1000,20 @@ W: http://www.arm.linux.org.uk/ 
S:	Maintained

F:	arch/arm/vfp/



ARM/VOIPAC PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/vpac270.c

F:	arch/arm/mach-pxa/include/mach-pxa/vpac270.h



ARM/ZIPIT Z2 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/z2.c

F:	arch/arm/mach-pxa/include/mach-pxa/z2.h



ASC7621 HARDWARE MONITOR DRIVER

M:	George Joseph <george.joseph@fairview5.com>

L:	lm-sensors@lm-sensors.org