[resend PATCH 0/3] usb: dwc3: ACPI support

[resend PATCH 0/3] usb: dwc3: ACPI support

[Heikki Krogerus]

Hi,

The original series included patch that adds Braswell PCI ID, but I
send it separately.

The DMA mask caused a problem as our acpi platform code does not
provide anything for us. Instead of trying to fix it in dwc3 I
decided to suggest the first patch in this series where I provide
default DMA mask for all the ACPI platform devices.


Heikki Krogerus (3):
  ACPI / platform: provide default DMA mask
  usb: dwc3: core: only setting the dma_mask when needed
  usb: dwc3: add ACPI support

 drivers/acpi/acpi_platform.c |  2 ++
 drivers/usb/dwc3/core.c      | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

-- 
2.1.0

[resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Heikki Krogerus]

Most devices are configured for 32-bit DMA addresses.
Setting the mask to 32-bit here removes the need for the
drivers to do it separately.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
---
 drivers/acpi/acpi_platform.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 2bf9082..8d099e6 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 
 #include "internal.h"
@@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 	pdevinfo.res = resources;
 	pdevinfo.num_res = count;
 	pdevinfo.acpi_node.companion = adev;
+	pdevinfo.dma_mask = DMA_BIT_MASK(32);
 	pdev = platform_device_register_full(&pdevinfo);
 	if (IS_ERR(pdev))
 		dev_err(&adev->dev, "platform device creation failed: %ld\n",
-- 
2.1.0

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> Most devices are configured for 32-bit DMA addresses.
> Setting the mask to 32-bit here removes the need for the
> drivers to do it separately.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>

ACK

> ---
>  drivers/acpi/acpi_platform.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index 2bf9082..8d099e6 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -16,6 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/platform_device.h>
>  
>  #include "internal.h"
> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>  	pdevinfo.res = resources;
>  	pdevinfo.num_res = count;
>  	pdevinfo.acpi_node.companion = adev;
> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
>  	pdev = platform_device_register_full(&pdevinfo);
>  	if (IS_ERR(pdev))
>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Adrian Hunter]

On 24/09/14 16:49, Rafael J. Wysocki wrote:
> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
>> Most devices are configured for 32-bit DMA addresses.
>> Setting the mask to 32-bit here removes the need for the
>> drivers to do it separately.
>>
>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> 
> ACK

Hi

I need this for another driver.  Did this patch go anywhere?
Note Heikki is away at the moment.

Regards
Adrian

> 
>> ---
>>  drivers/acpi/acpi_platform.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
>> index 2bf9082..8d099e6 100644
>> --- a/drivers/acpi/acpi_platform.c
>> +++ b/drivers/acpi/acpi_platform.c
>> @@ -16,6 +16,7 @@
>>  #include <linux/err.h>
>>  #include <linux/kernel.h>
>>  #include <linux/module.h>
>> +#include <linux/dma-mapping.h>
>>  #include <linux/platform_device.h>
>>  
>>  #include "internal.h"
>> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>>  	pdevinfo.res = resources;
>>  	pdevinfo.num_res = count;
>>  	pdevinfo.acpi_node.companion = adev;
>> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
>>  	pdev = platform_device_register_full(&pdevinfo);
>>  	if (IS_ERR(pdev))
>>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
>>
> 

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
> On 24/09/14 16:49, Rafael J. Wysocki wrote:
> > On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> >> Most devices are configured for 32-bit DMA addresses.
> >> Setting the mask to 32-bit here removes the need for the
> >> drivers to do it separately.
> >>
> >> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> >> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > 
> > ACK
> 
> Hi
> 
> I need this for another driver.  Did this patch go anywhere?

It's not in 3.18-rc1 as far as I can say.

> Note Heikki is away at the moment.

That's OK.  I guess I can queue up this one for you.

When do you need this to get into the Linus' tree?


> >> ---
> >>  drivers/acpi/acpi_platform.c | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> >> index 2bf9082..8d099e6 100644
> >> --- a/drivers/acpi/acpi_platform.c
> >> +++ b/drivers/acpi/acpi_platform.c
> >> @@ -16,6 +16,7 @@
> >>  #include <linux/err.h>
> >>  #include <linux/kernel.h>
> >>  #include <linux/module.h>
> >> +#include <linux/dma-mapping.h>
> >>  #include <linux/platform_device.h>
> >>  
> >>  #include "internal.h"
> >> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
> >>  	pdevinfo.res = resources;
> >>  	pdevinfo.num_res = count;
> >>  	pdevinfo.acpi_node.companion = adev;
> >> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
> >>  	pdev = platform_device_register_full(&pdevinfo);
> >>  	if (IS_ERR(pdev))
> >>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
> >>
> > 
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Adrian Hunter]

