Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (dd48dc34) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/driver-model/devres.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer).
		6. List of managed interfaces
		-----------------------------

		MEM
		devm_kzalloc()
		devm_kfree()

		IO region
		devm_request_region()
		devm_request_mem_region()

+14 −0

Original line number	Diff line number	Diff line
		@@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The
		convert to using pci_scan_root_bus() so they can supply a list of
		bus resources when the bus is created.
		Who: Bjorn Helgaas <bhelgaas@google.com>

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

		What: The CAP9 SoC family will be removed
		When: 3.4
		Files: arch/arm/mach-at91/at91cap9.c
		arch/arm/mach-at91/at91cap9_devices.c
		arch/arm/mach-at91/include/mach/at91cap9.h
		arch/arm/mach-at91/include/mach/at91cap9_matrix.h
		arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
		arch/arm/mach-at91/board-cap9adk.c
		Why: The code is not actively maintained and platforms are now hard to find.
		Who: Nicolas Ferre <nicolas.ferre@atmel.com>
		Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

+8 −9

Original line number	Diff line number	Diff line
		@@ -857,42 +857,41 @@ case), we define a mapping like this:

		...
		{
		.name "2bit"
		.name = "2bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_1_grp",
		.dev_name = "foo-mmc.0",
		},
		{
		.name "4bit"
		.name = "4bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_1_grp",
		.dev_name = "foo-mmc.0",
		},
		{
		.name "4bit"
		.name = "4bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_2_grp",
		.dev_name = "foo-mmc.0",
		},
		{
		.name "8bit"
		.name = "8bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_1_grp",
		.dev_name = "foo-mmc.0",
		},
		{
		.name "8bit"
		.name = "8bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_2_grp",
		.dev_name = "foo-mmc.0",
		},
		{
		.name "8bit"
		.name = "8bit"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "mmc0",
		.group = "mmc0_3_grp",
		@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true,
		like this:

		{
		.name "POWERMAP"
		.name = "POWERMAP"
		.ctrl_dev_name = "pinctrl-foo",
		.function = "power_func",
		.hog_on_boot = true,
		@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B:

		foo_switch()
		{
		struct pinmux pmx;
		struct pinmux *pmx;

		/* Enable on position A */
		pmx = pinmux_get(&device, "spi0-pos-A");

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,8 @@ Procedure for submitting patches to the -stable tree:

		- Send the patch, after verifying that it follows the above rules, to
		stable@vger.kernel.org. You must note the upstream commit ID in the
		changelog of your submission.
		changelog of your submission, as well as the kernel version you wish
		it to be applied to.
		- To have the patch automatically included in the stable tree, add the tag
		Cc: stable@vger.kernel.org
		in the sign-off area. Once the patch is merged it will be applied to

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ method, the sys I/F structure will be built like this:
		The framework includes a simple notification mechanism, in the form of a
		netlink event. Netlink socket initialization is done during the _init_
		of the framework. Drivers which intend to use the notification mechanism
		just need to call generate_netlink_event() with two arguments viz
		just need to call thermal_generate_netlink_event() with two arguments viz
		(originator, event). Typically the originator will be an integer assigned
		to a thermal_zone_device when it registers itself with the framework. The
		event will be one of:{THERMAL_AUX0, THERMAL_AUX1, THERMAL_CRITICAL,