| Message ID | 20210812091132.147160-1-pbrobinson@gmail.com |
|---|---|
| State | Accepted |
| Commit | 63e13530fc6fb0169ee70abf5cfd5c272238609d |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk33xx: Drop ROCKCHIP_USB2_PHY on boards without it | expand |
Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever Peter Robinson <pbrobinson@gmail.com> 于2021年8月12日周四 下午5:11写道： > > The 64 bit rk33xx chips don't have the ROCKCHIP_USB2_PHY IP so > drop the configs as they were likely copied over from other > boards during enablement. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > --- > configs/lion-rk3368_defconfig | 1 - > configs/nanopc-t4-rk3399_defconfig | 1 - > configs/roc-pc-mezzanine-rk3399_defconfig | 1 - > configs/roc-pc-rk3399_defconfig | 1 - > configs/rock-pi-n10-rk3399pro_defconfig | 1 - > 5 files changed, 5 deletions(-) > > diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig > index 5f7d101814..90a2878e50 100644 > --- a/configs/lion-rk3368_defconfig > +++ b/configs/lion-rk3368_defconfig > @@ -94,7 +94,6 @@ CONFIG_USB=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_DWC2=y > -CONFIG_ROCKCHIP_USB2_PHY=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_SPL_TINY_MEMSET=y > diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig > index a94f428def..62833c386b 100644 > --- a/configs/nanopc-t4-rk3399_defconfig > +++ b/configs/nanopc-t4-rk3399_defconfig > @@ -51,7 +51,6 @@ CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_DWC3=y > -CONFIG_ROCKCHIP_USB2_PHY=y > CONFIG_USB_KEYBOARD=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig > index 8d0f57021b..6aa47490c1 100644 > --- a/configs/roc-pc-mezzanine-rk3399_defconfig > +++ b/configs/roc-pc-mezzanine-rk3399_defconfig > @@ -69,7 +69,6 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_ROCKCHIP_USB2_PHY=y > CONFIG_USB_KEYBOARD=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig > index 4e5c90439d..b03ee3664f 100644 > --- a/configs/roc-pc-rk3399_defconfig > +++ b/configs/roc-pc-rk3399_defconfig > @@ -66,7 +66,6 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_ROCKCHIP_USB2_PHY=y > CONFIG_USB_KEYBOARD=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig > index e5df6779de..17442a0d84 100644 > --- a/configs/rock-pi-n10-rk3399pro_defconfig > +++ b/configs/rock-pi-n10-rk3399pro_defconfig > @@ -60,7 +60,6 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_ROCKCHIP_USB2_PHY=y > CONFIG_USB_KEYBOARD=y > # CONFIG_USB_KEYBOARD_FN_KEYS is not set > CONFIG_USB_GADGET=y > -- > 2.31.1 >
diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 5f7d101814..90a2878e50 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -94,7 +94,6 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig index a94f428def..62833c386b 100644 --- a/configs/nanopc-t4-rk3399_defconfig +++ b/configs/nanopc-t4-rk3399_defconfig @@ -51,7 +51,6 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC3=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index 8d0f57021b..6aa47490c1 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -69,7 +69,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 4e5c90439d..b03ee3664f 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -66,7 +66,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig index e5df6779de..17442a0d84 100644 --- a/configs/rock-pi-n10-rk3399pro_defconfig +++ b/configs/rock-pi-n10-rk3399pro_defconfig @@ -60,7 +60,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y # CONFIG_USB_KEYBOARD_FN_KEYS is not set CONFIG_USB_GADGET=y
The 64 bit rk33xx chips don't have the ROCKCHIP_USB2_PHY IP so drop the configs as they were likely copied over from other boards during enablement. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- configs/lion-rk3368_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/roc-pc-mezzanine-rk3399_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 1 - configs/rock-pi-n10-rk3399pro_defconfig | 1 - 5 files changed, 5 deletions(-)