[U-Boot] [PATCH 1/2] exynos5250: usb: Fix VBus gpio numbers for ehci and xhci controllers

The gpio_*() apis require the exact gpio line number to deduce the gpio bank and the gpio pin addresses. So fix the gpio number for VBUS used for EHCI ports as well as XHCI ports on exynos5250 boards.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de --- board/samsung/dts/exynos5250-smdk5250.dts | 2 +- board/samsung/dts/exynos5250-snow.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts index c4ed346..9020382 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/board/samsung/dts/exynos5250-smdk5250.dts @@ -146,6 +146,6 @@ };
ehci@12110000 { - samsung,vbus-gpio = <&gpio 0xbe 0>; /* X26 */ + samsung,vbus-gpio = <&gpio 0x316 0>; /* X26 */ }; }; diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts index 091cdb9..9b48a0c 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/board/samsung/dts/exynos5250-snow.dts @@ -110,11 +110,11 @@ };
ehci@12110000 { - samsung,vbus-gpio = <&gpio 0xb1 0>; /* X11 */ + samsung,vbus-gpio = <&gpio 0x309 0>; /* X11 */ };
xhci@12000000 { - samsung,vbus-gpio = <&gpio 0xbf 0>; /* X27 */ + samsung,vbus-gpio = <&gpio 0x317 0>; /* X27 */ };
tmu@10060000 {

On Fri, Jan 3, 2014 at 4:10 PM, Vivek Gautam gautam.vivek@samsung.com wrote:
The gpio_*() apis require the exact gpio line number to deduce the gpio bank and the gpio pin addresses. So fix the gpio number for VBUS used for EHCI ports as well as XHCI ports on exynos5250 boards.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
Based on u-boot-samsung 'master' branch. Tested on smkd5250 and snow board for EHCI and XHCI ports.
board/samsung/dts/exynos5250-smdk5250.dts | 2 +- board/samsung/dts/exynos5250-snow.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts index c4ed346..9020382 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/board/samsung/dts/exynos5250-smdk5250.dts @@ -146,6 +146,6 @@ };
ehci@12110000 {
samsung,vbus-gpio = <&gpio 0xbe 0>; /* X26 */
samsung,vbus-gpio = <&gpio 0x316 0>; /* X26 */ };
}; diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts index 091cdb9..9b48a0c 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/board/samsung/dts/exynos5250-snow.dts @@ -110,11 +110,11 @@ };
ehci@12110000 {
samsung,vbus-gpio = <&gpio 0xb1 0>; /* X11 */
samsung,vbus-gpio = <&gpio 0x309 0>; /* X11 */ }; xhci@12000000 {
samsung,vbus-gpio = <&gpio 0xbf 0>; /* X27 */
samsung,vbus-gpio = <&gpio 0x317 0>; /* X27 */ }; tmu@10060000 {
-- 1.7.10.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

Previously as a part of moving the VBUS gpio support to device tree following patch removed this and added relevant support in driver: 4a271cb exynos: usb: Switch USB VBUS GPIOs to be device tree configured
Recent changes for common board file migration for exynos platform added it again. So removing it now.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de --- board/samsung/smdk5250/smdk5250.c | 19 ------------------- 1 file changed, 19 deletions(-)
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 943c29a..a69f73d 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -26,22 +26,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_USB_EHCI_EXYNOS -static int board_usb_vbus_init(void) -{ - struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) - samsung_get_base_gpio_part1(); - - /* Enable VBUS power switch */ - s5p_gpio_direction_output(&gpio1->x2, 6, 1); - - /* VBUS turn ON time */ - mdelay(3); - - return 0; -} -#endif - #ifdef CONFIG_SOUND_MAX98095 static void board_enable_audio_codec(void) { @@ -56,9 +40,6 @@ static void board_enable_audio_codec(void)
int exynos_init(void) { -#ifdef CONFIG_USB_EHCI_EXYNOS - board_usb_vbus_init(); -#endif #ifdef CONFIG_SOUND_MAX98095 board_enable_audio_codec(); #endif

On Fri, Jan 3, 2014 at 4:10 PM, Vivek Gautam gautam.vivek@samsung.com wrote:
Previously as a part of moving the VBUS gpio support to device tree following patch removed this and added relevant support in driver: 4a271cb exynos: usb: Switch USB VBUS GPIOs to be device tree configured
Recent changes for common board file migration for exynos platform added it again. So removing it now.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
Based on u-boot-samsung 'master' branch.
board/samsung/smdk5250/smdk5250.c | 19 ------------------- 1 file changed, 19 deletions(-)
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 943c29a..a69f73d 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -26,22 +26,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_USB_EHCI_EXYNOS -static int board_usb_vbus_init(void) -{
struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *)
samsung_get_base_gpio_part1();
/* Enable VBUS power switch */
s5p_gpio_direction_output(&gpio1->x2, 6, 1);
/* VBUS turn ON time */
mdelay(3);
return 0;
-} -#endif
#ifdef CONFIG_SOUND_MAX98095 static void board_enable_audio_codec(void) { @@ -56,9 +40,6 @@ static void board_enable_audio_codec(void)
int exynos_init(void) { -#ifdef CONFIG_USB_EHCI_EXYNOS
board_usb_vbus_init();
-#endif #ifdef CONFIG_SOUND_MAX98095 board_enable_audio_codec();
#endif
1.7.10.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

On Friday, January 03, 2014 at 11:40:53 AM, Vivek Gautam wrote:
Previously as a part of moving the VBUS gpio support to device tree following patch removed this and added relevant support in driver: 4a271cb exynos: usb: Switch USB VBUS GPIOs to be device tree configured
Recent changes for common board file migration for exynos platform added it again. So removing it now.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
board/samsung/smdk5250/smdk5250.c | 19 ------------------- 1 file changed, 19 deletions(-)
Reiewed-by: Marek Vasut marex@denx.de
Minkyu, can you please pick this?
Best regards, Marek Vasut

On 04/01/14 16:14, Marek Vasut wrote:
On Friday, January 03, 2014 at 11:40:53 AM, Vivek Gautam wrote:
Previously as a part of moving the VBUS gpio support to device tree following patch removed this and added relevant support in driver: 4a271cb exynos: usb: Switch USB VBUS GPIOs to be device tree configured
Recent changes for common board file migration for exynos platform added it again. So removing it now.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
board/samsung/smdk5250/smdk5250.c | 19 ------------------- 1 file changed, 19 deletions(-)
Reiewed-by: Marek Vasut marex@denx.de
Minkyu, can you please pick this?
OK.
Best regards, Marek Vasut
Thanks, Minkyu Kang.

On 03/01/14 19:40, Vivek Gautam wrote:
Previously as a part of moving the VBUS gpio support to device tree following patch removed this and added relevant support in driver: 4a271cb exynos: usb: Switch USB VBUS GPIOs to be device tree configured
Recent changes for common board file migration for exynos platform added it again. So removing it now.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
board/samsung/smdk5250/smdk5250.c | 19 ------------------- 1 file changed, 19 deletions(-)
applied to u-boot-samsung.
Thanks, Minkyu Kang.

On Friday, January 03, 2014 at 11:40:52 AM, Vivek Gautam wrote:
The gpio_*() apis require the exact gpio line number to deduce the gpio bank and the gpio pin addresses. So fix the gpio number for VBUS used for EHCI ports as well as XHCI ports on exynos5250 boards.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
Reiewed-by: Marek Vasut marex@denx.de
Minkyu, can you please pick this?
Best regards, Marek Vasut

On 04/01/14 16:14, Marek Vasut wrote:
On Friday, January 03, 2014 at 11:40:52 AM, Vivek Gautam wrote:
The gpio_*() apis require the exact gpio line number to deduce the gpio bank and the gpio pin addresses. So fix the gpio number for VBUS used for EHCI ports as well as XHCI ports on exynos5250 boards.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
Reiewed-by: Marek Vasut marex@denx.de
Minkyu, can you please pick this?
OK.
Best regards, Marek Vasut
Thanks, Minkyu Kang.

On 03/01/14 19:40, Vivek Gautam wrote:
The gpio_*() apis require the exact gpio line number to deduce the gpio bank and the gpio pin addresses. So fix the gpio number for VBUS used for EHCI ports as well as XHCI ports on exynos5250 boards.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com Cc: Julius Werner jwerner@chromium.org Cc: Minkyu Kang mk7.kang@samsung.com Cc: Marek Vasut marex@denx.de
board/samsung/dts/exynos5250-smdk5250.dts | 2 +- board/samsung/dts/exynos5250-snow.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
applied to u-boot-samsung.
Thanks, Minkyu Kang.
participants (4)
-
Marek Vasut
-
Minkyu Kang
-
Vivek Gautam
-
Vivek Gautam