mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-03 16:04:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.5004

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAl8Xx0cACgkQoUgPZYCpAfEj9gCfeUDkuW4Fl31J+BRufc7eLpR6
 0qwAoNBYHqWLYrqseiSeXQG/7GFd0N17
 =mYsy
 -----END PGP SIGNATURE-----

Merge AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.5004 on remote branch

Change-Id: I3ac8e2711925531902a56ba82f632ddb6cd8cf8a
Signed-off-by: Linux Build Service Account <lnxbuild@localhost>
This commit is contained in:
Linux Build Service Account 2020-07-22 22:23:12 -06:00
commit f7b7e64d00
7 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/dts/ipq5018-db-mp02.1.dts
View file

@ -58,6 +58,7 @@
};
gmac_cfg {
ext_mdio_gpio = <36 37>;
gephy_led = <46>;
gmac1_cfg {
@ -65,6 +66,12 @@
base = <0x39C00000>;
phy_address = <7>;
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_address = <4>;
8033_gpio = <26>;
};
};
};

7
arch/arm/dts/ipq5018-mp02.1.dts
View file

@ -58,6 +58,7 @@
};
gmac_cfg {
ext_mdio_gpio = <36 37>;
gephy_led = <46>;
gmac1_cfg {
@ -65,5 +66,11 @@
base = <0x39C00000>;
phy_address = <7>;
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_address = <4>;
8033_gpio = <26>;
};
};
};

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

@ -651,6 +651,18 @@ static void reset_napa_phy_gpio(int gpio)
writel(0x2, GPIO_IN_OUT_ADDR(gpio));
}
static void reset_8033_phy_gpio(int gpio)
{
unsigned int *phy_8033_gpio_base;
ppe_uniphy_refclk_set();
phy_8033_gpio_base = (unsigned int *)GPIO_CONFIG_ADDR(gpio);
writel(0x2C1, phy_8033_gpio_base);
writel(0x0, GPIO_IN_OUT_ADDR(gpio));
mdelay(500);
writel(0x2, GPIO_IN_OUT_ADDR(gpio));
}
static void reset_s17c_switch_gpio(int gpio)
{
unsigned int *switch_gpio_base =
@ -1015,6 +1027,11 @@ int board_eth_init(bd_t *bis)
if (gmac_cfg[loop].phy_napa_gpio){
reset_napa_phy_gpio(gmac_cfg[loop].phy_napa_gpio);
}
gmac_cfg[loop].phy_8033_gpio = fdtdec_get_uint(gd->fdt_blob,
offset, "8033_gpio", 0);
if (gmac_cfg[loop].phy_8033_gpio){
reset_8033_phy_gpio(gmac_cfg[loop].phy_8033_gpio);
}
switch_gpio = fdtdec_get_uint(gd->fdt_blob, offset, "switch_gpio", 0);
if (switch_gpio) {
reset_s17c_switch_gpio(switch_gpio);

1
board/qca/arm/ipq5018/ipq5018.h
View file

@ -479,6 +479,7 @@ typedef struct {
int phy_addr;
int phy_interface_mode;
int phy_napa_gpio;
int phy_8033_gpio;
int phy_type;
u32 mac_pwr;
int ipq_swith;

5
configs/ipq5018_tiny_defconfig
View file

@ -295,6 +295,11 @@ CONFIG_REQUIRE_SERIAL_CONSOLE=y
# File systems
#
#
# Ethernet PHY
#
CONFIG_QCA8033_PHY=y
#
# Library routines

4
drivers/net/ipq5018/ipq5018_gmac.c
View file

@ -89,7 +89,7 @@ static void ipq_eth_mac_cfg(struct eth_device *dev)
ipq_mac_framefilter = PROMISCUOUS_MODE_ON;
if (priv->mac_unit) {
if (priv->phy_type == QCA8081_1_1_PHY|| priv->phy_type == QCA8033_PHY)
if (priv->phy_type == QCA8081_1_1_PHY || priv->phy_type == QCA8033_PHY)
speed = priv->speed;
ipq_mac_cfg |= (FRAME_BURST_ENABLE | JUMBO_FRAME_ENABLE | JABBER_DISABLE |
@ -747,6 +747,7 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
&ipq_gmac_macs[i]->ops,
ipq_gmac_macs[i]->phy_address);
break;
#ifdef CONFIG_QCA8033_PHY
/*
* 1G PHY
*/
@ -756,6 +757,7 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
&ipq_gmac_macs[i]->ops,
ipq_gmac_macs[i]->phy_address);
break;
#endif
case S17C:
break;
default:

3
include/configs/ipq5018.h
View file

@ -242,10 +242,9 @@ extern loff_t board_env_size;
#define CONFIG_IPQ_NO_MACS 2
/*
* PHY
* GEPHY
*/
#define CONFIG_GEPHY
#define CONFIG_QCA8033_PHY
/*
* USB Support