[PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Simon Horman]

Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.

This is part of an ongoing process to migrate from ARCH_SHMOBILE to
ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/pci/host/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

 Based on the next branch of the pci tree

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 75a605426538..dcf4d5a349ca 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -41,7 +41,7 @@ config PCI_TEGRA
 config PCI_RCAR_GEN2
 	bool "Renesas R-Car Gen2 Internal PCI controller"
 	depends on ARM
-	depends on ARCH_SHMOBILE || COMPILE_TEST
+	depends on ARCH_RENESAS || COMPILE_TEST
 	help
 	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.
 	  There are 3 internal PCI controllers available with a single
@@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
 
 config PCI_RCAR_GEN2_PCIE
 	bool "Renesas R-Car PCIe controller"
-	depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
+	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
 	help
 	  Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
 
-- 
2.7.0.rc3.207.g0ac5344

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Geert Uytterhoeven]

On Thu, Feb 25, 2016 at 1:45 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
>
> This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
> appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig

> @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
>
>  config PCI_RCAR_GEN2_PCIE
>         bool "Renesas R-Car PCIe controller"
> -       depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> +       depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
>         help
>           Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.

BTW, this looks like a misnomer: the driver supports a compatible value for
R-Car H1, too ("renesas,pcie-r8a7779"), but it's not used in r8a7779.dtsi.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

RE: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Phil Edworthy]

SGkgR2VlcnQsDQoNCk9uIDI1IEZlYnJ1YXJ5IDIwMTYgMDg6MDUsIEdlZXJ0IFV5dHRlcmhvZXZl
biB3cm90ZToNCj4gT24gVGh1LCBGZWIgMjUsIDIwMTYgYXQgMTo0NSBBTSwgU2ltb24gSG9ybWFu
DQo+IDxob3JtcytyZW5lc2FzQHZlcmdlLm5ldC5hdT4gd3JvdGU6DQo+ID4gTWFrZSB1c2Ugb2Yg
QVJDSF9SRU5FU0FTIGluIHBsYWNlIG9mIEFSQ0hfU0hNT0JJTEUuDQo+ID4NCj4gPiBUaGlzIGlz
IHBhcnQgb2YgYW4gb25nb2luZyBwcm9jZXNzIHRvIG1pZ3JhdGUgZnJvbSBBUkNIX1NITU9CSUxF
IHRvDQo+ID4gQVJDSF9SRU5FU0FTIHRoZSBtb3RpdmF0aW9uIGZvciB3aGljaCBiZWluZyB0aGF0
IFJFTkVTQVMgc2VlbXMgdG8gYmUgYQ0KPiBtb3JlDQo+ID4gYXBwcm9wcmlhdGUgbmFtZSB0aGFu
IFNITU9CSUxFIGZvciB0aGUgbWFqb3JpdHkgb2YgUmVuZXNhcyBBUk0gYmFzZWQNCj4gU29Dcy4N
Cj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IFNpbW9uIEhvcm1hbiA8aG9ybXMrcmVuZXNhc0B2ZXJn
ZS5uZXQuYXU+DQo+IA0KPiBBY2tlZC1ieTogR2VlcnQgVXl0dGVyaG9ldmVuIDxnZWVydCtyZW5l
c2FzQGdsaWRlci5iZT4NCj4gDQo+ID4gLS0tIGEvZHJpdmVycy9wY2kvaG9zdC9LY29uZmlnDQo+
ID4gKysrIGIvZHJpdmVycy9wY2kvaG9zdC9LY29uZmlnDQo+IA0KPiA+IEBAIC00OSw3ICs0OSw3
IEBAIGNvbmZpZyBQQ0lfUkNBUl9HRU4yDQo+ID4NCj4gPiAgY29uZmlnIFBDSV9SQ0FSX0dFTjJf
UENJRQ0KPiA+ICAgICAgICAgYm9vbCAiUmVuZXNhcyBSLUNhciBQQ0llIGNvbnRyb2xsZXIiDQo+
ID4gLSAgICAgICBkZXBlbmRzIG9uIEFSQ0hfU0hNT0JJTEUgfHwgKEFSTSAmJiBDT01QSUxFX1RF
U1QpDQo+ID4gKyAgICAgICBkZXBlbmRzIG9uIEFSQ0hfUkVORVNBUyB8fCAoQVJNICYmIENPTVBJ
TEVfVEVTVCkNCj4gPiAgICAgICAgIGhlbHANCj4gPiAgICAgICAgICAgU2F5IFkgaGVyZSBpZiB5
b3Ugd2FudCBQQ0llIGNvbnRyb2xsZXIgc3VwcG9ydCBvbiBSLUNhciBHZW4yIFNvQ3MuDQo+IA0K
PiBCVFcsIHRoaXMgbG9va3MgbGlrZSBhIG1pc25vbWVyOiB0aGUgZHJpdmVyIHN1cHBvcnRzIGEg
Y29tcGF0aWJsZSB2YWx1ZSBmb3INCj4gUi1DYXIgSDEsIHRvbyAoInJlbmVzYXMscGNpZS1yOGE3
Nzc5IiksIGJ1dCBpdCdzIG5vdCB1c2VkIGluIHI4YTc3NzkuZHRzaS4NCklJUkMsIEgxIFBDSWUg
c3VwcG9ydCB3YXMgbm9iYmxlZCBpbiBzb21lIHdheSB0aGF0IG1lYW50IHlvdSBjb3VsZCBub3QN
CnVzZSBpdCB3aXRoIGFueSBub3JtYWwgUENJZSBjYXJkLiBZb3UgY291bGQgY29ubmVjdCB0byBh
bm90aGVyIFItQ2FyIHRoYXQNCndhcyBhY3RpbmcgYXMgYW4gZW5kcG9pbnQgdGhvdWdoLg0KDQpQ
aGlsDQo=

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Simon Horman]

