diff mbox

[V2] ARM: S5P: Fix compilation error for exynos4_defconfig

Message ID 1307084654-22052-1-git-send-email-tushar.behera@linaro.org
State Accepted
Headers show

Commit Message

Tushar Behera June 3, 2011, 7:04 a.m. UTC 
Added Kconfig entry for setup-usb-phy.c on which EHCI support is
dependent on.

Following the naming convention of other setup files, we have following
renaming.
	usb-phy.c ==> setup-usb-phy.c

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
 arch/arm/mach-exynos4/Kconfig                      |    6 ++++++
 arch/arm/mach-exynos4/Makefile                     |    2 +-
 .../mach-exynos4/{usb-phy.c => setup-usb-phy.c}    |    0
 3 files changed, 7 insertions(+), 1 deletions(-)
 rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)

diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/setup-usb-phy.c
similarity index 100%
rename from arch/arm/mach-exynos4/usb-phy.c
rename to arch/arm/mach-exynos4/setup-usb-phy.c

Comments

Joonyoung Shim June 3, 2011, 7:50 a.m. UTC | #1 
On 2011-06-03 오후 4:04, Tushar Behera wrote:
> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
> dependent on.
>
> Following the naming convention of other setup files, we have following
> renaming.
> 	usb-phy.c ==>  setup-usb-phy.c
>
> Signed-off-by: Tushar Behera<tushar.behera@linaro.org>
> ---
>   arch/arm/mach-exynos4/Kconfig                      |    6 ++++++
>   arch/arm/mach-exynos4/Makefile                     |    2 +-
>   .../mach-exynos4/{usb-phy.c =>  setup-usb-phy.c}    |    0
>   3 files changed, 7 insertions(+), 1 deletions(-)
>   rename arch/arm/mach-exynos4/{usb-phy.c =>  setup-usb-phy.c} (100%)
>

There is one white space but

Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>

> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index b92c1e5..a45a022 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>   	help
>   	  Common setup code for the camera interfaces.
>
> +config EXYNOS4_SETUP_USB_PHY
> +	bool
> +	help
> +	  Common setup code for USB PHY controller	

White space.

> +
>   # machine support
>
>   menu "EXYNOS4 Machines"
> @@ -176,6 +181,7 @@ config MACH_NURI
>   	select EXYNOS4_SETUP_I2C3
>   	select EXYNOS4_SETUP_I2C5
>   	select EXYNOS4_SETUP_SDHCI
> +	select EXYNOS4_SETUP_USB_PHY
>   	select SAMSUNG_DEV_PWM
>   	help
>   	  Machine support for Samsung Mobile NURI Board.
> diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
> index a9bb94f..60fe5ec 100644
> --- a/arch/arm/mach-exynos4/Makefile
> +++ b/arch/arm/mach-exynos4/Makefile
> @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
>   obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o
>   obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
>
> -obj-$(CONFIG_USB_SUPPORT)		+= usb-phy.o
> +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o
> diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/setup-usb-phy.c
> similarity index 100%
> rename from arch/arm/mach-exynos4/usb-phy.c
> rename to arch/arm/mach-exynos4/setup-usb-phy.c
Tushar Behera June 3, 2011, 8:44 a.m. UTC | #2 
Hi,

