diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-08-25 21:50:49 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-08-25 21:50:49 +0000 |
| commit | 20f48d27eae25c2cd302956c0c70a28e3ec2e71c (patch) | |
| tree | 5701cd9d4994bcaa82830957619ff66286fa9b31 | |
| parent | 89d908e9f1a29033b6e23d652a496777cbf813f5 (diff) | |
| download | upstream-20f48d27eae25c2cd302956c0c70a28e3ec2e71c.tar.gz upstream-20f48d27eae25c2cd302956c0c70a28e3ec2e71c.tar.bz2 upstream-20f48d27eae25c2cd302956c0c70a28e3ec2e71c.zip | |
imx6: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42297
| -rw-r--r-- | target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 10 | ||||
| -rw-r--r-- | target/linux/imx6/patches-3.14/208-ventana-plx-allow-override-gpio-output-mask.patch | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch index 1b458f76db..d360f7cec1 100644 --- a/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch +++ b/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch @@ -89,7 +89,7 @@ Date: Thu May 15 12:36:23 2014 -0700 #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/ip.h> -@@ -2183,6 +2184,126 @@ static s32 igb_init_i2c(struct igb_adapt +@@ -2189,6 +2190,126 @@ static s32 igb_init_i2c(struct igb_adapt return status; } @@ -216,7 +216,7 @@ Date: Thu May 15 12:36:23 2014 -0700 /** * igb_probe - Device Initialization Routine * @pdev: PCI device information struct -@@ -2585,6 +2706,13 @@ static int igb_probe(struct pci_dev *pde +@@ -2591,6 +2712,13 @@ static int igb_probe(struct pci_dev *pde } pm_runtime_put_noidle(&pdev->dev); @@ -230,7 +230,7 @@ Date: Thu May 15 12:36:23 2014 -0700 return 0; err_register: -@@ -2728,6 +2856,10 @@ static void igb_remove(struct pci_dev *p +@@ -2734,6 +2862,10 @@ static void igb_remove(struct pci_dev *p struct e1000_hw *hw = &adapter->hw; pm_runtime_get_noresume(&pdev->dev); @@ -241,7 +241,7 @@ Date: Thu May 15 12:36:23 2014 -0700 #ifdef CONFIG_IGB_HWMON igb_sysfs_exit(adapter); #endif -@@ -3032,6 +3164,12 @@ static int __igb_open(struct net_device +@@ -3038,6 +3170,12 @@ static int __igb_open(struct net_device if (!resuming) pm_runtime_put(&pdev->dev); @@ -254,7 +254,7 @@ Date: Thu May 15 12:36:23 2014 -0700 /* start the watchdog. */ hw->mac.get_link_status = 1; schedule_work(&adapter->watchdog_task); -@@ -7087,21 +7225,41 @@ void igb_alloc_rx_buffers(struct igb_rin +@@ -7093,21 +7231,41 @@ void igb_alloc_rx_buffers(struct igb_rin static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) { struct igb_adapter *adapter = netdev_priv(netdev); diff --git a/target/linux/imx6/patches-3.14/208-ventana-plx-allow-override-gpio-output-mask.patch b/target/linux/imx6/patches-3.14/208-ventana-plx-allow-override-gpio-output-mask.patch index 7c2d1b0936..97298fd694 100644 --- a/target/linux/imx6/patches-3.14/208-ventana-plx-allow-override-gpio-output-mask.patch +++ b/target/linux/imx6/patches-3.14/208-ventana-plx-allow-override-gpio-output-mask.patch @@ -47,7 +47,7 @@ an unprogrammed i210 device. static int ar8031_phy_fixup(struct phy_device *dev) { u16 val; -@@ -308,7 +315,7 @@ static void __init imx6q_init_irq(void) +@@ -328,7 +335,7 @@ static void __init imx6q_init_irq(void) irqchip_init(); } |