[PATCH] ata: ahci: tegra: fix build error

[PATCH] ata: ahci: tegra: fix build error

[Felipe Balbi]

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

Currently, ahci_tegra doesn't build because it includes a file that
doesn't exist.

The problem is that first commit 306a7f9 (ARM: tegra: Move includes to
include/soc/tegra) renamed include/linux/tegra-powergate.h to
include/soc/tegra/powergate.h.

Later commit 7232398 (ARM: tegra: Convert PMC to a driver) renamed
include/soc/tegra/powergate.h to include/soc/tegra/pmc.h and neither
commits fixed drivers/ata/ahci_tegra.c.

Fix that so the driver has a chance of building. With current kernels.

Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.16
Signed-of-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/ata/ahci_tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
index fc3df47..7194835 100644
--- a/drivers/ata/ahci_tegra.c
+++ b/drivers/ata/ahci_tegra.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
-#include <linux/tegra-powergate.h>
+#include <soc/tegra/pmc.h>
 #include <linux/regulator/consumer.h>
 #include "ahci.h"
 
--
2.0.1.563.g66f467c

-- 
balbi

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

Re: [PATCH] ata: ahci: tegra: fix build error

[Stephen Warren]

On 08/21/2014 01:08 PM, Felipe Balbi wrote:
> Currently, ahci_tegra doesn't build because it includes a file that
> doesn't exist.
>
> The problem is that first commit 306a7f9 (ARM: tegra: Move includes to
> include/soc/tegra) renamed include/linux/tegra-powergate.h to
> include/soc/tegra/powergate.h.
>
> Later commit 7232398 (ARM: tegra: Convert PMC to a driver) renamed
> include/soc/tegra/powergate.h to include/soc/tegra/pmc.h and neither
> commits fixed drivers/ata/ahci_tegra.c.
>
> Fix that so the driver has a chance of building. With current kernels.
>
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.16

This driver first appeared in v3.17-rc1.

This patch has already been sent, and apparently applied:

https://lkml.org/lkml/2014/8/16/36

I wonder if libata/for-3.17-fixes isn't in linux-next?

Re: [PATCH] ata: ahci: tegra: fix build error

[Felipe Balbi]

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

On Thu, Aug 21, 2014 at 02:08:24PM -0500, Felipe Balbi wrote:
> Currently, ahci_tegra doesn't build because it includes a file that
> doesn't exist.
> 
> The problem is that first commit 306a7f9 (ARM: tegra: Move includes to
> include/soc/tegra) renamed include/linux/tegra-powergate.h to
> include/soc/tegra/powergate.h.
> 
> Later commit 7232398 (ARM: tegra: Convert PMC to a driver) renamed
> include/soc/tegra/powergate.h to include/soc/tegra/pmc.h and neither
> commits fixed drivers/ata/ahci_tegra.c.
> 
> Fix that so the driver has a chance of building. With current kernels.
                                                 ^
						 this period shouldn't
						 exist :-p
> 
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.16
> Signed-of-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
> ---
>  drivers/ata/ahci_tegra.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
> index fc3df47..7194835 100644
> --- a/drivers/ata/ahci_tegra.c
> +++ b/drivers/ata/ahci_tegra.c
> @@ -24,7 +24,7 @@
>  #include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/platform_device.h>
> -#include <linux/tegra-powergate.h>
> +#include <soc/tegra/pmc.h>
>  #include <linux/regulator/consumer.h>
>  #include "ahci.h"
>  
> --
> 2.0.1.563.g66f467c
> 
> -- 
> balbi



-- 
balbi

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

Re: [PATCH] ata: ahci: tegra: fix build error

[Felipe Balbi]

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

On Thu, Aug 21, 2014 at 01:17:14PM -0600, Stephen Warren wrote:
> On 08/21/2014 01:08 PM, Felipe Balbi wrote:
> >Currently, ahci_tegra doesn't build because it includes a file that
> >doesn't exist.
> >
> >The problem is that first commit 306a7f9 (ARM: tegra: Move includes to
> >include/soc/tegra) renamed include/linux/tegra-powergate.h to
> >include/soc/tegra/powergate.h.
> >
> >Later commit 7232398 (ARM: tegra: Convert PMC to a driver) renamed
> >include/soc/tegra/powergate.h to include/soc/tegra/pmc.h and neither
> >commits fixed drivers/ata/ahci_tegra.c.
> >
> >Fix that so the driver has a chance of building. With current kernels.
> >
> >Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.16
> 
> This driver first appeared in v3.17-rc1.

hmm... weird, git describe told v3.16-rc1 :-s

> This patch has already been sent, and apparently applied:
> 
> https://lkml.org/lkml/2014/8/16/36

aha, thanks.

> I wonder if libata/for-3.17-fixes isn't in linux-next?

it is, it's just that I was build testing my branch which is based off
of v3.17-rc1 as of now.

-- 
balbi

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

Re: [PATCH] ata: ahci: tegra: fix build error

[Tejun Heo]

Hello,

On Thu, Aug 21, 2014 at 02:21:34PM -0500, Felipe Balbi wrote:
> > I wonder if libata/for-3.17-fixes isn't in linux-next?
> 
> it is, it's just that I was build testing my branch which is based off
> of v3.17-rc1 as of now.

Yeah, I'm traveling and haven't had the chance to push it.  I'll try
to push it right now.

Thanks.

-- 
tejun