On Friday 03 June 2011 01:20 PM, Joonyoung Shim wrote:
> On 2011-06-03 오후 4:04, Tushar Behera wrote:
>> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
>> dependent on.
>>
>> Following the naming convention of other setup files, we have following
>> renaming.
>> usb-phy.c ==> setup-usb-phy.c
>>
>> Signed-off-by: Tushar Behera<tushar.behera@linaro.org>
>> ---
>> arch/arm/mach-exynos4/Kconfig | 6 ++++++
>> arch/arm/mach-exynos4/Makefile | 2 +-
>> .../mach-exynos4/{usb-phy.c => setup-usb-phy.c} | 0
>> 3 files changed, 7 insertions(+), 1 deletions(-)
>> rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)
>>
>
> There is one white space but
>
> Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>
>
>> diff --git a/arch/arm/mach-exynos4/Kconfig
>> b/arch/arm/mach-exynos4/Kconfig
>> index b92c1e5..a45a022 100644
>> --- a/arch/arm/mach-exynos4/Kconfig
>> +++ b/arch/arm/mach-exynos4/Kconfig
>> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>> help
>> Common setup code for the camera interfaces.
>>
>> +config EXYNOS4_SETUP_USB_PHY
>> + bool
>> + help
>> + Common setup code for USB PHY controller
>
> White space.
The space was added so that it is formatted in the same way as other 
Kconfig entries.
>
>> +
>> # machine support
>>
>> menu "EXYNOS4 Machines"
>> @@ -176,6 +181,7 @@ config MACH_NURI
>> select EXYNOS4_SETUP_I2C3
>> select EXYNOS4_SETUP_I2C5
>> select EXYNOS4_SETUP_SDHCI
>> + select EXYNOS4_SETUP_USB_PHY
>> select SAMSUNG_DEV_PWM
>> help
>> Machine support for Samsung Mobile NURI Board.
>> diff --git a/arch/arm/mach-exynos4/Makefile
>> b/arch/arm/mach-exynos4/Makefile
>> index a9bb94f..60fe5ec 100644
>> --- a/arch/arm/mach-exynos4/Makefile
>> +++ b/arch/arm/mach-exynos4/Makefile
>> @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o
>> obj-$(CONFIG_EXYNOS4_SETUP_SDHCI) += setup-sdhci.o
>> obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
>>
>> -obj-$(CONFIG_USB_SUPPORT) += usb-phy.o
>> +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o
>> diff --git a/arch/arm/mach-exynos4/usb-phy.c
>> b/arch/arm/mach-exynos4/setup-usb-phy.c
>> similarity index 100%
>> rename from arch/arm/mach-exynos4/usb-phy.c
>> rename to arch/arm/mach-exynos4/setup-usb-phy.c
Joonyoung Shim June 3, 2011, 8:58 a.m. UTC | #3 
On 2011-06-03 오후 5:44, Tushar Behera wrote:
> Hi,
>
> On Friday 03 June 2011 01:20 PM, Joonyoung Shim wrote:
>> On 2011-06-03 오후 4:04, Tushar Behera wrote:
>>> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
>>> dependent on.
>>>
>>> Following the naming convention of other setup files, we have following
>>> renaming.
>>> usb-phy.c ==> setup-usb-phy.c
>>>
>>> Signed-off-by: Tushar Behera<tushar.behera@linaro.org>
>>> ---
>>> arch/arm/mach-exynos4/Kconfig | 6 ++++++
>>> arch/arm/mach-exynos4/Makefile | 2 +-
>>> .../mach-exynos4/{usb-phy.c => setup-usb-phy.c} | 0
>>> 3 files changed, 7 insertions(+), 1 deletions(-)
>>> rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)
>>>
>>
>> There is one white space but
>>
>> Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>
>>
>>> diff --git a/arch/arm/mach-exynos4/Kconfig
>>> b/arch/arm/mach-exynos4/Kconfig
>>> index b92c1e5..a45a022 100644
>>> --- a/arch/arm/mach-exynos4/Kconfig
>>> +++ b/arch/arm/mach-exynos4/Kconfig
>>> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>>> help
>>> Common setup code for the camera interfaces.
>>>
>>> +config EXYNOS4_SETUP_USB_PHY
>>> + bool
>>> + help
>>> + Common setup code for USB PHY controller
>>
>> White space.
> The space was added so that it is formatted in the same way as other
> Kconfig entries.

