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

This commit is contained in:
Kevin Mihelich 2016-05-11 00:06:04 +00:00
parent a9dc763fbe
commit 1de5d3ed52
10 changed files with 68 additions and 42 deletions

View file

@ -1,4 +1,4 @@
From 0bda33528176a526a08dc32a1713dc491223722f Mon Sep 17 00:00:00 2001
From dccadc9e5eb4dc16815e27c286c16d235e4ff8e8 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100
Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
};
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 796ab9080eceeef544798eaf48ed2b1006c49940 Mon Sep 17 00:00:00 2001
From 2fe6588b6ca5cb817c78ee0b44ca9b2a6f6bdeb1 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100
Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
}
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 59f2ee16a48814c48a4c4dfd0aded0c9fc3e128a Mon Sep 17 00:00:00 2001
From 66047514f80a831be0461566faffa79113151783 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:41:19 -0600
Subject: [PATCH 3/8] SMILE Plug device tree file
@ -205,5 +205,5 @@ index 0000000..d01308a
+ };
+};
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From f0dd65c84670f693c01a899a2ca61a31441c2123 Mon Sep 17 00:00:00 2001
From 57abb5f14c98e72b246083465441ce75086304e0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:43:56 -0600
Subject: [PATCH 4/8] fix mvsdio eMMC timing
@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644
host->clock = ios->clock;
host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 10c8bb5eefc4f50141036dd65897d9bf0ea14e09 Mon Sep 17 00:00:00 2001
From 573ed812140e4319d2333206679e55a2f03ae632 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
@ -8,10 +8,10 @@ Subject: [PATCH 5/8] 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.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 16b0f8ba60b661369f31a353d286d4d75357cde6 Mon Sep 17 00:00:00 2001
From c211758069c908d9d76c31f16cccaf521c42e5f0 Mon Sep 17 00:00:00 2001
From: dobatog <dobatog@gmail.com>
Date: Thu, 26 Feb 2015 12:32:27 +0100
Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644
/* input mux */
{"Capture Source", "Line", "Line Input"},
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 6569d25c5805cae070b34bd31fa292ad4ce236ae Mon Sep 17 00:00:00 2001
From b5e99f293a21f1d27222c9e262831588e206bfc5 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 14 Feb 2015 12:32:27 +0100
Subject: [PATCH 7/8] set default cubietruck led triggers
@ -29,5 +29,5 @@ index 8da939a..9957d5f 100644
};
--
2.8.0
2.8.2

View file

@ -1,4 +1,4 @@
From 409482ba95d992d3857e314f5316dfc9b7ae0c5c Mon Sep 17 00:00:00 2001
From 4709ed524ab21c1578e96f837c77ce23bb25c108 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 7 Feb 2015 12:32:27 +0100
Subject: [PATCH 8/8] USB armory support
@ -452,5 +452,5 @@ index 0000000..902a73b
+ status = "okay";
+};
--
2.8.0
2.8.2

View file

