core/linux-armv5-rc to 4.6.rc7-1

This commit is contained in:
Kevin Mihelich 2016-05-09 00:18:43 +00:00
parent cb10c6d38a
commit eedfc320e7
4 changed files with 20 additions and 20 deletions

View file

@ -1,4 +1,4 @@
From 075bc2e60bc0526818270c0bc467c3f4fbd8617c Mon Sep 17 00:00:00 2001
From 30d23c01c3ea43b237a07b5d404662f65598e3c8 Mon Sep 17 00:00:00 2001
From: Douglas Gilbert <[mailto:dgilbert@interlog.com]>
Date: Mon, 12 Aug 2013 10:36:25 -0500
Subject: [PATCH 1/3] at91: ariag25 updates
@ -89,5 +89,5 @@ index e9ced30..8308515 100644
usb0: ohci@00600000 {
--
2.7.0
2.8.2

View file

@ -1,4 +1,4 @@
From aa3889e8c698bc699aa8ce8ccda3eecf5be5ebe7 Mon Sep 17 00:00:00 2001
From 515ca42e8a6eb3c12a73875ae221e56b226c0cdc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 13 Jun 2015 13:46:30 -0600
Subject: [PATCH 2/3] at91: arietta-g25 support
@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
create mode 100644 arch/arm/boot/dts/at91-arietta256.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index a4a6d70..f43e9f3 100644
index 95c1923..96010d9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -31,6 +31,8 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
@@ -33,6 +33,8 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
at91sam9n12ek.dtb \
at91sam9rlek.dtb \
at91-ariag25.dtb \
@ -376,5 +376,5 @@ index 0000000..cbae789
+
+};
--
2.7.0
2.8.2

View file

@ -1,4 +1,4 @@
From 2ff0f69030e69aa6a8aa66840b8224bbec73d90a Mon Sep 17 00:00:00 2001
From db8ae51c160d4af4420eb29489d3ede9c9395607 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 3/3] net/smsc95xx: Allow mac address to be set as a parameter
@ -8,10 +8,10 @@ Subject: [PATCH 3/3] net/smsc95xx: Allow mac address to be set as a parameter
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 66b3ab9..3cc50f6 100644
index 2edc2bc..2445b56 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -59,6 +59,7 @@
@@ -60,6 +60,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
@ -19,7 +19,7 @@ index 66b3ab9..3cc50f6 100644
struct smsc95xx_priv {
u32 mac_cr;
@@ -74,6 +75,10 @@ static bool turbo_mode = true;
@@ -75,6 +76,10 @@ static bool turbo_mode = true;
module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
@ -30,7 +30,7 @@ index 66b3ab9..3cc50f6 100644
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
@@ -764,8 +769,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
@ -87,9 +87,9 @@ index 66b3ab9..3cc50f6 100644
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
+ return;
+
/* try reading mac address from EEPROM */
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
const u8 *mac_addr;
/* maybe the boot loader passed the MAC address in devicetree */
--
2.7.0
2.8.2

View file

@ -4,7 +4,7 @@
buildarch=2
_rcver=4.6
_rcrel=6
_rcrel=7
pkgbase=linux-armv5-rc
_srcname=linux-4.$((${_rcver##*.}-1))
@ -26,10 +26,10 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'0003-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'config')
md5sums=('a60d48eee08ec0536d5efb17ca819aef'
'60d2e4b5eeb4ff2b58cf85a03d9c6a4b'
'9e7292551a34e0e6414ff480cda78007'
'f7f2b7e7ff974913cb741ea5c8ad632e'
'63ee04d409d10aa1a5a4e7d5fbb9e764'
'2089df8a0f142e2a1cdcaca0f133e47d'
'aba0f2b0bfe0922b0cd556c01b271fb7'
'b0a34a7166501fdc2bf5ea2abb4aa6a0'
'61aafdc68c57c58cc0b6cb026d134144'
'86a06f7bd154de2282181bbd5165cfe1')
prepare() {