Merge branch 'linus' into cpus4096 (9e3ee1c3) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/SubmittingPatches

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -528,7 +528,33 @@ See more details on the proper patch format in the following
	references.		references.


			16) Sending "git pull" requests (from Linus emails)

			Please write the git repo address and branch name alone on the same line
			so that I can't even by mistake pull from the wrong branch, and so
			that a triple-click just selects the whole thing.

			So the proper format is something along the lines of:

			"Please pull from

			git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus

			to get these changes:"

			so that I don't have to hunt-and-peck for the address and inevitably
			get it wrong (actually, I've only gotten it wrong a few times, and
			checking against the diffstat tells me when I get it wrong, but I'm
			just a lot more comfortable when I don't have to "look for" the right
			thing to pull, and double-check that I have the right branch-name).


			Please use "git diff -M --stat --summary" to generate the diffstat:
			the -M enables rename detection, and the summary enables a summary of
			new/deleted or renamed files.

			With rename detection, the statistics are rather different [...]
			because git will notice that a fair number of the changes are renames.

	-----------------------------------		-----------------------------------
	SECTION 2 - HINTS, TIPS, AND TRICKS		SECTION 2 - HINTS, TIPS, AND TRICKS

Documentation/feature-removal-schedule.txt

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,30 @@ Who: Mauro Carvalho Chehab <mchehab@infradead.org>

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

			What: old tuner-3036 i2c driver
			When: 2.6.28
			Why: This driver is for VERY old i2c-over-parallel port teletext receiver
			boxes. Rather then spending effort on converting this driver to V4L2,
			and since it is extremely unlikely that anyone still uses one of these
			devices, it was decided to drop it.
			Who: Hans Verkuil <hverkuil@xs4all.nl>
			Mauro Carvalho Chehab <mchehab@infradead.org>

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

			What: V4L2 dpc7146 driver
			When: 2.6.28
			Why: Old driver for the dpc7146 demonstration board that is no longer
			relevant. The last time this was tested on actual hardware was
			probably around 2002. Since this is a driver for a demonstration
			board the decision was made to remove it rather than spending a
			lot of effort continually updating this driver to stay in sync
			with the latest internal V4L2 or I2C API.
			Who: Hans Verkuil <hverkuil@xs4all.nl>
			Mauro Carvalho Chehab <mchehab@infradead.org>

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

	What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])		What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
	When: November 2005		When: November 2005
	Files: drivers/pcmcia/: pcmcia_ioctl.c		Files: drivers/pcmcia/: pcmcia_ioctl.c

Documentation/i2c/upgrading-clients

0 → 100644

+281 −0