On 21/10/14 16:08, Rafael J. Wysocki wrote:
> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
>>>> Most devices are configured for 32-bit DMA addresses.
>>>> Setting the mask to 32-bit here removes the need for the
>>>> drivers to do it separately.
>>>>
>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
>>>
>>> ACK
>>
>> Hi
>>
>> I need this for another driver.  Did this patch go anywhere?
> 
> It's not in 3.18-rc1 as far as I can say.
> 
>> Note Heikki is away at the moment.
> 
> That's OK.  I guess I can queue up this one for you.
> 
> When do you need this to get into the Linus' tree?

My patches are aiming for 3.19

> 
> 
>>>> ---
>>>>  drivers/acpi/acpi_platform.c | 2 ++
>>>>  1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
>>>> index 2bf9082..8d099e6 100644
>>>> --- a/drivers/acpi/acpi_platform.c
>>>> +++ b/drivers/acpi/acpi_platform.c
>>>> @@ -16,6 +16,7 @@
>>>>  #include <linux/err.h>
>>>>  #include <linux/kernel.h>
>>>>  #include <linux/module.h>
>>>> +#include <linux/dma-mapping.h>
>>>>  #include <linux/platform_device.h>
>>>>  
>>>>  #include "internal.h"
>>>> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>>>>  	pdevinfo.res = resources;
>>>>  	pdevinfo.num_res = count;
>>>>  	pdevinfo.acpi_node.companion = adev;
>>>> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
>>>>  	pdev = platform_device_register_full(&pdevinfo);
>>>>  	if (IS_ERR(pdev))
>>>>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
>>>>
>>>
>>
> 

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Adrian Hunter]

On 21/10/14 16:13, Adrian Hunter wrote:
> On 21/10/14 16:08, Rafael J. Wysocki wrote:
>> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
>>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
>>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
>>>>> Most devices are configured for 32-bit DMA addresses.
>>>>> Setting the mask to 32-bit here removes the need for the
>>>>> drivers to do it separately.
>>>>>
>>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
>>>>
>>>> ACK
>>>
>>> Hi
>>>
>>> I need this for another driver.  Did this patch go anywhere?
>>
>> It's not in 3.18-rc1 as far as I can say.
>>
>>> Note Heikki is away at the moment.
>>
>> That's OK.  I guess I can queue up this one for you.
>>
>> When do you need this to get into the Linus' tree?
> 
> My patches are aiming for 3.19

Actually it would be easier for me if Heikki's patch is already in
3.18, but all I need to know is when it will hit?

> 
>>
>>
>>>>> ---
>>>>>  drivers/acpi/acpi_platform.c | 2 ++
>>>>>  1 file changed, 2 insertions(+)
>>>>>
>>>>> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
>>>>> index 2bf9082..8d099e6 100644
>>>>> --- a/drivers/acpi/acpi_platform.c
>>>>> +++ b/drivers/acpi/acpi_platform.c
>>>>> @@ -16,6 +16,7 @@
>>>>>  #include <linux/err.h>
>>>>>  #include <linux/kernel.h>
>>>>>  #include <linux/module.h>
>>>>> +#include <linux/dma-mapping.h>
>>>>>  #include <linux/platform_device.h>
>>>>>  
>>>>>  #include "internal.h"
>>>>> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>>>>>  	pdevinfo.res = resources;
>>>>>  	pdevinfo.num_res = count;
>>>>>  	pdevinfo.acpi_node.companion = adev;
>>>>> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
>>>>>  	pdev = platform_device_register_full(&pdevinfo);
>>>>>  	if (IS_ERR(pdev))
>>>>>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
>>>>>
>>>>
>>>
>>
> 
> 
> 

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

On Wednesday, October 22, 2014 10:33:08 AM Adrian Hunter wrote:
> On 21/10/14 16:13, Adrian Hunter wrote:
> > On 21/10/14 16:08, Rafael J. Wysocki wrote:
> >> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
> >>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
> >>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> >>>>> Most devices are configured for 32-bit DMA addresses.
> >>>>> Setting the mask to 32-bit here removes the need for the
> >>>>> drivers to do it separately.
> >>>>>
> >>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> >>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> >>>>
> >>>> ACK
> >>>
> >>> Hi
> >>>
> >>> I need this for another driver.  Did this patch go anywhere?
> >>
> >> It's not in 3.18-rc1 as far as I can say.
> >>
> >>> Note Heikki is away at the moment.
> >>
> >> That's OK.  I guess I can queue up this one for you.
> >>
> >> When do you need this to get into the Linus' tree?
> > 
> > My patches are aiming for 3.19
> 
> Actually it would be easier for me if Heikki's patch is already in
> 3.18, but all I need to know is when it will hit?

