From 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 8 Dec 2014 12:04:25 +0000 Subject: kernel: refresh patches Signed-off-by: Felix Fietkau SVN-Revision: 43564 --- .../0002-ARM-dts-added-several-new-imx-pinmux-groups.patch | 8 ++++---- .../204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 2 +- ...205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/imx6') diff --git a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch index f2d7f6c..c93662a 100644 --- a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch +++ b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch @@ -97,11 +97,10 @@ Signed-off-by: Shawn Guo }; uart4 { -@@ -1106,6 +1157,15 @@ - >; +@@ -1107,6 +1158,15 @@ }; }; -+ + + uart5 { + pinctrl_uart5_1: uart5grp-1 { + fsl,pins = < @@ -110,6 +109,7 @@ Signed-off-by: Shawn Guo + >; + }; + }; - ++ usbotg { pinctrl_usbotg_1: usbotggrp-1 { + fsl,pins = < 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 d360f7c..ab26601 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 @@ -241,7 +241,7 @@ Date: Thu May 15 12:36:23 2014 -0700 #ifdef CONFIG_IGB_HWMON igb_sysfs_exit(adapter); #endif -@@ -3038,6 +3170,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); diff --git a/target/linux/imx6/patches-3.14/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch b/target/linux/imx6/patches-3.14/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch index f1d76a1..cf46434 100644 --- a/target/linux/imx6/patches-3.14/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch +++ b/target/linux/imx6/patches-3.14/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -270,6 +270,14 @@ endif # RTL8366_SMI +@@ -278,6 +278,14 @@ endif # RTL8366_SMI source "drivers/net/phy/b53/Kconfig" @@ -17,7 +17,7 @@ config MICREL_KS8995MA --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -39,6 +39,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o +@@ -40,6 +40,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o obj-$(CONFIG_DP83640_PHY) += dp83640.o obj-$(CONFIG_STE10XP) += ste10Xp.o obj-$(CONFIG_MICREL_PHY) += micrel.o -- cgit v1.1