From: Ralf Baechle <ralf@linux-mips.org>
To: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Christoph Egger <siccegge@cs.fau.de>,
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
Date: Mon, 5 Jul 2010 09:57:20 +0100 [thread overview]
Message-ID: <20100705085719.GA4461@linux-mips.org> (raw)
In-Reply-To: <AANLkTind_RjQ5X2zR1fhTgKuLOU4Kbve3uQlgGMI559X@mail.gmail.com>
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,
next prev parent reply other threads:[~2010-07-05 8:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 11:19 [PATCH 0/9] Removing dead code Christoph Egger
2010-06-09 11:19 ` Christoph Egger
2010-06-09 11:20 ` [PATCH 1/9] Removing dead CONFIG_SOC_AU1000_FREQUENCY Christoph Egger
2010-06-28 13:36 ` Ralf Baechle
2010-06-09 11:20 ` [PATCH 2/9] Removing dead CONFIG_GDB_CONSOLE Christoph Egger
2010-06-09 11:20 ` Christoph Egger
2010-06-09 16:54 ` David Daney
2010-06-09 16:54 ` David Daney
2010-06-28 13:42 ` Ralf Baechle
2010-06-09 11:21 ` [PATCH 3/9] Removing dead CONFIG_SIBYTE_BCM1480_PROF Christoph Egger
2010-06-16 16:00 ` Jiri Kosina
2010-06-28 13:49 ` Ralf Baechle
2010-06-30 9:36 ` Jiri Kosina
2010-06-30 13:35 ` Maciej W. Rozycki
2010-06-30 13:38 ` Jiri Kosina
2010-06-30 15:15 ` Ralf Baechle
2010-06-09 11:21 ` [PATCH 4/9] Removing dead CONFIG_MTD_PB1550_BOOT, CONFIG_MTD_PB1550_USER Christoph Egger
2010-06-30 15:37 ` Ralf Baechle
2010-06-09 11:21 ` [PATCH 5/9] Removing dead CONFIG_BLK_DEV_IDE Christoph Egger
2010-06-10 18:23 ` Shane McDonald
2010-06-16 11:35 ` Christoph Egger
2010-07-05 8:14 ` Ralf Baechle
2010-06-09 11:22 ` [PATCH 6/9] Removing dead CONFIG_I2C_PNX0105 Christoph Egger
2010-06-09 11:47 ` Manuel Lauss
2010-07-05 8:57 ` Ralf Baechle [this message]
2010-06-09 11:22 ` [PATCH 7/9] Removing dead CONFIG_PMCTWILED Christoph Egger
2010-06-10 19:24 ` Shane McDonald
2010-07-05 9:11 ` Ralf Baechle
2010-06-09 11:23 ` [PATCH 8/9] Removing dead CONFIG_DIAGNOSTICS Christoph Egger
2010-07-05 9:46 ` Ralf Baechle
2010-06-09 11:23 ` [PATCH 9/9] Removing dead CONFIG_MTD_PMC_MSP_RAMROOT Christoph Egger
2010-06-10 16:33 ` Shane McDonald
2010-07-05 9:57 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100705085719.GA4461@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=manuel.lauss@googlemail.com \
--cc=siccegge@cs.fau.de \
--cc=vamos@i4.informatik.uni-erlangen.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.