So your patch has 1 error by scripts/checkpatch.pl, it can be removed
using scripts/cleanpatch.
Tushar Behera June 3, 2011, 9:24 a.m. UTC | #4 
On Friday 03 June 2011 02:28 PM, Joonyoung Shim wrote:
> On 2011-06-03 오후 5:44, Tushar Behera wrote:
>> Hi,
>>
>> On Friday 03 June 2011 01:20 PM, Joonyoung Shim wrote:
>>> On 2011-06-03 오후 4:04, Tushar Behera wrote:
>>>> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
>>>> dependent on.
>>>>
>>>> Following the naming convention of other setup files, we have following
>>>> renaming.
>>>> usb-phy.c ==> setup-usb-phy.c
>>>>
>>>> Signed-off-by: Tushar Behera<tushar.behera@linaro.org>
>>>> ---
>>>> arch/arm/mach-exynos4/Kconfig | 6 ++++++
>>>> arch/arm/mach-exynos4/Makefile | 2 +-
>>>> .../mach-exynos4/{usb-phy.c => setup-usb-phy.c} | 0
>>>> 3 files changed, 7 insertions(+), 1 deletions(-)
>>>> rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)
>>>>
>>>
>>> There is one white space but
>>>
>>> Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>
>>>
>>>> diff --git a/arch/arm/mach-exynos4/Kconfig
>>>> b/arch/arm/mach-exynos4/Kconfig
>>>> index b92c1e5..a45a022 100644
>>>> --- a/arch/arm/mach-exynos4/Kconfig
>>>> +++ b/arch/arm/mach-exynos4/Kconfig
>>>> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>>>> help
>>>> Common setup code for the camera interfaces.
>>>>
>>>> +config EXYNOS4_SETUP_USB_PHY
>>>> + bool
>>>> + help
>>>> + Common setup code for USB PHY controller
>>>
>>> White space.
>> The space was added so that it is formatted in the same way as other
>> Kconfig entries.
>
> So your patch has 1 error by scripts/checkpatch.pl, it can be removed
> using scripts/cleanpatch.
:-( .. I had overseen that error .. thanks for pointing out ...

Kukjin,
If required, I will resubmit again.
thomas.abraham@linaro.org June 3, 2011, 11:51 a.m. UTC | #5 
On 3 June 2011 12:34, Tushar Behera <tushar.behera@linaro.org> wrote:
> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
> dependent on.
>
> Following the naming convention of other setup files, we have following
> renaming.
>        usb-phy.c ==> setup-usb-phy.c
>
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> ---
>  arch/arm/mach-exynos4/Kconfig                      |    6 ++++++
>  arch/arm/mach-exynos4/Makefile                     |    2 +-
>  .../mach-exynos4/{usb-phy.c => setup-usb-phy.c}    |    0
>  3 files changed, 7 insertions(+), 1 deletions(-)
>  rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)
>
> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index b92c1e5..a45a022 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>        help
>          Common setup code for the camera interfaces.
>
> +config EXYNOS4_SETUP_USB_PHY
> +       bool
> +       help
> +         Common setup code for USB PHY controller
> +
>  # machine support
>
>  menu "EXYNOS4 Machines"
> @@ -176,6 +181,7 @@ config MACH_NURI
>        select EXYNOS4_SETUP_I2C3
>        select EXYNOS4_SETUP_I2C5
>        select EXYNOS4_SETUP_SDHCI
> +       select EXYNOS4_SETUP_USB_PHY
>        select SAMSUNG_DEV_PWM
>        help
>          Machine support for Samsung Mobile NURI Board.
> diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
> index a9bb94f..60fe5ec 100644
> --- a/arch/arm/mach-exynos4/Makefile
> +++ b/arch/arm/mach-exynos4/Makefile
> @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)    += setup-keypad.o
>  obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)      += setup-sdhci.o
>  obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
>
> -obj-$(CONFIG_USB_SUPPORT)              += usb-phy.o
> +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)    += setup-usb-phy.o

Since plat-s5p/dev-ehci.c is the only consumer of setup-usb-phy.c,
could setup-usb-phy.o be made dependent on the S5P_DEV_USB_EHCI config
option? Any particular reason to create a new EXYNOS4_SETUP_USB_PHY
config option in this case? Will there be a case where usb phy
configuration code would be used irrespective of dev-ehci being used?

Thanks,
Thomas.

> diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/setup-usb-phy.c
> similarity index 100%
> rename from arch/arm/mach-exynos4/usb-phy.c
> rename to arch/arm/mach-exynos4/setup-usb-phy.c
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Marek Szyprowski June 3, 2011, 1:25 p.m. UTC | #6 
Hello,

On Friday, June 03, 2011 1:52 PM Thomas Abraham wrote:

> On 3 June 2011 12:34, Tushar Behera <tushar.behera@linaro.org> wrote:
> > Added Kconfig entry for setup-usb-phy.c on which EHCI support is
> > dependent on.
> >
> > Following the naming convention of other setup files, we have following
> > renaming.
> >        usb-phy.c ==> setup-usb-phy.c
> >
> > Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> > ---
> >  arch/arm/mach-exynos4/Kconfig                      |    6 ++++++
> >  arch/arm/mach-exynos4/Makefile                     |    2 +-
> >  .../mach-exynos4/{usb-phy.c => setup-usb-phy.c}    |    0
> >  3 files changed, 7 insertions(+), 1 deletions(-)
> >  rename arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%)
> >
> > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-
> exynos4/Kconfig
> > index b92c1e5..a45a022 100644
> > --- a/arch/arm/mach-exynos4/Kconfig
> > +++ b/arch/arm/mach-exynos4/Kconfig
> > @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
> >        help
> >          Common setup code for the camera interfaces.
> >
> > +config EXYNOS4_SETUP_USB_PHY
> > +       bool
> > +       help
> > +         Common setup code for USB PHY controller
> > +
> >  # machine support
> >
> >  menu "EXYNOS4 Machines"
> > @@ -176,6 +181,7 @@ config MACH_NURI
> >        select EXYNOS4_SETUP_I2C3
> >        select EXYNOS4_SETUP_I2C5
> >        select EXYNOS4_SETUP_SDHCI
> > +       select EXYNOS4_SETUP_USB_PHY
> >        select SAMSUNG_DEV_PWM
> >        help
> >          Machine support for Samsung Mobile NURI Board.
> > diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-
> exynos4/Makefile
> > index a9bb94f..60fe5ec 100644
> > --- a/arch/arm/mach-exynos4/Makefile
> > +++ b/arch/arm/mach-exynos4/Makefile
> > @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)    += setup-keypad.o
> >  obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)      += setup-sdhci.o
> >  obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
> >
> > -obj-$(CONFIG_USB_SUPPORT)              += usb-phy.o
> > +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)    += setup-usb-phy.o
> 
> Since plat-s5p/dev-ehci.c is the only consumer of setup-usb-phy.c,
> could setup-usb-phy.o be made dependent on the S5P_DEV_USB_EHCI config
> option? Any particular reason to create a new EXYNOS4_SETUP_USB_PHY
> config option in this case? Will there be a case where usb phy
> configuration code would be used irrespective of dev-ehci being used?

