mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +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>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From: Roman Yeryomin <roman@advem.lv>
|
|
Subject: kernel: add at803x fix for sgmii mode
|
|
|
|
Some (possibly broken) bootloaders incorreclty initialize at8033
|
|
phy. This patch enables sgmii autonegotiation mode.
|
|
|
|
[john@phrozen.org: felix added this to his upstream queue]
|
|
|
|
Signed-off-by: Roman Yeryomin <roman@advem.lv>
|
|
---
|
|
drivers/net/phy/at803x.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
--- a/drivers/net/phy/at803x.c
|
|
+++ b/drivers/net/phy/at803x.c
|
|
@@ -46,6 +46,7 @@
|
|
#define AT803X_FUNC_DATA 0x4003
|
|
#define AT803X_REG_CHIP_CONFIG 0x1f
|
|
#define AT803X_BT_BX_REG_SEL 0x8000
|
|
+#define AT803X_SGMII_ANEG_EN 0x1000
|
|
|
|
#define AT803X_PCS_SMART_EEE_CTRL3 0x805D
|
|
#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3
|
|
@@ -268,6 +269,27 @@ static int at803x_config_init(struct phy
|
|
{
|
|
struct at803x_platform_data *pdata;
|
|
int ret;
|
|
+ u32 v;
|
|
+
|
|
+ if (phydev->drv->phy_id == ATH8031_PHY_ID &&
|
|
+ phydev->interface == PHY_INTERFACE_MODE_SGMII)
|
|
+ {
|
|
+ v = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
|
|
+ /* select SGMII/fiber page */
|
|
+ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
|
|
+ v & ~AT803X_BT_BX_REG_SEL);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ /* enable SGMII autonegotiation */
|
|
+ ret = phy_write(phydev, MII_BMCR, AT803X_SGMII_ANEG_EN);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ /* select copper page */
|
|
+ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
|
|
+ v | AT803X_BT_BX_REG_SEL);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ }
|
|
|
|
ret = genphy_config_init(phydev);
|
|
if (ret < 0)
|