mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq5018: Enable usb power gpio output"

Browse source
This commit is contained in:
Linux Build Service Account 2021-01-13 01:41:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit 229598dcf4
5 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/dts/ipq5018-mp03.1.dts
View file

@ -113,6 +113,7 @@
usb0: xhci@8a00000 {
ssphy = <1>;
usb_pwr_gpio = <24>;
usb_gpio {
pwr_gpio {
gpio = <24>;

1
arch/arm/dts/ipq5018-mp03.3.dts
View file

@ -127,6 +127,7 @@
};
usb0: xhci@8a00000 {
usb_pwr_gpio = <24>;
usb_gpio {
pwr_gpio {
gpio = <24>;

1
arch/arm/dts/ipq5018-mp03.5-c1.dts
View file

@ -127,6 +127,7 @@
};
usb0: xhci@8a00000 {
usb_pwr_gpio = <24>;
usb_gpio {
pwr_gpio {
gpio = <24>;

1
arch/arm/dts/ipq5018-mp03.6-c1.dts
View file

@ -127,6 +127,7 @@
};
usb0: xhci@8a00000 {
usb_pwr_gpio = <24>;
usb_gpio {
pwr_gpio {
gpio = <24>;

9
board/qca/arm/ipq5018/ipq5018.c
View file

@ -1343,7 +1343,9 @@ void board_usb_deinit(int id)
gpio_node, "gpio", 0);
unsigned int *gpio_base =
(unsigned int *)GPIO_CONFIG_ADDR(gpio);
int usb_pwr_gpio = fdtdec_get_int(gd->fdt_blob, nodeoff, "usb_pwr_gpio", 0);
writel(0xC1, gpio_base);
gpio_set_value(usb_pwr_gpio, GPIO_OUT_LOW);
}
}
@ -1497,7 +1499,7 @@ static void usb_init_phy(int index, int ssphy)
int ipq_board_usb_init(void)
{
int i, nodeoff, ssphy, gpio_node;
int i, nodeoff, ssphy, gpio_node, usb_pwr_gpio;
char node_name[8];
if(readl(EUD_EUD_EN2)) {
@ -1528,8 +1530,11 @@ int ipq_board_usb_init(void)
/* USB power GPIO for drive 5V */
gpio_node =
fdt_subnode_offset(gd->fdt_blob, nodeoff, "usb_gpio");
if (gpio_node >= 0)
if (gpio_node >= 0) {
qca_gpio_init(gpio_node);
usb_pwr_gpio = fdtdec_get_int(gd->fdt_blob, nodeoff, "usb_pwr_gpio", 0);
gpio_set_value(usb_pwr_gpio, GPIO_OUT_HIGH);
}
}
return 0;