mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 05:54:26 -04:00 
			
		
		
		
	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>
		
			
				
	
	
		
			143 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From: Gabor Juhos <juhosg@openwrt.org>
 | |
| Subject: net: phy: allow to configure AR803x PHYs via platform data
 | |
| 
 | |
| Add a patch for the at803x phy driver, in order to be able
 | |
| to configure some register settings via platform data.
 | |
| 
 | |
| Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 | |
| ---
 | |
|  drivers/net/phy/at803x.c                 | 56 ++++++++++++++++++++++++++++++++
 | |
|  include/linux/platform_data/phy-at803x.h | 11 +++++++
 | |
|  2 files changed, 67 insertions(+)
 | |
|  create mode 100644 include/linux/platform_data/phy-at803x.h
 | |
| 
 | |
| --- a/drivers/net/phy/at803x.c
 | |
| +++ b/drivers/net/phy/at803x.c
 | |
| @@ -12,12 +12,14 @@
 | |
|   */
 | |
|  
 | |
|  #include <linux/phy.h>
 | |
| +#include <linux/mdio.h>
 | |
|  #include <linux/module.h>
 | |
|  #include <linux/string.h>
 | |
|  #include <linux/netdevice.h>
 | |
|  #include <linux/etherdevice.h>
 | |
|  #include <linux/of_gpio.h>
 | |
|  #include <linux/gpio/consumer.h>
 | |
| +#include <linux/platform_data/phy-at803x.h>
 | |
|  
 | |
|  #define AT803X_INTR_ENABLE			0x12
 | |
|  #define AT803X_INTR_ENABLE_AUTONEG_ERR		BIT(15)
 | |
| @@ -45,6 +47,11 @@
 | |
|  #define AT803X_REG_CHIP_CONFIG			0x1f
 | |
|  #define AT803X_BT_BX_REG_SEL			0x8000
 | |
|  
 | |
| +#define AT803X_PCS_SMART_EEE_CTRL3			0x805D
 | |
| +#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK	0x3
 | |
| +#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT	12
 | |
| +#define AT803X_SMART_EEE_CTRL3_LPI_EN			BIT(8)
 | |
| +
 | |
|  #define AT803X_DEBUG_ADDR			0x1D
 | |
|  #define AT803X_DEBUG_DATA			0x1E
 | |
|  
 | |
| @@ -73,6 +80,7 @@ MODULE_LICENSE("GPL");
 | |
|  
 | |
|  struct at803x_priv {
 | |
|  	bool phy_reset:1;
 | |
| +	int prev_speed;
 | |
|  };
 | |
|  
 | |
|  struct at803x_context {
 | |
| @@ -249,8 +257,16 @@ static int at803x_probe(struct phy_devic
 | |
|  	return 0;
 | |
|  }
 | |
|  
 | |
| +static void at803x_disable_smarteee(struct phy_device *phydev)
 | |
| +{
 | |
| +	phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3,
 | |
| +		1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT);
 | |
| +	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
 | |
| +}
 | |
| +
 | |
|  static int at803x_config_init(struct phy_device *phydev)
 | |
|  {
 | |
| +	struct at803x_platform_data *pdata;
 | |
|  	int ret;
 | |
|  
 | |
|  	ret = genphy_config_init(phydev);
 | |
| @@ -271,6 +287,26 @@ static int at803x_config_init(struct phy
 | |
|  			return ret;
 | |
|  	}
 | |
|  
 | |
| +	pdata = dev_get_platdata(&phydev->mdio.dev);
 | |
| +	if (pdata) {
 | |
| +		if (pdata->disable_smarteee)
 | |
| +			at803x_disable_smarteee(phydev);
 | |
| +
 | |
| +		if (pdata->enable_rgmii_rx_delay)
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,
 | |
| +				AT803X_DEBUG_RX_CLK_DLY_EN);
 | |
| +		else
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
 | |
| +				AT803X_DEBUG_RX_CLK_DLY_EN, 0);
 | |
| +
 | |
| +		if (pdata->enable_rgmii_tx_delay)
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
 | |
| +				AT803X_DEBUG_TX_CLK_DLY_EN);
 | |
| +		else
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
 | |
| +				AT803X_DEBUG_TX_CLK_DLY_EN, 0);
 | |
| +	}
 | |
| +
 | |
|  	return 0;
 | |
|  }
 | |
|  
 | |
| @@ -308,6 +344,8 @@ static int at803x_config_intr(struct phy
 | |
|  static void at803x_link_change_notify(struct phy_device *phydev)
 | |
|  {
 | |
|  	struct at803x_priv *priv = phydev->priv;
 | |
| +	struct at803x_platform_data *pdata;
 | |
| +	pdata = dev_get_platdata(&phydev->mdio.dev);
 | |
|  
 | |
|  	/*
 | |
|  	 * Conduct a hardware reset for AT8030/2 every time a link loss is
 | |
| @@ -336,6 +374,24 @@ static void at803x_link_change_notify(st
 | |
|  	} else {
 | |
|  		priv->phy_reset = false;
 | |
|  	}
 | |
| +	if (pdata && pdata->fixup_rgmii_tx_delay &&
 | |
| +	    phydev->speed != priv->prev_speed) {
 | |
| +		switch (phydev->speed) {
 | |
| +		case SPEED_10:
 | |
| +		case SPEED_100:
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
 | |
| +				AT803X_DEBUG_TX_CLK_DLY_EN);
 | |
| +			break;
 | |
| +		case SPEED_1000:
 | |
| +			at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
 | |
| +				AT803X_DEBUG_TX_CLK_DLY_EN, 0);
 | |
| +			break;
 | |
| +		default:
 | |
| +			break;
 | |
| +		}
 | |
| +
 | |
| +		priv->prev_speed = phydev->speed;
 | |
| +	}
 | |
|  }
 | |
|  
 | |
|  static int at803x_aneg_done(struct phy_device *phydev)
 | |
| --- /dev/null
 | |
| +++ b/include/linux/platform_data/phy-at803x.h
 | |
| @@ -0,0 +1,11 @@
 | |
| +#ifndef _PHY_AT803X_PDATA_H
 | |
| +#define _PHY_AT803X_PDATA_H
 | |
| +
 | |
| +struct at803x_platform_data {
 | |
| +	int disable_smarteee:1;
 | |
| +	int enable_rgmii_tx_delay:1;
 | |
| +	int enable_rgmii_rx_delay:1;
 | |
| +	int fixup_rgmii_tx_delay:1;
 | |
| +};
 | |
| +
 | |
| +#endif /* _PHY_AT803X_PDATA_H */
 |