* [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code
@ 2012-05-16 10:25 Lukasz Majewski
2012-05-16 10:25 ` [PATCH 2/2] ARM: EXYNOS: Remove superfluous udelay Lukasz Majewski
2012-05-17 6:47 ` [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Kukjin Kim
0 siblings, 2 replies; 3+ messages in thread
From: Lukasz Majewski @ 2012-05-16 10:25 UTC (permalink / raw)
To: linux-arm-kernel
This rename is intended to show that this code is tuned for Exynos4210
USB controller. Name such a Exynos4 could be misleading and confuse
Exynos4210 with Exynos4x12 SoCs.
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-exynos/setup-usb-phy.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
index 6cf5d6a..403923b 100644
--- a/arch/arm/mach-exynos/setup-usb-phy.c
+++ b/arch/arm/mach-exynos/setup-usb-phy.c
@@ -26,7 +26,7 @@ static int exynos4_usb_host_phy_is_on(void)
return (readl(EXYNOS4_PHYPWR) & PHY1_STD_ANALOG_POWERDOWN) ? 0 : 1;
}
-static void exynos4_usb_phy_clkset(struct platform_device *pdev)
+static void exynos4210_usb_phy_clkset(struct platform_device *pdev)
{
struct clk *xusbxti_clk;
u32 phyclk;
@@ -54,14 +54,14 @@ static void exynos4_usb_phy_clkset(struct platform_device *pdev)
writel(phyclk, EXYNOS4_PHYCLK);
}
-static int exynos4_usb_phy0_init(struct platform_device *pdev)
+static int exynos4210_usb_phy0_init(struct platform_device *pdev)
{
u32 rstcon;
writel(readl(S5P_USBDEVICE_PHY_CONTROL) | S5P_USBDEVICE_PHY_ENABLE,
S5P_USBDEVICE_PHY_CONTROL);
- exynos4_usb_phy_clkset(pdev);
+ exynos4210_usb_phy_clkset(pdev);
/* set to normal PHY0 */
writel((readl(EXYNOS4_PHYPWR) & ~PHY0_NORMAL_MASK), EXYNOS4_PHYPWR);
@@ -78,7 +78,7 @@ static int exynos4_usb_phy0_init(struct platform_device *pdev)
return 0;
}
-static int exynos4_usb_phy0_exit(struct platform_device *pdev)
+static int exynos4210_usb_phy0_exit(struct platform_device *pdev)
{
writel((readl(EXYNOS4_PHYPWR) | PHY0_ANALOG_POWERDOWN |
PHY0_OTG_DISABLE), EXYNOS4_PHYPWR);
@@ -89,7 +89,7 @@ static int exynos4_usb_phy0_exit(struct platform_device *pdev)
return 0;
}
-static int exynos4_usb_phy1_init(struct platform_device *pdev)
+static int exynos4210_usb_phy1_init(struct platform_device *pdev)
{
struct clk *otg_clk;
u32 rstcon;
@@ -115,7 +115,7 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)
writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
S5P_USBHOST_PHY_CONTROL);
- exynos4_usb_phy_clkset(pdev);
+ exynos4210_usb_phy_clkset(pdev);
/* floating prevention logic: disable */
writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
@@ -143,7 +143,7 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)
return 0;
}
-static int exynos4_usb_phy1_exit(struct platform_device *pdev)
+static int exynos4210_usb_phy1_exit(struct platform_device *pdev)
{
struct clk *otg_clk;
int err;
@@ -178,9 +178,9 @@ static int exynos4_usb_phy1_exit(struct platform_device *pdev)
int s5p_usb_phy_init(struct platform_device *pdev, int type)
{
if (type == S5P_USB_PHY_DEVICE)
- return exynos4_usb_phy0_init(pdev);
+ return exynos4210_usb_phy0_init(pdev);
else if (type == S5P_USB_PHY_HOST)
- return exynos4_usb_phy1_init(pdev);
+ return exynos4210_usb_phy1_init(pdev);
return -EINVAL;
}
@@ -188,9 +188,9 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)
int s5p_usb_phy_exit(struct platform_device *pdev, int type)
{
if (type == S5P_USB_PHY_DEVICE)
- return exynos4_usb_phy0_exit(pdev);
+ return exynos4210_usb_phy0_exit(pdev);
else if (type == S5P_USB_PHY_HOST)
- return exynos4_usb_phy1_exit(pdev);
+ return exynos4210_usb_phy1_exit(pdev);
return -EINVAL;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: EXYNOS: Remove superfluous udelay
2012-05-16 10:25 [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Lukasz Majewski
@ 2012-05-16 10:25 ` Lukasz Majewski
2012-05-17 6:47 ` [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Kukjin Kim
1 sibling, 0 replies; 3+ messages in thread
From: Lukasz Majewski @ 2012-05-16 10:25 UTC (permalink / raw)
To: linux-arm-kernel
This udelay is not needed in the USB device PHY control code.
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-exynos/setup-usb-phy.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
index 403923b..1af0a7f 100644
--- a/arch/arm/mach-exynos/setup-usb-phy.c
+++ b/arch/arm/mach-exynos/setup-usb-phy.c
@@ -73,7 +73,6 @@ static int exynos4210_usb_phy0_init(struct platform_device *pdev)
rstcon &= ~PHY0_SWRST_MASK;
writel(rstcon, EXYNOS4_RSTCON);
- udelay(80);
return 0;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code
2012-05-16 10:25 [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Lukasz Majewski
2012-05-16 10:25 ` [PATCH 2/2] ARM: EXYNOS: Remove superfluous udelay Lukasz Majewski
@ 2012-05-17 6:47 ` Kukjin Kim
1 sibling, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2012-05-17 6:47 UTC (permalink / raw)
To: linux-arm-kernel
Lukasz Majewski wrote:
>
> This rename is intended to show that this code is tuned for Exynos4210
> USB controller. Name such a Exynos4 could be misleading and confuse
> Exynos4210 with Exynos4x12 SoCs.
>
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> arch/arm/mach-exynos/setup-usb-phy.c | 22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-
> exynos/setup-usb-phy.c
> index 6cf5d6a..403923b 100644
> --- a/arch/arm/mach-exynos/setup-usb-phy.c
> +++ b/arch/arm/mach-exynos/setup-usb-phy.c
> @@ -26,7 +26,7 @@ static int exynos4_usb_host_phy_is_on(void)
> return (readl(EXYNOS4_PHYPWR) & PHY1_STD_ANALOG_POWERDOWN) ? 0 : 1;
> }
>
> -static void exynos4_usb_phy_clkset(struct platform_device *pdev)
> +static void exynos4210_usb_phy_clkset(struct platform_device *pdev)
> {
> struct clk *xusbxti_clk;
> u32 phyclk;
> @@ -54,14 +54,14 @@ static void exynos4_usb_phy_clkset(struct
> platform_device *pdev)
> writel(phyclk, EXYNOS4_PHYCLK);
> }
>
> -static int exynos4_usb_phy0_init(struct platform_device *pdev)
> +static int exynos4210_usb_phy0_init(struct platform_device *pdev)
> {
> u32 rstcon;
>
> writel(readl(S5P_USBDEVICE_PHY_CONTROL) | S5P_USBDEVICE_PHY_ENABLE,
> S5P_USBDEVICE_PHY_CONTROL);
>
> - exynos4_usb_phy_clkset(pdev);
> + exynos4210_usb_phy_clkset(pdev);
>
> /* set to normal PHY0 */
> writel((readl(EXYNOS4_PHYPWR) & ~PHY0_NORMAL_MASK), EXYNOS4_PHYPWR);
> @@ -78,7 +78,7 @@ static int exynos4_usb_phy0_init(struct platform_device
> *pdev)
> return 0;
> }
>
> -static int exynos4_usb_phy0_exit(struct platform_device *pdev)
> +static int exynos4210_usb_phy0_exit(struct platform_device *pdev)
> {
> writel((readl(EXYNOS4_PHYPWR) | PHY0_ANALOG_POWERDOWN |
> PHY0_OTG_DISABLE), EXYNOS4_PHYPWR);
> @@ -89,7 +89,7 @@ static int exynos4_usb_phy0_exit(struct platform_device
> *pdev)
> return 0;
> }
>
> -static int exynos4_usb_phy1_init(struct platform_device *pdev)
> +static int exynos4210_usb_phy1_init(struct platform_device *pdev)
> {
> struct clk *otg_clk;
> u32 rstcon;
> @@ -115,7 +115,7 @@ static int exynos4_usb_phy1_init(struct
> platform_device *pdev)
> writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
> S5P_USBHOST_PHY_CONTROL);
>
> - exynos4_usb_phy_clkset(pdev);
> + exynos4210_usb_phy_clkset(pdev);
>
> /* floating prevention logic: disable */
> writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
> @@ -143,7 +143,7 @@ static int exynos4_usb_phy1_init(struct
> platform_device *pdev)
> return 0;
> }
>
> -static int exynos4_usb_phy1_exit(struct platform_device *pdev)
> +static int exynos4210_usb_phy1_exit(struct platform_device *pdev)
> {
> struct clk *otg_clk;
> int err;
> @@ -178,9 +178,9 @@ static int exynos4_usb_phy1_exit(struct
> platform_device *pdev)
> int s5p_usb_phy_init(struct platform_device *pdev, int type)
> {
> if (type == S5P_USB_PHY_DEVICE)
> - return exynos4_usb_phy0_init(pdev);
> + return exynos4210_usb_phy0_init(pdev);
> else if (type == S5P_USB_PHY_HOST)
> - return exynos4_usb_phy1_init(pdev);
> + return exynos4210_usb_phy1_init(pdev);
>
> return -EINVAL;
> }
> @@ -188,9 +188,9 @@ int s5p_usb_phy_init(struct platform_device *pdev, int
> type)
> int s5p_usb_phy_exit(struct platform_device *pdev, int type)
> {
> if (type == S5P_USB_PHY_DEVICE)
> - return exynos4_usb_phy0_exit(pdev);
> + return exynos4210_usb_phy0_exit(pdev);
> else if (type == S5P_USB_PHY_HOST)
> - return exynos4_usb_phy1_exit(pdev);
> + return exynos4210_usb_phy1_exit(pdev);
>
> return -EINVAL;
> }
> --
> 1.7.2.3
Looks good to me and I squashed your 2 patches into original one.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-17 6:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-16 10:25 [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Lukasz Majewski
2012-05-16 10:25 ` [PATCH 2/2] ARM: EXYNOS: Remove superfluous udelay Lukasz Majewski
2012-05-17 6:47 ` [PATCH 1/2] ARM: EXYNOS: cosmetic: Rename exynos4 to exynos4210 in USB phy code Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).