Original line number	Original line	Diff line number	Diff line
			Upgrading I2C Drivers to the new 2.6 Driver Model
			=================================================

			Ben Dooks <ben-linux@fluff.org>

			Introduction
			------------

			This guide outlines how to alter existing Linux 2.6 client drivers from
			the old to the new new binding methods.


			Example old-style driver
			------------------------


			struct example_state {
			struct i2c_client client;
			....
			};

			static struct i2c_driver example_driver;

			static unsigned short ignore[] = { I2C_CLIENT_END };
			static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END };

			I2C_CLIENT_INSMOD;

			static int example_attach(struct i2c_adapter *adap, int addr, int kind)
			{
			struct example_state *state;
			struct device dev = &adap->dev; / to use for dev_ reports */
			int ret;

			state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
			if (state == NULL) {
			dev_err(dev, "failed to create our state\n");
			return -ENOMEM;
			}

			example->client.addr = addr;
			example->client.flags = 0;
			example->client.adapter = adap;

			i2c_set_clientdata(&state->i2c_client, state);
			strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE);

			ret = i2c_attach_client(&state->i2c_client);
			if (ret < 0) {
			dev_err(dev, "failed to attach client\n");
			kfree(state);
			return ret;
			}

			dev = &state->i2c_client.dev;

			/* rest of the initialisation goes here. */

			dev_info(dev, "example client created\n");

			return 0;
			}

			static int __devexit example_detach(struct i2c_client *client)
			{
			struct example_state *state = i2c_get_clientdata(client);

			i2c_detach_client(client);
			kfree(state);
			return 0;
			}

			static int example_attach_adapter(struct i2c_adapter *adap)
			{
			return i2c_probe(adap, &addr_data, example_attach);
			}

			static struct i2c_driver example_driver = {
			.driver = {
			.owner = THIS_MODULE,
			.name = "example",
			},
			.attach_adapter = example_attach_adapter,
			.detach_client = __devexit_p(example_detach),
			.suspend = example_suspend,
			.resume = example_resume,
			};


			Updating the client
			-------------------

			The new style binding model will check against a list of supported
			devices and their associated address supplied by the code registering
			the busses. This means that the driver .attach_adapter and
			.detach_adapter methods can be removed, along with the addr_data,
			as follows:

			- static struct i2c_driver example_driver;

			- static unsigned short ignore[] = { I2C_CLIENT_END };
			- static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END };

			- I2C_CLIENT_INSMOD;

			- static int example_attach_adapter(struct i2c_adapter *adap)
			- {
			- return i2c_probe(adap, &addr_data, example_attach);
			- }

			static struct i2c_driver example_driver = {
			- .attach_adapter = example_attach_adapter,
			- .detach_client = __devexit_p(example_detach),
			}

			Add the probe and remove methods to the i2c_driver, as so:

			static struct i2c_driver example_driver = {
			+ .probe = example_probe,
			+ .remove = __devexit_p(example_remove),
			}

			Change the example_attach method to accept the new parameters
			which include the i2c_client that it will be working with:

			- static int example_attach(struct i2c_adapter *adap, int addr, int kind)
			+ static int example_probe(struct i2c_client *client,
			+ const struct i2c_device_id *id)

			Change the name of example_attach to example_probe to align it with the
			i2c_driver entry names. The rest of the probe routine will now need to be
			changed as the i2c_client has already been setup for use.

			The necessary client fields have already been setup before
			the probe function is called, so the following client setup
			can be removed:

			- example->client.addr = addr;
			- example->client.flags = 0;
			- example->client.adapter = adap;
			-
			- strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE);

			The i2c_set_clientdata is now:

			- i2c_set_clientdata(&state->client, state);
			+ i2c_set_clientdata(client, state);

			The call to i2c_attach_client is no longer needed, if the probe
			routine exits successfully, then the driver will be automatically
			attached by the core. Change the probe routine as so:

			- ret = i2c_attach_client(&state->i2c_client);
			- if (ret < 0) {
			- dev_err(dev, "failed to attach client\n");
			- kfree(state);
			- return ret;
			- }


			Remove the storage of 'struct i2c_client' from the 'struct example_state'
			as we are provided with the i2c_client in our example_probe. Instead we
			store a pointer to it for when it is needed.

			struct example_state {
			- struct i2c_client client;
			+ struct i2c_client *client;

			the new i2c client as so:

			- struct device dev = &adap->dev; / to use for dev_ reports */
			+ struct device dev = &i2c_client->dev; / to use for dev_ reports */

			And remove the change after our client is attached, as the driver no
			longer needs to register a new client structure with the core:

			- dev = &state->i2c_client.dev;

			In the probe routine, ensure that the new state has the client stored
			in it:

			static int example_probe(struct i2c_client *i2c_client,
			const struct i2c_device_id *id)
			{
			struct example_state *state;
			struct device *dev = &i2c_client->dev;
			int ret;

			state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
			if (state == NULL) {
			dev_err(dev, "failed to create our state\n");
			return -ENOMEM;
			}

			+ state->client = i2c_client;

			Update the detach method, by changing the name to _remove and
			to delete the i2c_detach_client call. It is possible that you
			can also remove the ret variable as it is not not needed for
			any of the core functions.

			- static int __devexit example_detach(struct i2c_client *client)
			+ static int __devexit example_remove(struct i2c_client *client)
			{
			struct example_state *state = i2c_get_clientdata(client);

			- i2c_detach_client(client);

			And finally ensure that we have the correct ID table for the i2c-core
			and other utilities:

			+ struct i2c_device_id example_idtable[] = {
			+ { "example", 0 },
			+ { }
			+};
			+
			+MODULE_DEVICE_TABLE(i2c, example_idtable);

			static struct i2c_driver example_driver = {
			.driver = {
			.owner = THIS_MODULE,
			.name = "example",
			},
			+ .id_table = example_ids,


			Our driver should now look like this:

			struct example_state {
			struct i2c_client *client;
			....
			};

			static int example_probe(struct i2c_client *client,
			const struct i2c_device_id *id)
			{
			struct example_state *state;
			struct device *dev = &client->dev;

			state = kzalloc(sizeof(struct example_state), GFP_KERNEL);
			if (state == NULL) {
			dev_err(dev, "failed to create our state\n");
			return -ENOMEM;
			}

			state->client = client;
			i2c_set_clientdata(client, state);

			/* rest of the initialisation goes here. */

			dev_info(dev, "example client created\n");

			return 0;
			}

			static int __devexit example_remove(struct i2c_client *client)
			{
			struct example_state *state = i2c_get_clientdata(client);

			kfree(state);
			return 0;
			}

			static struct i2c_device_id example_idtable[] = {
			{ "example", 0 },
			{ }
			};

			MODULE_DEVICE_TABLE(i2c, example_idtable);

			static struct i2c_driver example_driver = {
			.driver = {
			.owner = THIS_MODULE,
			.name = "example",
			},
			.id_table = example_idtable,
			.probe = example_probe,
			.remove = __devexit_p(example_remove),
			.suspend = example_suspend,
			.resume = example_resume,
			};

Documentation/video4linux/CARDLIST.au0828

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,3 +2,4 @@
	1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]		1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]
	2 -> Hauppauge HVR850 (au0828) [2040:7240]		2 -> Hauppauge HVR850 (au0828) [2040:7240]
	3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620]		3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620]
			4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281]