@ -4,7 +4,7 @@
buildarch=4
_rcver=4.6
_rcrel=6
_rcrel=7
_rcnrel=armv7-x2
pkgbase=linux-armv7-rc
@ -37,17 +37,17 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'kernel.keyblock'
'kernel_data_key.vbprivk')
md5sums=('a60d48eee08ec0536d5efb17ca819aef'
'60d2e4b5eeb4ff2b58cf85a03d9c6a4b'
'a00af29281c1cd4ddef2db0129287700'
'c025cf3894fc3662c49aae80febd85e8'
'f0a2c6c5c9d185ef2c324639cc5c5ccc'
'cb3bd7ef06f5695e27e3d7a7ec99ab4f'
'a67db6ac12f75402b1f7a6fe556fa738'
'a5d2d5ef084a9482220ffd5978644a5a'
'252b65cccacf013e4ec13e69bba2e543'
'91a804ea2c4d44b08a5a05354f86f398'
'48b236d1156a8a0dc8fd6e726a5ade0e'
'67e0e064202557dd8c2da37509b61bf1'
'2089df8a0f142e2a1cdcaca0f133e47d'
'acdb79fe6cace0dd7673084aab5ad1d8'
'1b4bb8c2a33606ede339e5661f0e7fb8'
'8e2d392b751e5cf1862f1472d0d7a992'
'56ce0f700dcee0584183452d15c96b58'
'3a66481fa1aabbff1ed8a947d5aadc99'
'4864a3dc1188c51d505034932adadf92'
'2f7506cf70805d688a880e19e2f3e20a'
'276e39a7d0ff9bac45607ef4d50e0ab9'
'1c76d22a3281e9539222ee242da5a7fb'
'a3cae407aba7cd9afa546b3c4b560699'
'7d3061393c215d08f44a46ca48b13b7e'
'4f2379ed84258050edb858ee8d281678'
'61c5ff73c136ed07a7aadbf58db3d96a'

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.6.0-rc5-2 Kernel Configuration
# Linux/arm 4.6.0-rc7-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -782,7 +782,8 @@ CONFIG_KEXEC=y
CONFIG_ATAGS_PROC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_AUTO_ZRELADDR=y
# CONFIG_EFI is not set
CONFIG_EFI_STUB=y
CONFIG_EFI=y
#
# CPU Power Management
@ -1380,6 +1381,12 @@ CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=m
CONFIG_NET_DSA_HWMON=y
CONFIG_NET_DSA_TAG_BRCM=y
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
@ -1509,7 +1516,7 @@ CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m
CONFIG_HSR=m
# CONFIG_NET_SWITCHDEV is not set
CONFIG_NET_SWITCHDEV=y
CONFIG_NET_L3_MASTER_DEV=y
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
@ -2470,8 +2477,14 @@ CONFIG_ATM_SOLOS=m
#
# Distributed Switch Architecture drivers
#
# CONFIG_NET_DSA_MV88E6XXX is not set
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
CONFIG_NET_DSA_MV88E6XXX=m
CONFIG_NET_DSA_MV88E6060=m
CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
CONFIG_NET_DSA_MV88E6131=m
# CONFIG_NET_DSA_MV88E6123 is not set
CONFIG_NET_DSA_MV88E6171=m
CONFIG_NET_DSA_MV88E6352=m
CONFIG_NET_DSA_BCM_SF2=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
@ -2665,6 +2678,7 @@ CONFIG_NET_VENDOR_RENESAS=y
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_ROCKER=y
# CONFIG_ROCKER is not set
CONFIG_NET_VENDOR_SAMSUNG=y
# CONFIG_SXGBE_ETH is not set
CONFIG_NET_VENDOR_SEEQ=y
@ -2745,7 +2759,7 @@ CONFIG_TERANETICS_PHY=m
CONFIG_SMSC_PHY=y
CONFIG_BCM_NET_PHYLIB=m
CONFIG_BROADCOM_PHY=m
# CONFIG_BCM7XXX_PHY is not set
CONFIG_BCM7XXX_PHY=m
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
@ -2761,7 +2775,7 @@ CONFIG_FIXED_PHY=m
CONFIG_MDIO_SUN4I=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_BCM_UNIMAC is not set
CONFIG_MDIO_BCM_UNIMAC=m
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@ -6346,6 +6360,7 @@ CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_DA9052=y
CONFIG_RTC_DRV_DA9055=m
CONFIG_RTC_DRV_DA9063=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T35=m
@ -7219,6 +7234,15 @@ CONFIG_ARM_PSCI_FW=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_HAVE_ARM_SMCCC=y
#
# EFI (Extensible Firmware Interface) Support
#
CONFIG_EFI_VARS=m
CONFIG_EFI_ESRT=y
CONFIG_EFI_PARAMS_FROM_FDT=y
CONFIG_EFI_RUNTIME_WRAPPERS=y
CONFIG_EFI_ARMSTUB=y
#
# File systems
#
@ -7336,6 +7360,7 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_CONFIGFS_FS=y
CONFIG_EFIVAR_FS=m
CONFIG_MISC_FILESYSTEMS=y
CONFIG_ORANGEFS_FS=m
CONFIG_ADFS_FS=m
@ -7964,6 +7989,7 @@ CONFIG_IRQ_POLL=y
CONFIG_MPILIB=m
CONFIG_LIBFDT=y
CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y