From dd180adea2384a7ee35ac229c84d7c419e200098 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Tue, 13 Nov 2012 18:16:43 +0100 Subject: [PATCH] --- yaml --- r: 336552 b: refs/heads/master c: 16c4c52435cf8bb6e5986c14d36d93a0dd4c98df h: refs/heads/master v: v3 --- [refs] | 2 +- .../i2c/{atmel-i2c.txt => i2c-at91.txt} | 0 .../i2c/{davinci.txt => i2c-davinci.txt} | 0 .../i2c/{gpio-i2c.txt => i2c-gpio.txt} | 0 .../i2c/{fsl-imx-i2c.txt => i2c-imx.txt} | 0 .../bindings/i2c/{fsl-i2c.txt => i2c-mpc.txt} | 0 .../bindings/i2c/{mux.txt => i2c-mux.txt} | 0 .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 18 ++++++++++++++++++ .../i2c/{nomadik.txt => i2c-nomadik.txt} | 0 .../i2c/{cavium-i2c.txt => i2c-octeon.txt} | 0 .../i2c/{omap-i2c.txt => i2c-omap.txt} | 0 .../bindings/i2c/{pnx.txt => i2c-pnx.txt} | 0 .../{ce4100-i2c.txt => i2c-pxa-pci-ce4100.txt} | 0 .../bindings/i2c/{mrvl-i2c.txt => i2c-pxa.txt} | 18 ------------------ .../i2c/{samsung-i2c.txt => i2c-s3c2410.txt} | 0 .../i2c/{sirf-i2c.txt => i2c-sirf.txt} | 0 .../{arm-versatile.txt => i2c-versatile.txt} | 0 .../bindings/i2c/{xiic.txt => i2c-xiic.txt} | 0 trunk/drivers/i2c/busses/i2c-ocores.c | 4 ---- 19 files changed, 19 insertions(+), 23 deletions(-) rename trunk/Documentation/devicetree/bindings/i2c/{atmel-i2c.txt => i2c-at91.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{davinci.txt => i2c-davinci.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{gpio-i2c.txt => i2c-gpio.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{fsl-imx-i2c.txt => i2c-imx.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{fsl-i2c.txt => i2c-mpc.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{mux.txt => i2c-mux.txt} (100%) create mode 100644 trunk/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt rename trunk/Documentation/devicetree/bindings/i2c/{nomadik.txt => i2c-nomadik.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{cavium-i2c.txt => i2c-octeon.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{omap-i2c.txt => i2c-omap.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{pnx.txt => i2c-pnx.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{ce4100-i2c.txt => i2c-pxa-pci-ce4100.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{mrvl-i2c.txt => i2c-pxa.txt} (70%) rename trunk/Documentation/devicetree/bindings/i2c/{samsung-i2c.txt => i2c-s3c2410.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{sirf-i2c.txt => i2c-sirf.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{arm-versatile.txt => i2c-versatile.txt} (100%) rename trunk/Documentation/devicetree/bindings/i2c/{xiic.txt => i2c-xiic.txt} (100%) diff --git a/[refs] b/[refs] index 5dba5f9c82c2..bc8463606d07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da63d20bfb12827dd7747a841ea27348af3abc0a +refs/heads/master: 16c4c52435cf8bb6e5986c14d36d93a0dd4c98df diff --git a/trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-at91.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-at91.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/davinci.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-davinci.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/davinci.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-davinci.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/gpio-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-gpio.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/gpio-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-gpio.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-imx.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-imx.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/fsl-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mpc.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/fsl-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-mpc.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/mux.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mux.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/mux.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-mux.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt new file mode 100644 index 000000000000..f46d928aa73d --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt @@ -0,0 +1,18 @@ + +* Marvell MV64XXX I2C controller + +Required properties : + + - reg : Offset and length of the register set for the device + - compatible : Should be "marvell,mv64xxx-i2c" + - interrupts : The interrupt number + - clock-frequency : Desired I2C bus clock frequency in Hz. + +Examples: + + i2c@11000 { + compatible = "marvell,mv64xxx-i2c"; + reg = <0x11000 0x20>; + interrupts = <29>; + clock-frequency = <100000>; + }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/nomadik.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-nomadik.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/nomadik.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-nomadik.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-octeon.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-octeon.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/omap-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-omap.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/omap-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-omap.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/pnx.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-pnx.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/pnx.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-pnx.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/ce4100-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-pxa-pci-ce4100.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/ce4100-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-pxa-pci-ce4100.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-pxa.txt similarity index 70% rename from trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-pxa.txt index 0f7945019f6f..12b78ac507e9 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/i2c-pxa.txt @@ -31,21 +31,3 @@ Examples: reg = <0xd4025000 0x1000>; interrupts = <58>; }; - -* Marvell MV64XXX I2C controller - -Required properties : - - - reg : Offset and length of the register set for the device - - compatible : Should be "marvell,mv64xxx-i2c" - - interrupts : The interrupt number - - clock-frequency : Desired I2C bus clock frequency in Hz. - -Examples: - - i2c@11000 { - compatible = "marvell,mv64xxx-i2c"; - reg = <0x11000 0x20>; - interrupts = <29>; - clock-frequency = <100000>; - }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/samsung-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/samsung-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/sirf-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-sirf.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/sirf-i2c.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-sirf.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/arm-versatile.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-versatile.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/arm-versatile.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-versatile.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/xiic.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-xiic.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/xiic.txt rename to trunk/Documentation/devicetree/bindings/i2c/i2c-xiic.txt diff --git a/trunk/drivers/i2c/busses/i2c-ocores.c b/trunk/drivers/i2c/busses/i2c-ocores.c index bffd5501ac2d..15da1ac7cf9e 100644 --- a/trunk/drivers/i2c/busses/i2c-ocores.c +++ b/trunk/drivers/i2c/busses/i2c-ocores.c @@ -9,10 +9,6 @@ * kind, whether express or implied. */ -/* - * This driver can be used from the device tree, see - * Documentation/devicetree/bindings/i2c/ocore-i2c.txt - */ #include #include #include