[PATCH 1/2] ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[PATCH 1/2] ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Geert Uytterhoeven]

The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
PHY_RCAR_GEN2 driver.

Refresh the defconfig using "make savedefconfig" while we're at it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
defconfig, as it supports legacy platform data only.

 arch/arm/configs/shmobile_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index b58618e2d13c51c8..9961fbd633f8d165 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -121,7 +121,6 @@ CONFIG_WATCHDOG=y
 CONFIG_DA9063_WATCHDOG=y
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_DA9063=y
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_AS3711=y
 CONFIG_REGULATOR_DA9210=y
 CONFIG_REGULATOR_GPIO=y
@@ -160,7 +159,6 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_R8A66597_HCD=y
 CONFIG_USB_RENESAS_USBHS=y
 CONFIG_USB_RCAR_PHY=y
-CONFIG_USB_RCAR_GEN2_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_RENESAS_USBHS_UDC=y
 CONFIG_USB_ETH=y
@@ -182,6 +180,8 @@ CONFIG_IIO=y
 CONFIG_AK8975=y
 CONFIG_PWM=y
 CONFIG_PWM_RENESAS_TPU=y
+CONFIG_GENERIC_PHY=y
+CONFIG_PHY_RCAR_GEN2=y
 # CONFIG_DNOTIFY is not set
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
-- 
1.9.1

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Geert Uytterhoeven]

The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
PHY_RCAR_GEN2 driver.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
defconfig, as it supports legacy platform data only.

 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 06e7e887fea550b3..2835ffda3bfed8ed 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -447,7 +447,6 @@ CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_RCAR_GEN2_PHY=m
 CONFIG_USB_GADGET=y
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_MMC=y
@@ -561,6 +560,7 @@ CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=y
 CONFIG_PHY_MIPHY28LP=y
 CONFIG_PHY_MIPHY365X=y
+CONFIG_PHY_RCAR_GEN2=m
 CONFIG_PHY_STIH41X_USB=y
 CONFIG_PHY_STIH407_USB=y
 CONFIG_PHY_SUN4I_USB=y
-- 
1.9.1

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Simon Horman]

On Tue, Apr 28, 2015 at 02:08:04PM +0200, Geert Uytterhoeven wrote:
> The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
> PHY_RCAR_GEN2 driver.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
> defconfig, as it supports legacy platform data only.

Acked-by: Simon Horman <horms+renesas@verge.net.au>

Olof, Arnd, Kevin,

I'm assuming that you want to take this directly (or not!).
However, if you would like me to queue up these kind of changes
in my defconfig branch please just let me know.

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Simon Horman]

[CC Kevin]

On Thu, Apr 30, 2015 at 09:17:44AM +0900, Simon Horman wrote:
> On Tue, Apr 28, 2015 at 02:08:04PM +0200, Geert Uytterhoeven wrote:
> > The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
> > PHY_RCAR_GEN2 driver.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
> > defconfig, as it supports legacy platform data only.
> 
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Olof, Arnd, Kevin,
> 
> I'm assuming that you want to take this directly (or not!).
> However, if you would like me to queue up these kind of changes
> in my defconfig branch please just let me know.

Hi,

I'm wondering if you could take a moment to either review this patch
or indicate that you would like me to queue up changes like this.

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Arnd Bergmann]

On Saturday 09 May 2015 11:14:03 Simon Horman wrote:
> On Thu, Apr 30, 2015 at 09:17:44AM +0900, Simon Horman wrote:
> > On Tue, Apr 28, 2015 at 02:08:04PM +0200, Geert Uytterhoeven wrote:
> > > The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
> > > PHY_RCAR_GEN2 driver.
> > > 
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > ---
> > > Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
> > > defconfig, as it supports legacy platform data only.
> > 
> > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > Olof, Arnd, Kevin,
> > 
> > I'm assuming that you want to take this directly (or not!).
> > However, if you would like me to queue up these kind of changes
> > in my defconfig branch please just let me know.
> 
> Hi,
> 
> I'm wondering if you could take a moment to either review this patch
> or indicate that you would like me to queue up changes like this.

The patch looks ok to me, and I've queued it up in the next/defconfig
branch for 4.2 now.

In general, I think it's easier if you take all patches at first and
then forward them to us, that way we can rely on you to have an
overview of what is missing.

If you only have one patch for a particular branch, sending a patch
(instead of a pull request) to arm at kernel.org works as well, but it's
less ambiguous if you relay that patch with your signed-off-by line
added than to have us figure out whether you want the patch to be
applied directly or not.

	Arnd

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Geert Uytterhoeven]

Hi Arnd,

On Tue, May 12, 2015 at 5:15 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Saturday 09 May 2015 11:14:03 Simon Horman wrote:
>> On Thu, Apr 30, 2015 at 09:17:44AM +0900, Simon Horman wrote:
>> > On Tue, Apr 28, 2015 at 02:08:04PM +0200, Geert Uytterhoeven wrote:
>> > > The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
>> > > PHY_RCAR_GEN2 driver.
>> > >
>> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> > > ---
>> > > Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
>> > > defconfig, as it supports legacy platform data only.
>> >
>> > Acked-by: Simon Horman <horms+renesas@verge.net.au>
>> >
>> > Olof, Arnd, Kevin,
>> >
>> > I'm assuming that you want to take this directly (or not!).
>> > However, if you would like me to queue up these kind of changes
>> > in my defconfig branch please just let me know.
>>
>> Hi,
>>
>> I'm wondering if you could take a moment to either review this patch
>> or indicate that you would like me to queue up changes like this.
>
> The patch looks ok to me, and I've queued it up in the next/defconfig
> branch for 4.2 now.