I've applied the Heiki's patch and I'm going to push it for 3.18-rc2.

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

On Wed, Oct 22, 2014 at 04:19:45PM +0200, Rafael J. Wysocki wrote:
> On Wednesday, October 22, 2014 10:33:08 AM Adrian Hunter wrote:
> > On 21/10/14 16:13, Adrian Hunter wrote:
> > > On 21/10/14 16:08, Rafael J. Wysocki wrote:
> > >> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
> > >>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
> > >>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> > >>>>> Most devices are configured for 32-bit DMA addresses.
> > >>>>> Setting the mask to 32-bit here removes the need for the
> > >>>>> drivers to do it separately.
> > >>>>>
> > >>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > >>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > >>>>
> > >>>> ACK
> > >>>
> > >>> Hi
> > >>>
> > >>> I need this for another driver.  Did this patch go anywhere?
> > >>
> > >> It's not in 3.18-rc1 as far as I can say.
> > >>
> > >>> Note Heikki is away at the moment.
> > >>
> > >> That's OK.  I guess I can queue up this one for you.
> > >>
> > >> When do you need this to get into the Linus' tree?
> > > 
> > > My patches are aiming for 3.19
> > 
> > Actually it would be easier for me if Heikki's patch is already in
> > 3.18, but all I need to know is when it will hit?
> 
> I've applied the Heiki's patch and I'm going to push it for 3.18-rc2.

I had this queued for v3.19 with your Ack. It didn't feel like it should
be in v3.18-rc as it's not really fixing any bug. In any case, fine by
me; I'll drop it from my queue.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

On Wed, Oct 22, 2014 at 04:19:45PM +0200, Rafael J. Wysocki wrote:
> On Wednesday, October 22, 2014 10:33:08 AM Adrian Hunter wrote:
> > On 21/10/14 16:13, Adrian Hunter wrote:
> > > On 21/10/14 16:08, Rafael J. Wysocki wrote:
> > >> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
> > >>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
> > >>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> > >>>>> Most devices are configured for 32-bit DMA addresses.
> > >>>>> Setting the mask to 32-bit here removes the need for the
> > >>>>> drivers to do it separately.
> > >>>>>
> > >>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > >>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > >>>>
> > >>>> ACK
> > >>>
> > >>> Hi
> > >>>
> > >>> I need this for another driver.  Did this patch go anywhere?
> > >>
> > >> It's not in 3.18-rc1 as far as I can say.
> > >>
> > >>> Note Heikki is away at the moment.
> > >>
> > >> That's OK.  I guess I can queue up this one for you.
> > >>
> > >> When do you need this to get into the Linus' tree?
> > > 
> > > My patches are aiming for 3.19
> > 
> > Actually it would be easier for me if Heikki's patch is already in
> > 3.18, but all I need to know is when it will hit?
> 
> I've applied the Heiki's patch and I'm going to push it for 3.18-rc2.

I had this queued for v3.19 with your Ack. It didn't feel like it should
be in v3.18-rc as it's not really fixing any bug. In any case, fine by
me; I'll drop it from my queue.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [resend PATCH 1/3] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

On Thursday, October 23, 2014 10:06:05 AM Felipe Balbi wrote:
> 
> --HSQ3hISbU3Um6hch
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
> 
> On Wed, Oct 22, 2014 at 04:19:45PM +0200, Rafael J. Wysocki wrote:
> > On Wednesday, October 22, 2014 10:33:08 AM Adrian Hunter wrote:
> > > On 21/10/14 16:13, Adrian Hunter wrote:
> > > > On 21/10/14 16:08, Rafael J. Wysocki wrote:
> > > >> On Tuesday, October 21, 2014 03:27:45 PM Adrian Hunter wrote:
> > > >>> On 24/09/14 16:49, Rafael J. Wysocki wrote:
> > > >>>> On Wednesday, September 24, 2014 11:00:37 AM Heikki Krogerus wrote:
> > > >>>>> Most devices are configured for 32-bit DMA addresses.
> > > >>>>> Setting the mask to 32-bit here removes the need for the
> > > >>>>> drivers to do it separately.
> > > >>>>>
> > > >>>>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > >>>>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > > >>>>
> > > >>>> ACK
> > > >>>
> > > >>> Hi
> > > >>>
> > > >>> I need this for another driver.  Did this patch go anywhere?
> > > >>
> > > >> It's not in 3.18-rc1 as far as I can say.
> > > >>
> > > >>> Note Heikki is away at the moment.
> > > >>
> > > >> That's OK.  I guess I can queue up this one for you.
> > > >>
> > > >> When do you need this to get into the Linus' tree?
> > > >=20
> > > > My patches are aiming for 3.19
> > >=20
> > > Actually it would be easier for me if Heikki's patch is already in
> > > 3.18, but all I need to know is when it will hit?
> >=20
> > I've applied the Heiki's patch and I'm going to push it for 3.18-rc2.
> 
> I had this queued for v3.19 with your Ack. It didn't feel like it should
> be in v3.18-rc as it's not really fixing any bug. In any case, fine by
> me; I'll drop it from my queue.

