Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758273Ab0GEI5d (ORCPT ); Mon, 5 Jul 2010 04:57:33 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:39857 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756173Ab0GEI5c (ORCPT ); Mon, 5 Jul 2010 04:57:32 -0400 Date: Mon, 5 Jul 2010 09:57:20 +0100 From: Ralf Baechle To: Manuel Lauss Cc: Christoph Egger , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, vamos@i4.informatik.uni-erlangen.de Subject: Re: [PATCH 6/9] Removing dead CONFIG_I2C_PNX0105 Message-ID: <20100705085719.GA4461@linux-mips.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2357 Lines: 77 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 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 #include +#include #include #include #include @@ -33,11 +34,6 @@ #include #include -#ifdef CONFIG_I2C_PNX0105 -/* Until i2c driver available in kernel.*/ -#include -#endif - #include #include #include @@ -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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/