lkml.org 
[lkml]   [2010]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 6/9] Removing dead CONFIG_I2C_PNX0105
    On Wed, Jun 09, 2010 at 01:47:33PM +0200, Manuel Lauss wrote:

    > The code should probably just be adjusted to use the i2c-pnx driver.
    > According to the comments it supports the pnx0105 i2c cell.

    So something like this then.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

    arch/mips/pnx833x/common/platform.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    Index: linux-queue/arch/mips/pnx833x/common/platform.c
    ===================================================================
    --- linux-queue.orig/arch/mips/pnx833x/common/platform.c
    +++ linux-queue/arch/mips/pnx833x/common/platform.c
    @@ -24,6 +24,7 @@
    */
    #include <linux/device.h>
    #include <linux/dma-mapping.h>
    +#include <linux/i2c-pnx.h>
    #include <linux/platform_device.h>
    #include <linux/kernel.h>
    #include <linux/init.h>
    @@ -33,11 +34,6 @@
    #include <linux/mtd/nand.h>
    #include <linux/mtd/partitions.h>

    -#ifdef CONFIG_I2C_PNX0105
    -/* Until i2c driver available in kernel.*/
    -#include <linux/i2c-pnx0105.h>
    -#endif
    -
    #include <irq.h>
    #include <irq-mapping.h>
    #include <pnx833x.h>
    @@ -134,7 +130,6 @@ static struct platform_device pnx833x_us
    .resource = pnx833x_usb_ehci_resources,
    };

    -#ifdef CONFIG_I2C_PNX0105
    static struct resource pnx833x_i2c0_resources[] = {
    {
    .start = PNX833X_I2C0_PORTS_START,
    @@ -188,7 +183,7 @@ static struct platform_device pnx833x_i2
    };

    static struct platform_device pnx833x_i2c1_device = {
    - .name = "i2c-pnx0105",
    + .name = "pnx-i2c",
    .id = 1,
    .dev = {
    .platform_data = &pnx833x_i2c_dev[1],
    @@ -196,7 +191,6 @@ static struct platform_device pnx833x_i2
    .num_resources = ARRAY_SIZE(pnx833x_i2c1_resources),
    .resource = pnx833x_i2c1_resources,
    };
    -#endif

    static u64 ethernet_dmamask = DMA_BIT_MASK(32);

    @@ -297,10 +291,8 @@ static struct platform_device pnx833x_fl
    static struct platform_device *pnx833x_platform_devices[] __initdata = {
    &pnx833x_uart_device,
    &pnx833x_usb_ehci_device,
    -#ifdef CONFIG_I2C_PNX0105
    &pnx833x_i2c0_device,
    &pnx833x_i2c1_device,
    -#endif
    &pnx833x_ethernet_device,
    &pnx833x_sata_device,
    &pnx833x_flash_nand,

    \
     
     \ /
      Last update: 2010-07-05 10:59    [W:0.021 / U:70.428 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site