[PATCH 0/2] ARM: berlin: let RESET_CONTROLLER be user-selectable

[PATCH 0/2] ARM: berlin: let RESET_CONTROLLER be user-selectable

[Antoine Tenart]

Hello,

As asked by Arnd in the Berlin USB thread[1], do not select automatically
RESET_CONTROLLER when using ARCH_BERLIN but let it be user-selectable.

To ensure the Berlin USB PHY driver still works with this change, make it
depending on RESET_CONTROLLER.

Antoine

[1] https://lkml.org/lkml/2014/11/14/415

Antoine Tenart (2):
  phy: berlin_usb: depends on RESET_CONTROLLER
  ARM: berlin: do not select RESET_CONTROLLER

 arch/arm/mach-berlin/Kconfig | 1 -
 drivers/phy/Kconfig          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

-- 
2.1.0

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Antoine Tenart]

The Berlin USB PHY driver uses the Berlin reset controller
unconditionally. Make it depending on RESET_CONTROLLER.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index b6da75f563e7..38ca6ff00aef 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -17,7 +17,7 @@ config GENERIC_PHY
 
 config PHY_BERLIN_USB
 	tristate "Marvell Berlin USB PHY Driver"
-	depends on ARCH_BERLIN && HAS_IOMEM && OF
+	depends on ARCH_BERLIN && RESET_CONTROLLER && HAS_IOMEM && OF
 	select GENERIC_PHY
 	help
 	  Enable this to support the USB PHY on Marvell Berlin SoCs.
-- 
2.1.0

[PATCH 2/2] ARM: berlin: do not select RESET_CONTROLLER

[Antoine Tenart]

RESET_CONTROLLER is meant to be user-selectable. To respect that,
do not select it automatically when using ARCH_BERLIN.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 arch/arm/mach-berlin/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 5803f773a065..51582c73a53f 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -7,7 +7,6 @@ menuconfig ARCH_BERLIN
 	select DW_APB_ICTL
 	select DW_APB_TIMER_OF
 	select PINCTRL
-	select RESET_CONTROLLER
 
 if ARCH_BERLIN
 
-- 
2.1.0

[PATCH 2/2] ARM: berlin: do not select RESET_CONTROLLER

[Sebastian Hesselbarth]

On 17.11.2014 14:33, Antoine Tenart wrote:
> RESET_CONTROLLER is meant to be user-selectable. To respect that,
> do not select it automatically when using ARCH_BERLIN.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Applied to berlin/soc.

Thanks!

> ---
>   arch/arm/mach-berlin/Kconfig | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
> index 5803f773a065..51582c73a53f 100644
> --- a/arch/arm/mach-berlin/Kconfig
> +++ b/arch/arm/mach-berlin/Kconfig
> @@ -7,7 +7,6 @@ menuconfig ARCH_BERLIN
>   	select DW_APB_ICTL
>   	select DW_APB_TIMER_OF
>   	select PINCTRL
> -	select RESET_CONTROLLER
>
>   if ARCH_BERLIN
>
>

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Sebastian Hesselbarth]

On 17.11.2014 14:33, Antoine Tenart wrote:
> The Berlin USB PHY driver uses the Berlin reset controller
> unconditionally. Make it depending on RESET_CONTROLLER.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

> ---
>   drivers/phy/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index b6da75f563e7..38ca6ff00aef 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -17,7 +17,7 @@ config GENERIC_PHY
>
>   config PHY_BERLIN_USB
>   	tristate "Marvell Berlin USB PHY Driver"
> -	depends on ARCH_BERLIN && HAS_IOMEM && OF
> +	depends on ARCH_BERLIN && RESET_CONTROLLER && HAS_IOMEM && OF
>   	select GENERIC_PHY
>   	help
>   	  Enable this to support the USB PHY on Marvell Berlin SoCs.
>

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Kishon Vijay Abraham I]

Hi,

On Wednesday 19 November 2014 01:09 AM, Sebastian Hesselbarth wrote:
> On 17.11.2014 14:33, Antoine Tenart wrote:
>> The Berlin USB PHY driver uses the Berlin reset controller
>> unconditionally. Make it depending on RESET_CONTROLLER.
>>
>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> 
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> 
>> ---
>>   drivers/phy/Kconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
>> index b6da75f563e7..38ca6ff00aef 100644
>> --- a/drivers/phy/Kconfig
>> +++ b/drivers/phy/Kconfig
>> @@ -17,7 +17,7 @@ config GENERIC_PHY
>>
>>   config PHY_BERLIN_USB

