mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: net: phy: at803x: add support for AT8032
|
|
|
|
Like AT8030, this PHY needs the GPIO reset workaround
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/phy/at803x.c
|
|
+++ b/drivers/net/phy/at803x.c
|
|
@@ -62,8 +62,10 @@
|
|
|
|
#define ATH8030_PHY_ID 0x004dd076
|
|
#define ATH8031_PHY_ID 0x004dd074
|
|
+#define ATH8032_PHY_ID 0x004dd023
|
|
#define ATH8035_PHY_ID 0x004dd072
|
|
#define AT803X_PHY_ID_MASK 0xffffffef
|
|
+#define AT8032_PHY_ID_MASK 0xffffffff
|
|
|
|
MODULE_DESCRIPTION("Atheros 803x PHY driver");
|
|
MODULE_AUTHOR("Matus Ujhelyi");
|
|
@@ -308,7 +310,7 @@ static void at803x_link_change_notify(st
|
|
struct at803x_priv *priv = phydev->priv;
|
|
|
|
/*
|
|
- * Conduct a hardware reset for AT8030 every time a link loss is
|
|
+ * Conduct a hardware reset for AT8030/2 every time a link loss is
|
|
* signalled. This is necessary to circumvent a hardware bug that
|
|
* occurs when the cable is unplugged while TX packets are pending
|
|
* in the FIFO. In such cases, the FIFO enters an error mode it
|
|
@@ -414,6 +416,24 @@ static struct phy_driver at803x_driver[]
|
|
.aneg_done = at803x_aneg_done,
|
|
.ack_interrupt = &at803x_ack_interrupt,
|
|
.config_intr = &at803x_config_intr,
|
|
+}, {
|
|
+ /* ATHEROS 8032 */
|
|
+ .phy_id = ATH8032_PHY_ID,
|
|
+ .name = "Atheros 8032 ethernet",
|
|
+ .phy_id_mask = AT8032_PHY_ID_MASK,
|
|
+ .probe = at803x_probe,
|
|
+ .config_init = at803x_config_init,
|
|
+ .link_change_notify = at803x_link_change_notify,
|
|
+ .set_wol = at803x_set_wol,
|
|
+ .get_wol = at803x_get_wol,
|
|
+ .suspend = at803x_suspend,
|
|
+ .resume = at803x_resume,
|
|
+ .features = PHY_BASIC_FEATURES,
|
|
+ .flags = PHY_HAS_INTERRUPT,
|
|
+ .config_aneg = genphy_config_aneg,
|
|
+ .read_status = genphy_read_status,
|
|
+ .ack_interrupt = at803x_ack_interrupt,
|
|
+ .config_intr = at803x_config_intr,
|
|
} };
|
|
|
|
module_phy_driver(at803x_driver);
|
|
@@ -421,6 +441,7 @@ module_phy_driver(at803x_driver);
|
|
static struct mdio_device_id __maybe_unused atheros_tbl[] = {
|
|
{ ATH8030_PHY_ID, AT803X_PHY_ID_MASK },
|
|
{ ATH8031_PHY_ID, AT803X_PHY_ID_MASK },
|
|
+ { ATH8032_PHY_ID, AT8032_PHY_ID_MASK },
|
|
{ ATH8035_PHY_ID, AT803X_PHY_ID_MASK },
|
|
{ }
|
|
};
|