On Fri, Feb 26, 2016 at 09:22:04AM +0000, Phil Edworthy wrote:
> Hi Geert,
> 
> On 25 February 2016 08:05, Geert Uytterhoeven wrote:
> > On Thu, Feb 25, 2016 at 1:45 AM, Simon Horman
> > <horms+renesas@verge.net.au> wrote:
> > > Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
> > >
> > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a
> > more
> > > appropriate name than SHMOBILE for the majority of Renesas ARM based
> > SoCs.
> > >
> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > > --- a/drivers/pci/host/Kconfig
> > > +++ b/drivers/pci/host/Kconfig
> > 
> > > @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
> > >
> > >  config PCI_RCAR_GEN2_PCIE
> > >         bool "Renesas R-Car PCIe controller"
> > > -       depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> > > +       depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
> > >         help
> > >           Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
> > 
> > BTW, this looks like a misnomer: the driver supports a compatible value for
> > R-Car H1, too ("renesas,pcie-r8a7779"), but it's not used in r8a7779.dtsi.
> IIRC, H1 PCIe support was nobbled in some way that meant you could not
> use it with any normal PCIe card. You could connect to another R-Car that
> was acting as an endpoint though.

It sounds like that might be worth documenting somewhere.

In any case, I think we could s/Gen2 // in the text above.

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Bjorn Helgaas]

On Thu, Feb 25, 2016 at 09:45:56AM +0900, Simon Horman wrote:
> Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
> 
> This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
> appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  drivers/pci/host/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>  Based on the next branch of the pci tree
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 75a605426538..dcf4d5a349ca 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -41,7 +41,7 @@ config PCI_TEGRA
>  config PCI_RCAR_GEN2
>  	bool "Renesas R-Car Gen2 Internal PCI controller"
>  	depends on ARM
> -	depends on ARCH_SHMOBILE || COMPILE_TEST
> +	depends on ARCH_RENESAS || COMPILE_TEST
>  	help
>  	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.
>  	  There are 3 internal PCI controllers available with a single
> @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
>  
>  config PCI_RCAR_GEN2_PCIE
>  	bool "Renesas R-Car PCIe controller"
> -	depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> +	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)

I don't object to this, but I don't know what's happening with Phil's
question.  Is there another revision coming with a doc change and/or the
"s/Gen2//" change?

>  	help
>  	  Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
>  
> -- 
> 2.7.0.rc3.207.g0ac5344
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Simon Horman]

On Tue, Mar 08, 2016 at 12:36:50PM -0600, Bjorn Helgaas wrote:
> On Thu, Feb 25, 2016 at 09:45:56AM +0900, Simon Horman wrote:
> > Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
> > 
> > This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
> > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.
> > 
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  drivers/pci/host/Kconfig | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> >  Based on the next branch of the pci tree
> > 
> > diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> > index 75a605426538..dcf4d5a349ca 100644
> > --- a/drivers/pci/host/Kconfig
> > +++ b/drivers/pci/host/Kconfig
> > @@ -41,7 +41,7 @@ config PCI_TEGRA
> >  config PCI_RCAR_GEN2
> >  	bool "Renesas R-Car Gen2 Internal PCI controller"
> >  	depends on ARM
> > -	depends on ARCH_SHMOBILE || COMPILE_TEST
> > +	depends on ARCH_RENESAS || COMPILE_TEST
> >  	help
> >  	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.
> >  	  There are 3 internal PCI controllers available with a single
> > @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
> >  
> >  config PCI_RCAR_GEN2_PCIE
> >  	bool "Renesas R-Car PCIe controller"
> > -	depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> > +	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
> 
> I don't object to this, but I don't know what's happening with Phil's
> question.  Is there another revision coming with a doc change and/or the
> "s/Gen2//" change?

