[PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Seth Heasley]

This patch adds the Intel Centerton processor DeviceID for the Integrated Legacy Block.  The ILB provides GPIO, SMBus, and Watchdog functionality. The ILB DeviceID is defined in include/linux/pci_ids.h.

Signed-off-by: Seth Heasley <seth.heasley@intel.com>
---
 drivers/mfd/lpc_sch.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index abc4213..84b7714 100644
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/lpc_sch.c
@@ -36,6 +36,7 @@
 
 #define GPIOBASE	0x44
 #define GPIO_IO_SIZE	64
+#define GPIO_IO_SIZE_CENTERTON	128
 
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
@@ -68,7 +69,7 @@ static struct resource wdt_sch_resource = {
 
 static struct mfd_cell tunnelcreek_cells[] = {
 	{
-		.name = "tunnelcreek_wdt",
+		.name = "ie6xx_wdt",
 		.num_resources = 1,
 		.resources = &wdt_sch_resource,
 	},
@@ -77,6 +78,7 @@ static struct mfd_cell tunnelcreek_cells[] = {
 static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -115,7 +117,11 @@ static int __devinit lpc_sch_probe(struct pci_dev *dev,
 	}
 
 	gpio_sch_resource.start = base_addr;
-	gpio_sch_resource.end = base_addr + GPIO_IO_SIZE - 1;
+
+	if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
+		gpio_sch_resource.end = base_addr + GPIO_IO_SIZE_CENTERTON - 1;
+	else
+		gpio_sch_resource.end = base_addr + GPIO_IO_SIZE - 1;
 
 	for (i=0; i < ARRAY_SIZE(lpc_sch_cells); i++)
 		lpc_sch_cells[i].id = id->device;
@@ -125,7 +131,8 @@ static int __devinit lpc_sch_probe(struct pci_dev *dev,
 	if (ret)
 		goto out_dev;
 
-	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC) {
+	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC
+	 || id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB) {
 		pci_read_config_dword(dev, WDTBASE, &base_addr_cfg);
 		if (!(base_addr_cfg & (1 << 31))) {
 			dev_err(&dev->dev, "Decode of the WDT I/O range disabled\n");
-- 
1.7.4.4

Re: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Samuel Ortiz]

Hi Seth,

On Tue, Apr 17, 2012 at 02:09:22PM -0700, Seth Heasley wrote:
> This patch adds the Intel Centerton processor DeviceID for the Integrated Legacy Block.  The ILB provides GPIO, SMBus, and Watchdog functionality. The ILB DeviceID is defined in include/linux/pci_ids.h.
> 
Is the pci_ids.h change already in ? If not, I should take it at the same time
so that we don't break compilation.


> @@ -68,7 +69,7 @@ static struct resource wdt_sch_resource = {
>  
>  static struct mfd_cell tunnelcreek_cells[] = {
>  	{
> -		.name = "tunnelcreek_wdt",
> +		.name = "ie6xx_wdt",
>  		.num_resources = 1,
>  		.resources = &wdt_sch_resource,
>  	},
This one should be part of your upcoming watchdog driver patch (as a separate
patch that I'd take).

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

RE: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Heasley, Seth]

Hi Samuel,

>Is the pci_ids.h change already in ? If not, I should take it at the
>same time so that we don't break compilation.

It was submitted just prior to my sending this patch.

>> @@ -68,7 +69,7 @@ static struct resource wdt_sch_resource = {
>>
>>  static struct mfd_cell tunnelcreek_cells[] = {
>>  	{
>> -		.name = "tunnelcreek_wdt",
>> +		.name = "ie6xx_wdt",
>>  		.num_resources = 1,
>>  		.resources = &wdt_sch_resource,
>>  	},
>This one should be part of your upcoming watchdog driver patch (as a
>separate patch that I'd take).

I'm actually not submitting a watchdog patch.  The maintainer already has code for this driver and is converting it to the new watchdog API.  In discussions with him, we agreed to the renaming of the driver, which was submitted for a previous platform.  He'll be committing the new code in the next couple of weeks, so I made this change in anticipation of the driver making it upstream.  I can certainly submit this separately, but my thinking was that it's all connected to Centerton enabling since it uses the same driver.  Let me know what you'd like me to do.

Regards,
-Seth

Re: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Samuel Ortiz]

Hi Seth,

On Wed, Apr 18, 2012 at 03:59:49PM +0000, Heasley, Seth wrote:
> Hi Samuel,
> 
> >Is the pci_ids.h change already in ? If not, I should take it at the
> >same time so that we don't break compilation.
> 
> It was submitted just prior to my sending this patch.
Please send it to me as your MFD patch build depends on it and it should be
committed first.



> >> @@ -68,7 +69,7 @@ static struct resource wdt_sch_resource = {
> >>
> >>  static struct mfd_cell tunnelcreek_cells[] = {
> >>  	{
> >> -		.name = "tunnelcreek_wdt",
> >> +		.name = "ie6xx_wdt",
> >>  		.num_resources = 1,
> >>  		.resources = &wdt_sch_resource,
> >>  	},
> >This one should be part of your upcoming watchdog driver patch (as a
> >separate patch that I'd take).
> 
> I'm actually not submitting a watchdog patch.  The maintainer already has code for this driver and is converting it to the new watchdog API.  In discussions with him, we agreed to the renaming of the driver, which was submitted for a previous platform.  He'll be committing the new code in the next couple of weeks, so I made this change in anticipation of the driver making it upstream.
>
That's reasonable, but I'd prefer this naming change to happen when the
watchdog patch is submitted as well, as a separate MFD one liner patch.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

RE: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Heasley, Seth]

Hi Samuel,

>> >Is the pci_ids.h change already in ? If not, I should take it at the
>> >same time so that we don't break compilation.
>>
>> It was submitted just prior to my sending this patch.
>Please send it to me as your MFD patch build depends on it and it should
>be committed first.

Done.

>> I'm actually not submitting a watchdog patch.  The maintainer already
>has code for this driver and is converting it to the new watchdog API.
>In discussions with him, we agreed to the renaming of the driver, which
>was submitted for a previous platform.  He'll be committing the new code
>in the next couple of weeks, so I made this change in anticipation of
>the driver making it upstream.
>>
>That's reasonable, but I'd prefer this naming change to happen when the
>watchdog patch is submitted as well, as a separate MFD one liner patch.

Okay, that's no problem.  Do you need this patch resubmitted, or will you just nix the one line?

Regards,
Seth

Re: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Samuel Ortiz]

Hi Seth,

On Tue, Apr 17, 2012 at 02:09:22PM -0700, Seth Heasley wrote:
> This patch adds the Intel Centerton processor DeviceID for the Integrated Legacy Block.  The ILB provides GPIO, SMBus, and Watchdog functionality. The ILB DeviceID is defined in include/linux/pci_ids.h.
> 
Patch applied to my for-next branch, after removing this chunk (That should be
part of your watchdog driver submission):

 @@ -68,7 +69,7 @@ static struct resource wdt_sch_resource = {
  
  static struct mfd_cell tunnelcreek_cells[] = {
  	{
 -		.name = "tunnelcreek_wdt",
 +		.name = "ie6xx_wdt",
  		.num_resources = 1,
  		.resources = &wdt_sch_resource,
  	},

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Grant Likely]

On Wed, May 9, 2012 at 8:01 AM, Samuel Ortiz <sameo@linux.intel.com> wrote:
> Hi Seth,
>
> On Tue, Apr 17, 2012 at 02:09:22PM -0700, Seth Heasley wrote:
>> This patch adds the Intel Centerton processor DeviceID for the Integrated Legacy Block.  The ILB provides GPIO, SMBus, and Watchdog functionality. The ILB DeviceID is defined in include/linux/pci_ids.h.
>>
> Patch applied to my for-next branch, after removing this chunk (That should be
> part of your watchdog driver submission):

Hi Samuel,

Have you applied the gpio patch also [patch 2/3]?  It also depends on
the pci device id, so it best go via your tree with the other two.

I'm dropping it from my tree.

g.

Re: [PATCH 3/3] lpc_sch: Add Intel Centerton Multifunction Device support

[Samuel Ortiz]

Hi Grant,

On Fri, May 18, 2012 at 04:44:45PM -0600, Grant Likely wrote:
> On Wed, May 9, 2012 at 8:01 AM, Samuel Ortiz <sameo@linux.intel.com> wrote:
> > Hi Seth,
> >
> > On Tue, Apr 17, 2012 at 02:09:22PM -0700, Seth Heasley wrote:
> >> This patch adds the Intel Centerton processor DeviceID for the Integrated Legacy Block.  The ILB provides GPIO, SMBus, and Watchdog functionality. The ILB DeviceID is defined in include/linux/pci_ids.h.
> >>
> > Patch applied to my for-next branch, after removing this chunk (That should be
> > part of your watchdog driver submission):
> 
> Hi Samuel,
> 
> Have you applied the gpio patch also [patch 2/3]?  It also depends on
> the pci device id, so it best go via your tree with the other two.
Yes, it's on my for-next branch.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/