phy-berlin-usb is not in my phy tree and I don't seem to find anywhere in my
inbox. Care to send them to me?

Thanks
Kishon

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Sebastian Hesselbarth]

On 11/19/2014 07:09 AM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Wednesday 19 November 2014 01:09 AM, Sebastian Hesselbarth wrote:
>> On 17.11.2014 14:33, Antoine Tenart wrote:
>>> The Berlin USB PHY driver uses the Berlin reset controller
>>> unconditionally. Make it depending on RESET_CONTROLLER.
>>>
>>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>>
>> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>
>>> ---
>>>    drivers/phy/Kconfig | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
>>> index b6da75f563e7..38ca6ff00aef 100644
>>> --- a/drivers/phy/Kconfig
>>> +++ b/drivers/phy/Kconfig
>>> @@ -17,7 +17,7 @@ config GENERIC_PHY
>>>
>>>    config PHY_BERLIN_USB
>
> phy-berlin-usb is not in my phy tree and I don't seem to find anywhere in my
> inbox. Care to send them to me?

Kishon,

phy-berlin-usb has been part of chipidea generic phy patch set for
a while now. It looks like Antoine simply forgot to put you on Cc
at least for v8 of it.

As all other patches of that patch set have already been taken,
I'll squash this patch into the two remaining ones from Antoine
and send phy-berlin-usb patches in a second.

Sebastian

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Sebastian Hesselbarth]

On 11/19/2014 07:09 AM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Wednesday 19 November 2014 01:09 AM, Sebastian Hesselbarth wrote:
>> On 17.11.2014 14:33, Antoine Tenart wrote:
>>> The Berlin USB PHY driver uses the Berlin reset controller
>>> unconditionally. Make it depending on RESET_CONTROLLER.
>>>
>>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>>
>> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>
>>> ---
>>>    drivers/phy/Kconfig | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
>>> index b6da75f563e7..38ca6ff00aef 100644
>>> --- a/drivers/phy/Kconfig
>>> +++ b/drivers/phy/Kconfig
>>> @@ -17,7 +17,7 @@ config GENERIC_PHY
>>>
>>>    config PHY_BERLIN_USB
>
> phy-berlin-usb is not in my phy tree and I don't seem to find anywhere in my
> inbox. Care to send them to me?

Kishon,

phy-berlin-usb has been part of chipidea generic phy patch set for
a while now. It looks like Antoine simply forgot to put you on Cc
at least for v8 of it.

As all other patches of that patch set have already been taken,
I'll squash this patch into the two remaining ones from Antoine
and send phy-berlin-usb patches in a second.

Sebastian

[PATCH 1/2] phy: berlin_usb: depends on RESET_CONTROLLER

[Sebastian Hesselbarth]

On 11/19/2014 07:09 AM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Wednesday 19 November 2014 01:09 AM, Sebastian Hesselbarth wrote:
>> On 17.11.2014 14:33, Antoine Tenart wrote:
>>> The Berlin USB PHY driver uses the Berlin reset controller
>>> unconditionally. Make it depending on RESET_CONTROLLER.
>>>
>>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>>
>> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>
>>> ---
>>>    drivers/phy/Kconfig | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
>>> index b6da75f563e7..38ca6ff00aef 100644
>>> --- a/drivers/phy/Kconfig
>>> +++ b/drivers/phy/Kconfig
>>> @@ -17,7 +17,7 @@ config GENERIC_PHY
>>>
>>>    config PHY_BERLIN_USB
>
> phy-berlin-usb is not in my phy tree and I don't seem to find anywhere in my
> inbox. Care to send them to me?

Kishon,

phy-berlin-usb is part of a larger patch set moving chipidea usb to
generic phy. As all other patches of that set have already been taken,
I squashed this into one of the two remaining patches from the said
set. I just sent out the now two remaining patches.

Looks like Antoine simply forgot to put you on Cc, at least for v8
of the patches.

Sebastian