I suggested this solution to keep the consistence in the style. The other reason
is the fact that USB PHY control functions should be also added to usb hs otg 
driver so these function will be used by 2 different devices.

Best regards
Kukjin Kim June 3, 2011, 10:32 p.m. UTC | #7 
On 06/03/11 00:04, Tushar Behera wrote:
> Added Kconfig entry for setup-usb-phy.c on which EHCI support is
> dependent on.
>
> Following the naming convention of other setup files, we have following
> renaming.
> 	usb-phy.c ==>  setup-usb-phy.c
>
> Signed-off-by: Tushar Behera<tushar.behera@linaro.org>
> ---
>   arch/arm/mach-exynos4/Kconfig                      |    6 ++++++
>   arch/arm/mach-exynos4/Makefile                     |    2 +-
>   .../mach-exynos4/{usb-phy.c =>  setup-usb-phy.c}    |    0
>   3 files changed, 7 insertions(+), 1 deletions(-)
>   rename arch/arm/mach-exynos4/{usb-phy.c =>  setup-usb-phy.c} (100%)
>
> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index b92c1e5..a45a022 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
>   	help
>   	  Common setup code for the camera interfaces.
>
> +config EXYNOS4_SETUP_USB_PHY
> +	bool
> +	help
> +	  Common setup code for USB PHY controller	
> +
>   # machine support
>
>   menu "EXYNOS4 Machines"
> @@ -176,6 +181,7 @@ config MACH_NURI
>   	select EXYNOS4_SETUP_I2C3
>   	select EXYNOS4_SETUP_I2C5
>   	select EXYNOS4_SETUP_SDHCI
> +	select EXYNOS4_SETUP_USB_PHY
>   	select SAMSUNG_DEV_PWM
>   	help
>   	  Machine support for Samsung Mobile NURI Board.
> diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
> index a9bb94f..60fe5ec 100644
> --- a/arch/arm/mach-exynos4/Makefile
> +++ b/arch/arm/mach-exynos4/Makefile
> @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
>   obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o
>   obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
>
> -obj-$(CONFIG_USB_SUPPORT)		+= usb-phy.o
> +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o
> diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/setup-usb-phy.c
> similarity index 100%
> rename from arch/arm/mach-exynos4/usb-phy.c
> rename to arch/arm/mach-exynos4/setup-usb-phy.c

I think, basically, the setup-usbphy.c would be in plat-s5p/ because
s5p_usb_phy_{init,exit} is called from plat-s5p/dev-echi.c and need to
separate exynos(mach-) and common s5p(plat-) stuff so that can be used
from other s5p usb to control usb phy.

Since it is not used for others so will apply this to fix build error.

However, we need to sort this out later.

Tushar, you don't need to re-submit this for removing white space :)
But as you know, please make sure that your patch has no problem with
checkpatch.pl before submitting.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
diff mbox

Patch

diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index b92c1e5..a45a022 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -91,6 +91,11 @@  config EXYNOS4_SETUP_FIMC
 	help
 	  Common setup code for the camera interfaces.
 
+config EXYNOS4_SETUP_USB_PHY
+	bool
+	help
+	  Common setup code for USB PHY controller	
+
 # machine support
 
 menu "EXYNOS4 Machines"
@@ -176,6 +181,7 @@  config MACH_NURI
 	select EXYNOS4_SETUP_I2C3
 	select EXYNOS4_SETUP_I2C5
 	select EXYNOS4_SETUP_SDHCI
+	select EXYNOS4_SETUP_USB_PHY
 	select SAMSUNG_DEV_PWM
 	help
 	  Machine support for Samsung Mobile NURI Board.
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index a9bb94f..60fe5ec 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -56,4 +56,4 @@  obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
 
-obj-$(CONFIG_USB_SUPPORT)		+= usb-phy.o
+obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o