Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A few small miscellaneous patches #65

Merged
merged 3 commits into from
Jul 6, 2023
Merged

A few small miscellaneous patches #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
969e6b9
arm64: dts: nanopir6: use proper mmc aliases
Joshua-Riek Jul 1, 2023
1d4de75
drm/rockchip: dw-dp: suppress "timeout waiting for AUX reply" spam
Joshua-Riek Jul 1, 2023
0faf730
ethernet: dwmac4: fix VLAN in promisc mode not supported
Joshua-Riek Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

/ {
aliases {
mmc0 = &sdmmc;
mmc1 = &sdio;
mmc2 = &sdhci;
mmc0 = &sdhci;
mmc1 = &sdmmc;
mmc2 = &sdio;
};

chosen: chosen {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/rockchip/dw-dp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2686,7 +2686,7 @@ static ssize_t dw_dp_aux_transfer(struct drm_dp_aux *aux,

status = wait_for_completion_timeout(&dp->complete, timeout);
if (!status) {
dev_err(dp->dev, "timeout waiting for AUX reply\n");
//dev_err(dp->dev, "timeout waiting for AUX reply\n");
return -ETIMEDOUT;
}

Expand Down
12 changes: 0 additions & 12 deletions drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,6 @@ static int dwmac4_add_hw_vlan_rx_fltr(struct net_device *dev,
if (vid > 4095)
return -EINVAL;

if (hw->promisc) {
netdev_err(dev,
"Adding VLAN in promisc mode not supported\n");
return -EPERM;
}

/* Single Rx VLAN Filter */
if (hw->num_vlan == 1) {
/* For single VLAN filter, VID 0 means VLAN promiscuous */
Expand Down Expand Up @@ -508,12 +502,6 @@ static int dwmac4_del_hw_vlan_rx_fltr(struct net_device *dev,
{
int i, ret = 0;

if (hw->promisc) {
netdev_err(dev,
"Deleting VLAN in promisc mode not supported\n");
return -EPERM;
}

/* Single Rx VLAN Filter */
if (hw->num_vlan == 1) {
if ((hw->vlan_filter[0] & GMAC_VLAN_TAG_VID) == vid) {
Expand Down
Loading