Commit 48bfdb21 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson
Browse files

Merge branch 'depends/i2c/lpc32xx' into next/dt 

As a prerequisite for merging the lpc32xx DT changes, this
pulls in the depends/i2c/lpc32xx branch that contains
changes to the pnx-i2c driver, which are already in the
i2c tree. The branch is available also on

   git://git.antcom.de/linux-2.6.git

 lpc32xx/i2c

Roland Stigge <stigge@antcom.de> writes:

 this is the series of the 4 patches adding device tree support to i2c-pnx
 (used by LPC32xx) that Wolfram Sang already applied to the i2c subsystem.
 Since both drivers/i2c/ and mach-lpc32xx are touched here, there will
 probably be conflicts that you need to be aware of.

 I'm posting this again for arm-soc since the actual mach-lpc32xx specific
 DT conversion builds upon those changes (see next pull request), especially
 in arch/arm/mach-lpc32xx/common.c.

 Wolfram already gave permission to merge this via arm-soc, but please
 coordinate and tell me if I can help resolving this.

Further, this implicitly updates the next/dt branch to v3.4-rc4, which
causes a trivial conflict from a change in one branch in code that
gets removed in another.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 19f36bfa b41a216d

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

+1 −1
Original line number Diff line number Diff line 
    <refentry id="V4L2-PIX-FMT-NV12M">

      <refmeta>

	<refentrytitle>V4L2_PIX_FMT_NV12M ('NV12M')</refentrytitle>

	<refentrytitle>V4L2_PIX_FMT_NV12M ('NM12')</refentrytitle>

	&manvol;

      </refmeta>

      <refnamediv>

Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

+1 −1
Original line number Diff line number Diff line 
    <refentry id="V4L2-PIX-FMT-YUV420M">

      <refmeta>

	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YU12M')</refentrytitle>

	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>

	&manvol;

      </refmeta>

      <refnamediv>

Documentation/devicetree/bindings/i2c/pnx.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* NXP PNX I2C Controller



Required properties:



 - reg: Offset and length of the register set for the device

 - compatible: should be "nxp,pnx-i2c"

 - interrupts: configure one interrupt line

 - #address-cells: always 1 (for i2c addresses)

 - #size-cells: always 0

 - interrupt-parent: the phandle for the interrupt controller that

   services interrupts for this device.



Optional properties:



 - clock-frequency: desired I2C bus clock frequency in Hz, Default: 100000 Hz



Examples:



	i2c1: i2c@400a0000 {

		compatible = "nxp,pnx-i2c";

		reg = <0x400a0000 0x100>;

		interrupt-parent = <&mic>;

		interrupts = <51 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	i2c2: i2c@400a8000 {

		compatible = "nxp,pnx-i2c";

		reg = <0x400a8000 0x100>;

		interrupt-parent = <&mic>;

		interrupts = <50 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-frequency = <100000>;

	};

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2321,9 +2321,9 @@ S: Supported 
F:	drivers/acpi/dock.c



DOCUMENTATION

M:	Randy Dunlap <rdunlap@xenotime.net>

M:	Rob Landley <rob@landley.net>

L:	linux-doc@vger.kernel.org

T:	quilt http://xenotime.net/kernel-doc-patches/current/

T:	TBD

S:	Maintained

F:	Documentation/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE