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

Commit b472b8e2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.7-rc3 into usb-next. 



This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
	drivers/usb/misc/ezusb.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d124a60d 8f0d8163

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif

	- full colour GIF image of Linux logo (penguin - Tux).

logo.txt
@@ -240,8 +242,6 @@ netlabel/ 
	- directory with information on the NetLabel subsystem.

networking/

	- directory with info on various aspects of networking with Linux.

nmi_watchdog.txt

	- info on NMI watchdog for SMP systems.

nommu-mmap.txt

	- documentation about no-mmu memory mapping support.

numastat.txt

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PIT Timer required properties: 
  shared across all System Controller members.



TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-pit".

- compatible: Should be "atmel,<chip>-tcb".

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ Valid values for pin and group names are: 


    With some exceptions, these support nvidia,high-speed-mode,

    nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength,

    nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling.

    nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling.



    drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2,

    drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg,

Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ Valid values for pin and group names are: 
  drive groups:



    These all support nvidia,pull-down-strength, nvidia,pull-up-strength,

    nvidia,slew_rate-rising, nvidia,slew_rate-falling. Most but not all

    nvidia,slew-rate-rising, nvidia,slew-rate-falling. Most but not all

    support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode.



    ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1,

Documentation/firmware_class/README

+17 −9
Original line number Diff line number Diff line
@@ -18,32 +18,40 @@ 
 High level behavior (mixed):

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



 kernel(driver): calls request_firmware(&fw_entry, $FIRMWARE, device)



 userspace:

 1), kernel(driver):

	- calls request_firmware(&fw_entry, $FIRMWARE, device)

	- kernel searchs the fimware image with name $FIRMWARE directly

	in the below search path of root filesystem:

		"/lib/firmware/updates/" UTS_RELEASE,

		"/lib/firmware/updates",

		"/lib/firmware/" UTS_RELEASE,

		"/lib/firmware"

	- If found, goto 7), else goto 2)



 2), userspace:

 	- /sys/class/firmware/xxx/{loading,data} appear.

	- hotplug gets called with a firmware identifier in $FIRMWARE

	  and the usual hotplug environment.

		- hotplug: echo 1 > /sys/class/firmware/xxx/loading



 kernel: Discard any previous partial load.

 3), kernel: Discard any previous partial load.



 userspace:

 4), userspace:

		- hotplug: cat appropriate_firmware_image > \

					/sys/class/firmware/xxx/data



 kernel: grows a buffer in PAGE_SIZE increments to hold the image as it

 5), kernel: grows a buffer in PAGE_SIZE increments to hold the image as it

	 comes in.



 userspace:

 6), userspace:

		- hotplug: echo 0 > /sys/class/firmware/xxx/loading



 kernel: request_firmware() returns and the driver has the firmware

 7), kernel: request_firmware() returns and the driver has the firmware

	 image in fw_entry->{data,size}. If something went wrong

	 request_firmware() returns non-zero and fw_entry is set to

	 NULL.



 kernel(driver): Driver code calls release_firmware(fw_entry) releasing

 8), kernel(driver): Driver code calls release_firmware(fw_entry) releasing

		 the firmware image and any related resource.



 High level behavior (driver code):