Sorry for not following up earlier. I have a slight preference to handle
the Gen2 issue as a separate change. Could you consider picking up this
patch as is?

With regards to the Gen2 change:

* I think its entirely reasonable to s/Gen2// in the help text but;
* I think it would also be worth considering, as a follow-up change,
  s/PCI_RCAR_GEN2/PCI_RCAR/ though I'm wary of breaking existing configs.

  So I don't have a clear view of how to move forwards at this time.

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Bjorn Helgaas]

On Fri, Mar 11, 2016 at 10:49:11AM +0900, Simon Horman wrote:
> On Tue, Mar 08, 2016 at 12:36:50PM -0600, Bjorn Helgaas wrote:
> > On Thu, Feb 25, 2016 at 09:45:56AM +0900, Simon Horman wrote:
> > > Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
> > > 
> > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
> > > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.
> > > 
> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > > ---
> > >  drivers/pci/host/Kconfig | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > >  Based on the next branch of the pci tree
> > > 
> > > diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> > > index 75a605426538..dcf4d5a349ca 100644
> > > --- a/drivers/pci/host/Kconfig
> > > +++ b/drivers/pci/host/Kconfig
> > > @@ -41,7 +41,7 @@ config PCI_TEGRA
> > >  config PCI_RCAR_GEN2
> > >  	bool "Renesas R-Car Gen2 Internal PCI controller"
> > >  	depends on ARM
> > > -	depends on ARCH_SHMOBILE || COMPILE_TEST
> > > +	depends on ARCH_RENESAS || COMPILE_TEST
> > >  	help
> > >  	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.
> > >  	  There are 3 internal PCI controllers available with a single
> > > @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
> > >  
> > >  config PCI_RCAR_GEN2_PCIE
> > >  	bool "Renesas R-Car PCIe controller"
> > > -	depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> > > +	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
> > 
> > I don't object to this, but I don't know what's happening with Phil's
> > question.  Is there another revision coming with a doc change and/or the
> > "s/Gen2//" change?
> 
> Sorry for not following up earlier. I have a slight preference to handle
> the Gen2 issue as a separate change. Could you consider picking up this
> patch as is?
> 
> With regards to the Gen2 change:
> 
> * I think its entirely reasonable to s/Gen2// in the help text but;
> * I think it would also be worth considering, as a follow-up change,
>   s/PCI_RCAR_GEN2/PCI_RCAR/ though I'm wary of breaking existing configs.

The Gen2 and PCI/PCIe text is definitely confusing.  It'd be nice to
clean it up somehow.

Bjorn

Re: [PATCH] PCI: rcar, rcar-gen2: Use ARCH_RENESAS

[Bjorn Helgaas]

On Thu, Feb 25, 2016 at 09:45:56AM +0900, Simon Horman wrote:
> Make use of ARCH_RENESAS in place of ARCH_SHMOBILE.
> 
> This is part of an ongoing process to migrate from ARCH_SHMOBILE to
> ARCH_RENESAS the motivation for which being that RENESAS seems to be a more
> appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Applied with Geert's ack to pci/host-rcar for v4.6, thanks, Simon!

> ---
>  drivers/pci/host/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>  Based on the next branch of the pci tree
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 75a605426538..dcf4d5a349ca 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -41,7 +41,7 @@ config PCI_TEGRA
>  config PCI_RCAR_GEN2
>  	bool "Renesas R-Car Gen2 Internal PCI controller"
>  	depends on ARM
> -	depends on ARCH_SHMOBILE || COMPILE_TEST
> +	depends on ARCH_RENESAS || COMPILE_TEST
>  	help
>  	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.
>  	  There are 3 internal PCI controllers available with a single
> @@ -49,7 +49,7 @@ config PCI_RCAR_GEN2
>  
>  config PCI_RCAR_GEN2_PCIE
>  	bool "Renesas R-Car PCIe controller"
> -	depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
> +	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
>  	help
>  	  Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
>  
> -- 
> 2.7.0.rc3.207.g0ac5344
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html