Commit 29f141fe authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge

parents 2261cc62 14cd3c15

Documentation/DocBook/device-drivers.tmpl

+13 −4
Original line number Original line Diff line number Diff line
@@ -50,7 +50,9 @@ 




     <sect1><title>Delaying, scheduling, and timer routines</title>

     <sect1><title>Delaying, scheduling, and timer routines</title>

!Iinclude/linux/sched.h

!Iinclude/linux/sched.h

!Ekernel/sched.c

!Ekernel/sched/core.c

!Ikernel/sched/cpupri.c

!Ikernel/sched/fair.c

!Iinclude/linux/completion.h

!Iinclude/linux/completion.h

!Ekernel/timer.c

!Ekernel/timer.c

     </sect1>

     </sect1>
@@ -100,9 +102,12 @@ X!Iinclude/linux/kobject.h 
!Iinclude/linux/device.h

!Iinclude/linux/device.h

     </sect1>

     </sect1>

     <sect1><title>Device Drivers Base</title>

     <sect1><title>Device Drivers Base</title>

!Idrivers/base/init.c

!Edrivers/base/driver.c

!Edrivers/base/driver.c

!Edrivers/base/core.c

!Edrivers/base/core.c

!Edrivers/base/syscore.c

!Edrivers/base/class.c

!Edrivers/base/class.c

!Idrivers/base/node.c

!Edrivers/base/firmware_class.c

!Edrivers/base/firmware_class.c

!Edrivers/base/transport_class.c

!Edrivers/base/transport_class.c

<!-- Cannot be included, because

<!-- Cannot be included, because
@@ -111,13 +116,18 @@ X!Iinclude/linux/kobject.h 
     exceed allowed 44 characters maximum

     exceed allowed 44 characters maximum

X!Edrivers/base/attribute_container.c

X!Edrivers/base/attribute_container.c

-->

-->

!Edrivers/base/sys.c

!Edrivers/base/dd.c

<!--

<!--

X!Edrivers/base/interface.c

X!Edrivers/base/interface.c

-->

-->

!Iinclude/linux/platform_device.h

!Iinclude/linux/platform_device.h

!Edrivers/base/platform.c

!Edrivers/base/platform.c

!Edrivers/base/bus.c

!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-buf.c

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

     </sect1>

     <sect1><title>Device Drivers Power Management</title>

     <sect1><title>Device Drivers Power Management</title>

!Edrivers/base/power/main.c

!Edrivers/base/power/main.c
@@ -216,9 +226,8 @@ X!Isound/sound_firmware.c 




  <chapter id="uart16x50">

  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

!Edrivers/tty/serial/8250/8250.c

  </chapter>

  </chapter>





  <chapter id="fbdev">

  <chapter id="fbdev">

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 
  <chapter id="pubfunctions">

  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

     <title>Public Functions Provided</title>

!Iarch/x86/include/asm/io.h

!Iarch/x86/include/asm/io.h

!Elib/iomap.c

!Elib/pci_iomap.c

  </chapter>

  </chapter>





</book>
 
</book>

Documentation/devicetree/bindings/gpio/led.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ Each LED is represented as a sub-node of the gpio-leds device. Each 
node's name represents the name of the corresponding LED.

node's name represents the name of the corresponding LED.





LED sub-node properties:

LED sub-node properties:

- gpios :  Should specify the LED's GPIO, see "Specifying GPIO information

- gpios :  Should specify the LED's GPIO, see "gpios property" in

  for devices" in Documentation/devicetree/booting-without-of.txt.  Active

  Documentation/devicetree/gpio.txt.  Active low LEDs should be

  low LEDs should be indicated using flags in the GPIO specifier.

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

  taken from the node name (excluding the unit address).

- linux,default-trigger :  (optional) This parameter, if present, is a

- linux,default-trigger :  (optional) This parameter, if present, is a

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ national National Semiconductor 
nintendo	Nintendo

nintendo	Nintendo

nvidia	NVIDIA

nvidia	NVIDIA

nxp	NXP Semiconductors

nxp	NXP Semiconductors

picochip	Picochip Ltd

powervr	Imagination Technologies

powervr	Imagination Technologies

qcom	Qualcomm, Inc.

qcom	Qualcomm, Inc.

ramtron	Ramtron International

ramtron	Ramtron International

Documentation/driver-model/devres.txt

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

  6. List of managed interfaces

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

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





MEM

  devm_kzalloc()

  devm_kfree()



IO region

IO region

  devm_request_region()

  devm_request_region()

  devm_request_mem_region()

  devm_request_mem_region()