Thanks!

> In general, I think it's easier if you take all patches at first and
> then forward them to us, that way we can rely on you to have an
> overview of what is missing.
>
> If you only have one patch for a particular branch, sending a patch
> (instead of a pull request) to arm at kernel.org works as well, but it's
> less ambiguous if you relay that patch with your signed-off-by line
> added than to have us figure out whether you want the patch to be
> applied directly or not.

I think Simon's question was more about asking what's the proper process
for updating multi_v7_defconfig.

Should this go through you / arm at kernel.org directly?
Should it go through arm subarchitecture maintainers, causing merge conflicts?

BTW, arm at kernel.org isn't documented in MAINTAINERS.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Arnd Bergmann]

On Tuesday 12 May 2015 18:30:59 Geert Uytterhoeven wrote:
> 
> I think Simon's question was more about asking what's the proper process
> for updating multi_v7_defconfig.
> 
> Should this go through you / arm at kernel.org directly?
> Should it go through arm subarchitecture maintainers, causing merge conflicts?

I think it should go through subarch maintainers, and we'll handle the
conflicts as they arise when merging into the next/defconfig branch.
This does mean that it's important to send the defconfig changes separately
from other changes if possible, but it's fine to have a branch that touches
both platform-specific and generic defconfig files.

> BTW, arm at kernel.org isn't documented in MAINTAINERS.

Right, that is intentional. We don't want to get Cc'd on 4000 patches per
month that get sent to the mailing list for mach-*. By having a maintainer
for each subdirectory and letting them decide what to forward to us,
we're able to do our job better.

	Arnd

[PATCH 2/2] ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Simon Horman]

Hi Arnd, Hi Geert,

On Tue, May 12, 2015 at 09:42:40PM +0200, Arnd Bergmann wrote:
> On Tuesday 12 May 2015 18:30:59 Geert Uytterhoeven wrote:
> > 
> > I think Simon's question was more about asking what's the proper process
> > for updating multi_v7_defconfig.
> > 
> > Should this go through you / arm at kernel.org directly?
> > Should it go through arm subarchitecture maintainers, causing merge conflicts?
> 
> I think it should go through subarch maintainers, and we'll handle the
> conflicts as they arise when merging into the next/defconfig branch.
> This does mean that it's important to send the defconfig changes separately
> from other changes if possible, but it's fine to have a branch that touches
> both platform-specific and generic defconfig files.

Thanks, that is now completely clear to me.

FWIW, I am currently seeing one or two generic config changes per release
cycle. Which implies to me that conflicts should be minimal.

> > BTW, arm at kernel.org isn't documented in MAINTAINERS.
> 
> Right, that is intentional. We don't want to get Cc'd on 4000 patches per
> month that get sent to the mailing list for mach-*. By having a maintainer
> for each subdirectory and letting them decide what to forward to us,
> we're able to do our job better.
> 
> 	Arnd
> 

[PATCH 1/2] ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2

[Simon Horman]

On Tue, Apr 28, 2015 at 02:08:03PM +0200, Geert Uytterhoeven wrote:
> The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only
> PHY_RCAR_GEN2 driver.
> 
> Refresh the defconfig using "make savedefconfig" while we're at it.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Oops, CONFIG_USB_RCAR_GEN2_PHY shouldn't have been in a multiplatform
> defconfig, as it supports legacy platform data only.

Thanks for cleaning this up.

I have queued this up for v4.2.

> 
>  arch/arm/configs/shmobile_defconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
> index b58618e2d13c51c8..9961fbd633f8d165 100644
> --- a/arch/arm/configs/shmobile_defconfig
> +++ b/arch/arm/configs/shmobile_defconfig
> @@ -121,7 +121,6 @@ CONFIG_WATCHDOG=y
>  CONFIG_DA9063_WATCHDOG=y
>  CONFIG_MFD_AS3711=y
>  CONFIG_MFD_DA9063=y
> -CONFIG_REGULATOR=y
>  CONFIG_REGULATOR_AS3711=y
>  CONFIG_REGULATOR_DA9210=y
>  CONFIG_REGULATOR_GPIO=y
> @@ -160,7 +159,6 @@ CONFIG_USB_OHCI_HCD=y
>  CONFIG_USB_R8A66597_HCD=y
>  CONFIG_USB_RENESAS_USBHS=y
>  CONFIG_USB_RCAR_PHY=y
> -CONFIG_USB_RCAR_GEN2_PHY=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_RENESAS_USBHS_UDC=y
>  CONFIG_USB_ETH=y
> @@ -182,6 +180,8 @@ CONFIG_IIO=y
>  CONFIG_AK8975=y
>  CONFIG_PWM=y
>  CONFIG_PWM_RENESAS_TPU=y
> +CONFIG_GENERIC_PHY=y
> +CONFIG_PHY_RCAR_GEN2=y
>  # CONFIG_DNOTIFY is not set
>  CONFIG_MSDOS_FS=y
>  CONFIG_VFAT_FS=y
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>