OK, thanks!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

[resend PATCH 2/3] usb: dwc3: core: only setting the dma_mask when needed

[Heikki Krogerus]

If the probe drivers have already set the dma_mask, not
replacing the value.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index b0f4d52..d08cac5 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -708,9 +708,11 @@ static int dwc3_probe(struct platform_device *pdev)
 	spin_lock_init(&dwc->lock);
 	platform_set_drvdata(pdev, dwc);
 
-	dev->dma_mask	= dev->parent->dma_mask;
-	dev->dma_parms	= dev->parent->dma_parms;
-	dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	if (!dev->dma_mask) {
+		dev->dma_mask = dev->parent->dma_mask;
+		dev->dma_parms = dev->parent->dma_parms;
+		dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	}
 
 	pm_runtime_enable(dev);
 	pm_runtime_get_sync(dev);
-- 
2.1.0

[resend PATCH 3/3] usb: dwc3: add ACPI support

[Heikki Krogerus]

Adds ACPI ID used on newer Intel SoCs.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index d08cac5..c2cf2d8 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/acpi.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -960,12 +961,21 @@ static const struct of_device_id of_dwc3_match[] = {
 MODULE_DEVICE_TABLE(of, of_dwc3_match);
 #endif
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id dwc3_acpi_match[] = {
+	{ "808622B7", 0 },
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
+#endif
+
 static struct platform_driver dwc3_driver = {
 	.probe		= dwc3_probe,
 	.remove		= dwc3_remove,
 	.driver		= {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),
+		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
 		.pm	= DWC3_PM_OPS,
 	},
 };
-- 
2.1.0

Re: [resend PATCH 3/3] usb: dwc3: add ACPI support

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

On Wed, Sep 24, 2014 at 11:00:39AM +0300, Heikki Krogerus wrote:
> Adds ACPI ID used on newer Intel SoCs.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
>  drivers/usb/dwc3/core.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index d08cac5..c2cf2d8 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -32,6 +32,7 @@
>  #include <linux/delay.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/of.h>
> +#include <linux/acpi.h>
>  
>  #include <linux/usb/ch9.h>
>  #include <linux/usb/gadget.h>
> @@ -960,12 +961,21 @@ static const struct of_device_id of_dwc3_match[] = {
>  MODULE_DEVICE_TABLE(of, of_dwc3_match);
>  #endif
>  
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id dwc3_acpi_match[] = {
> +	{ "808622B7", 0 },

can you just provide a macro for this string ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [resend PATCH 3/3] usb: dwc3: add ACPI support

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

On Wed, Sep 24, 2014 at 11:00:39AM +0300, Heikki Krogerus wrote:
> Adds ACPI ID used on newer Intel SoCs.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
>  drivers/usb/dwc3/core.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index d08cac5..c2cf2d8 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -32,6 +32,7 @@
>  #include <linux/delay.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/of.h>
> +#include <linux/acpi.h>
>  
>  #include <linux/usb/ch9.h>
>  #include <linux/usb/gadget.h>
> @@ -960,12 +961,21 @@ static const struct of_device_id of_dwc3_match[] = {
>  MODULE_DEVICE_TABLE(of, of_dwc3_match);
>  #endif
>  
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id dwc3_acpi_match[] = {
> +	{ "808622B7", 0 },

can you just provide a macro for this string ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCHv2 3/3] usb: dwc3: add ACPI support

[Heikki Krogerus]

Adding ACPI ID used on newer Intel SoCs.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index d08cac5..88e29f5 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/acpi.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -960,12 +961,24 @@ static const struct of_device_id of_dwc3_match[] = {
 MODULE_DEVICE_TABLE(of, of_dwc3_match);
 #endif
 
+#ifdef CONFIG_ACPI
+
+#define ACPI_ID_INTEL_BSW	"808622B7"
+
+static const struct acpi_device_id dwc3_acpi_match[] = {
+	{ ACPI_ID_INTEL_BSW, 0 },
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
+#endif
+
 static struct platform_driver dwc3_driver = {
 	.probe		= dwc3_probe,
 	.remove		= dwc3_remove,
 	.driver		= {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),
+		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
 		.pm	= DWC3_PM_OPS,
 	},
 };
-- 
2.1.0