diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-17 16:25:08 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-17 16:25:42 +0300 |
| commit | b9b83a86f0e84e837191db120c279a9cc0e3434b (patch) | |
| tree | 1a73208259a9b431084f0e862cf5fa8b2c8c3723 | |
| parent | 064f29e48d09d4e75a5868856361fb18486b24ce (diff) | |
| parent | 075e0b9050e2ec1c6a521c0a1a98be4f7feb797b (diff) | |
| download | u-boot-b9b83a86f0e84e837191db120c279a9cc0e3434b.tar.xz | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
- Fix PHY in some cases on some platforms via enabling DM_ETH_PHY.
| -rw-r--r-- | arch/arm/dts/salvator-common.dtsi | 2 | ||||
| -rw-r--r-- | configs/r8a77970_eagle_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77970_v3msk_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77980_condor_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77980_v3hsk_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77990_ebisu_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a77995_draak_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a779a0_falcon_defconfig | 1 | ||||
| -rw-r--r-- | configs/r8a779g0_whitehawk_defconfig | 1 | ||||
| -rw-r--r-- | configs/rcar3_salvator-x_defconfig | 1 | ||||
| -rw-r--r-- | configs/rcar3_ulcb_defconfig | 1 |
11 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/dts/salvator-common.dtsi b/arch/arm/dts/salvator-common.dtsi index 98bbcafc8c..23fdd1115b 100644 --- a/arch/arm/dts/salvator-common.dtsi +++ b/arch/arm/dts/salvator-common.dtsi @@ -328,6 +328,8 @@ status = "okay"; phy0: ethernet-phy@0 { + compatible = "ethernet-phy-id0022.1622", + "ethernet-phy-ieee802.3-c22"; rxc-skew-ps = <1500>; reg = <0>; interrupt-parent = <&gpio2>; diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 56d62bcfd2..4d40dbf66a 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -71,6 +71,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77970_v3msk_defconfig b/configs/r8a77970_v3msk_defconfig index e26607a897..61e261857e 100644 --- a/configs/r8a77970_v3msk_defconfig +++ b/configs/r8a77970_v3msk_defconfig @@ -76,6 +76,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 57df450a16..b73129f9f7 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -79,6 +79,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_SH_ETHER=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77980_v3hsk_defconfig b/configs/r8a77980_v3hsk_defconfig index 0025c044c0..f48ed6caaa 100644 --- a/configs/r8a77980_v3hsk_defconfig +++ b/configs/r8a77980_v3hsk_defconfig @@ -72,6 +72,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_SH_ETHER=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index 95eb911593..55bc303476 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -93,6 +93,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 4b679716c6..1c1b7256a4 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -90,6 +90,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 5350447c75..93f1055225 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -65,6 +65,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig index 4547154184..1d0805c4e3 100644 --- a/configs/r8a779g0_whitehawk_defconfig +++ b/configs/r8a779g0_whitehawk_defconfig @@ -63,6 +63,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index 8de39c6e6d..6aaf24e012 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -97,6 +97,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_NVME_PCI=y CONFIG_PCI_REGION_MULTI_ENTRY=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index b8fdb5e382..489e710e1e 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -94,6 +94,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y |