Documentation/video4linux/CARDLIST.em28xx

+42 −3

Original line number	Original line	Diff line number	Diff line
	0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]		0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
	1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]		1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
	2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]		2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
	3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]		3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
	4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]		4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]
	5 -> MSI VOX USB 2.0 (em2820/em2840)		5 -> MSI VOX USB 2.0 (em2820/em2840)
	6 -> Terratec Cinergy 200 USB (em2800)		6 -> Terratec Cinergy 200 USB (em2800)
	7 -> Leadtek Winfast USB II (em2800)		7 -> Leadtek Winfast USB II (em2800) [0413:6023]
	8 -> Kworld USB2800 (em2800)		8 -> Kworld USB2800 (em2800)
	9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a]		9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a]
	10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]		10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]
	@@ -14,7 +14,46 @@
	13 -> Terratec Prodigy XS (em2880) [0ccd:0047]		13 -> Terratec Prodigy XS (em2880) [0ccd:0047]
	14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)		14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)
	15 -> V-Gear PocketTV (em2800)		15 -> V-Gear PocketTV (em2800)
	16 -> Hauppauge WinTV HVR 950 (em2880) [2040:6513,2040:6517,2040:651b,2040:651f]		16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b,2040:651f]
	17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]		17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]
	18 -> Hauppauge WinTV HVR 900 (R2) (em2880) [2040:6502]		18 -> Hauppauge WinTV HVR 900 (R2) (em2880) [2040:6502]
	19 -> PointNix Intra-Oral Camera (em2860)		19 -> PointNix Intra-Oral Camera (em2860)
			20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002]
			21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801]
			22 -> Unknown EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751]
			23 -> Huaqi DLCW-130 (em2750)
			24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112]
			25 -> Gadmei UTV310 (em2820/em2840)
			26 -> Hercules Smart TV USB 2.0 (em2820/em2840)
			27 -> Pinnacle PCTV USB 2 (Philips FM1216ME) (em2820/em2840)
			28 -> Leadtek Winfast USB II Deluxe (em2820/em2840)
			29 -> Pinnacle Dazzle DVC 100 (em2820/em2840)
			30 -> Videology 20K14XUSB USB2.0 (em2820/em2840)
			31 -> Usbgear VD204v9 (em2821)
			32 -> Supercomp USB 2.0 TV (em2821)
			33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0 (em2821)
			34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f]
			35 -> Typhoon DVD Maker (em2860)
			36 -> NetGMBH Cam (em2860)
			37 -> Gadmei UTV330 (em2860)
			38 -> Yakumo MovieMixer (em2861)
			39 -> KWorld PVRTV 300U (em2861) [eb1a:e300]
			40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005]
			41 -> Kworld 350 U DVB-T (em2870) [eb1a:e350]
			42 -> Kworld 355 U DVB-T (em2870) [eb1a:e355,eb1a:e357]
			43 -> Terratec Cinergy T XS (em2870) [0ccd:0043]
			44 -> Terratec Cinergy T XS (MT2060) (em2870)
			45 -> Pinnacle PCTV DVB-T (em2870)
			46 -> Compro, VideoMate U3 (em2870) [185b:2870]
			47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
			48 -> KWorld DVB-T 310U (em2880)
			49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
			50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
			51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]
			52 -> DNT DA2 Hybrid (em2881)
			53 -> Pinnacle Hybrid Pro (em2881)
			54 -> Kworld VS-DVB-T 323UR (em2882) [eb1a:e323]
			55 -> Terratec Hybrid XS (em2882) (em2882) [0ccd:005e]
			56 -> Pinnacle Hybrid Pro (2) (em2882) [2304:0226]
			57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
			58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]