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

Commit 8bd2bcf3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of... 

Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren <tony@atomide.com>:

Non critical omap fixes for v3.10 merge window. A big chunk
of these fixes are needed to support omap5 es2 version that includes
PM features while the earlier version es1 did not.

* tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
  ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
  ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
  ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
  ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
  ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
  ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry

Contains an update to 3.9-rc5

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21b3ac76 10561248

CREDITS

+8 −0
Original line number Original line Diff line number Diff line
@@ -1510,6 +1510,14 @@ D: Natsemi ethernet 
D: Cobalt Networks (x86) support

D: Cobalt Networks (x86) support

D: This-and-That

D: This-and-That





N: Mark M. Hoffman

E: mhoffman@lightlink.com

D: asb100, lm93 and smsc47b397 hardware monitoring drivers

D: hwmon subsystem core

D: hwmon subsystem maintainer

D: i2c-sis96x and i2c-stub SMBus drivers

S: USA



N: Dirk Hohndel

N: Dirk Hohndel

E: hohndel@suse.de

E: hohndel@suse.de

D: The XFree86[tm] Project

D: The XFree86[tm] Project

Documentation/devicetree/bindings/mfd/ab8500.txt

+1 −5
Original line number Original line Diff line number Diff line
@@ -13,9 +13,6 @@ Required parent device properties: 
                                  4 = active high level-sensitive

                                  4 = active high level-sensitive

                                  8 = active low level-sensitive

                                  8 = active low level-sensitive





Optional parent device properties:

- reg                    : contains the PRCMU mailbox address for the AB8500 i2c port



The AB8500 consists of a large and varied group of sub-devices:

The AB8500 consists of a large and varied group of sub-devices:





Device                     IRQ Names              Supply Names   Description

Device                     IRQ Names              Supply Names   Description
@@ -86,9 +83,8 @@ Non-standard child device properties: 
   - stericsson,amic2-bias-vamic1           : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,amic2-bias-vamic1           : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,earpeice-cmv                : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)

   - stericsson,earpeice-cmv                : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)





ab8500@5 {

ab8500 {

         compatible = "stericsson,ab8500";

         compatible = "stericsson,ab8500";

         reg = <5>; /* mailbox 5 is i2c */

         interrupts = <0 40 0x4>;

         interrupts = <0 40 0x4>;

         interrupt-controller;

         interrupt-controller;

         #interrupt-cells = <2>;

         #interrupt-cells = <2>;

Documentation/devicetree/bindings/tty/serial/of-serial.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,9 @@ Required properties: 
	- "nvidia,tegra20-uart"

	- "nvidia,tegra20-uart"

	- "nxp,lpc3220-uart"

	- "nxp,lpc3220-uart"

	- "ibm,qpace-nwp-serial"

	- "ibm,qpace-nwp-serial"

	- "altr,16550-FIFO32"

	- "altr,16550-FIFO64"

	- "altr,16550-FIFO128"

	- "serial" if the port type is unknown.

	- "serial" if the port type is unknown.

- reg : offset and length of the register set for the device.

- reg : offset and length of the register set for the device.

- interrupts : should contain uart interrupt.

- interrupts : should contain uart interrupt.

Documentation/hwmon/lm75

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ Supported chips: 
    Datasheet: Publicly available at the Maxim website

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/

               http://www.maxim-ic.com/

  * Microchip (TelCom) TCN75

  * Microchip (TelCom) TCN75

    Prefix: 'lm75'

    Prefix: 'tcn75'

    Addresses scanned: none

    Addresses scanned: none

    Datasheet: Publicly available at the Microchip website

    Datasheet: Publicly available at the Microchip website

               http://www.microchip.com/

               http://www.microchip.com/

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ Supported adapters: 
    Documentation:

    Documentation:

	http://www.diolan.com/i2c/u2c12.html

	http://www.diolan.com/i2c/u2c12.html





Author: Guenter Roeck <guenter.roeck@ericsson.com>

Author: Guenter Roeck <linux@roeck-us.net>





Description

Description

-----------

-----------