summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado2016-04-15 00:09:16 -0300
committerAndré Fabian Silva Delgado2016-04-15 00:09:16 -0300
commit58754802244fdf7a23f60a73226af3b0c8f0fc94 (patch)
tree9769684fa01e1bf543b50fadda65b91044456f56
parent72e352618a440665daeac7acbe9e1d55aa4a6d53 (diff)
downloadaur-58754802244fdf7a23f60a73226af3b0c8f0fc94.tar.gz
Update to 4.5.1_gnu-1
-rw-r--r--.SRCINFO46
-rw-r--r--0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch6
-rw-r--r--0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch1
-rw-r--r--0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch8
-rw-r--r--0003-SMILE-Plug-device-tree-file.patch6
-rw-r--r--0004-fix-mvsdio-eMMC-timing.patch6
-rw-r--r--0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch7
-rw-r--r--0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch6
-rw-r--r--0007-set-default-cubietruck-led-triggers.patch6
-rw-r--r--0008-USB-armory-support.patch6
-rw-r--r--0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch87
-rw-r--r--0010-stmmac-fix-MDIO-settings.patch235
-rw-r--r--PKGBUILD42
-rw-r--r--config.armv7h45
14 files changed, 431 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f9797ab6d41d..2019499b6330 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Mar 28 00:39:37 UTC 2016
+# Fri Apr 15 03:08:25 UTC 2016
pkgbase = linux-libre
- pkgver = 4.5_gnu
- pkgrel = 1.1
+ pkgver = 4.5.1_gnu
+ pkgrel = 1
url = http://linux-libre.fsfla.org/
arch = i686
arch = x86_64
@@ -16,6 +16,8 @@ pkgbase = linux-libre
options = !strip
source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.5-gnu/linux-libre-4.5-gnu.tar.xz
source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.5-gnu/linux-libre-4.5-gnu.tar.xz.sign
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.5.1-gnu/patch-4.5-gnu-4.5.1-gnu.xz
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.5.1-gnu/patch-4.5-gnu-4.5.1-gnu.xz.sign
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm
@@ -30,8 +32,8 @@ pkgbase = linux-libre
source = 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
source = 0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
source = 0003-fix-atmel-maxtouch-touchscreen-support.patch
- source = https://repo.parabola.nu/other/rcn-libre/patches/4.5/rcn-libre-4.5-armv7-x2.patch
- source = https://repo.parabola.nu/other/rcn-libre/patches/4.5/rcn-libre-4.5-armv7-x2.patch.sig
+ source = https://repo.parabola.nu/other/rcn-libre/patches/4.5.1/rcn-libre-4.5.1-armv7-x2.patch
+ source = https://repo.parabola.nu/other/rcn-libre/patches/4.5.1/rcn-libre-4.5.1-armv7-x2.patch.sig
source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
source = 0003-SMILE-Plug-device-tree-file.patch
@@ -40,8 +42,12 @@ pkgbase = linux-libre
source = 0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
source = 0007-set-default-cubietruck-led-triggers.patch
source = 0008-USB-armory-support.patch
+ source = 0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch
+ source = 0010-stmmac-fix-MDIO-settings.patch
sha256sums = c37a135518d5a69b26bae8441bc20e5a5ea87d3228cfe72f75a714cff730a84e
sha256sums = SKIP
+ sha256sums = bde6fa0cee5ee3d32c6e4336b23f87cbe37b74b9d4d1603d1d421dc1e44d2ab9
+ sha256sums = SKIP
sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
sha256sums = SKIP
sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74
@@ -50,22 +56,24 @@ pkgbase = linux-libre
sha256sums = SKIP
sha256sums = 40eadc1b5f9d11b4cd183491973c866d5fd96c15f75f0a82af52d0ae170948cd
sha256sums = 668df07cc6664ec056365702c7554bad1182460e80b3705bfd5d12283b6ed499
- sha256sums = 0f830583294bdf445ed1cef604874f5e98e4f71e69a19e2227cdd2b26c3a3274
+ sha256sums = 7eccf2c95c69b07bddbac5bf336e694b5cc21bc77feb01a07275606568ce3ee8
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = 93edfa289033e491ba7f9d6886943ce68c94fb45dc6817a3fc577c7ba6c369d6
+ sha256sums = 2f5fe30332d1feb853ffe76a5390329ab23963fa07b06f22e48773064f90f20c
sha256sums = 3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808
sha256sums = 0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d
- sha256sums = 9865a47b50ccab0993f9b371f45b526162307fffc67dfadcae6fae31d05a67b9
+ sha256sums = 9303951a81911d4f5de58c40b76cfe392ac69f007a66c99e492816a624081096
sha256sums = SKIP
- sha256sums = abc20251d9becc566e46ff0fca77074eca9de5d119d2dbccb7d9c933b2d59979
- sha256sums = 7db1c60b0a44e588f31bad6003bad5997ec7761d9f39590c7e07670a24fbeaa4
- sha256sums = 9e75777afb39b6c3d1886b18370df883e6d283c1bdf299690ac3d516ff5af4fd
- sha256sums = 01b3c73adcf5fbf97a2c5b91d30c3c0a1c4ee8dce60b5718a74c99f49c673566
- sha256sums = bb97616b299b7c569e8a886a729493b67f22d06680a84d0bc4581fa062d62662
- sha256sums = f03aee1273e0c349411cb1bf21983c5358b27f5f370a132b2cce05d3e56d18a9
- sha256sums = d500fedf8332234c724a1075f69ceaa743d17e7fb73be70b62dee897f75f86f5
- sha256sums = cda19e0f819f5475172aed8c231b7c8964f64f582d993f1cf7fa8b14d0d95cae
+ sha256sums = d09937cbca4f408dbcde270e465bdfe0589a0b41ed07d260a596a38fe6cca987
+ sha256sums = cc1f1b5026b373da4a5c2e8c82bc2b0f8a20e295353c201579140a04f2452545
+ sha256sums = f68d382f9d5b9948cc0e7062290e1b26d7c3c7e4ba270fda0bd632c24465a40b
+ sha256sums = 658f619cd11676996919ef290934cfc809db5d0fa35a1ebc475d3ebb59253201
+ sha256sums = f7bf7a7cf676571f48c92fc858ddd67cc395105ae633c3d6e5386a4a5c848d81
+ sha256sums = 939c11540b47f02706f3cff1b76b84a13b4dab9cae438632d4b685b16ed8249e
+ sha256sums = db830e53d451c54f84917b663671a6cc9414b043064cdf1a17369c198abee9dd
+ sha256sums = ef21f0524fdd559389529bd05b56a3b89642fb10b74de709153d1b3c2e21c126
+ sha256sums = 9f915fedf2cf03eccfed9025d3883a1158531203a676060a2eae5809ec4989ce
+ sha256sums = bbbdd20f4a933ae988e713de5ac3ad08bd453e4e3dfa4cdac2da483dcf2454d8
pkgname = linux-libre
pkgdesc = The Linux-libre kernel and modules
@@ -75,20 +83,20 @@ pkgname = linux-libre
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux=4.5
+ provides = linux=4.5.1
conflicts =
replaces = linux
backup = etc/mkinitcpio.d/linux-libre.preset
pkgname = linux-libre-headers
pkgdesc = Header files and scripts for building modules for Linux-libre kernel
- provides = linux-headers=4.5
+ provides = linux-headers=4.5.1
conflicts =
replaces = linux-headers
pkgname = linux-libre-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel
- provides = linux-docs=4.5
+ provides = linux-docs=4.5.1
conflicts =
replaces = linux-docs
diff --git a/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index 09ba229eab41..272d1c2f0ead 100644
--- a/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 7a5c6503ca3622ce2586526e73053d841e4f6586 Mon Sep 17 00:00:00 2001
+From dd57cddf4b28cbccf358e7d6995d262c3e47eecb 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
+Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot
Marvell uses a specific atag in its u-boot which includes among other
information the MAC addresses for up to 4 network interfaces.
@@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
};
--
-2.7.0
+2.7.3
diff --git a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 15aee35c0667..a14ea9fc513a 100644
--- a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -4,6 +4,7 @@ Date: Sun, 30 Aug 2015 14:27:44 -0700
Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
firmwares.
+Reviewed-by: André Silva <emulatorman@parabola.nu>
---
drivers/gpu/drm/radeon/r600.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index ad8f97369772..3675b26190fa 100644
--- a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,8 +1,8 @@
-From 040d668336081568cd29c4d70955bb90827e382a Mon Sep 17 00:00:00 2001
+From 0f33dd3cbffb1f8cf75c8955ad0ce0ad747d6964 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
- loader
+Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell
+ boot loader
The atags are parsed and if a Marvell atag is found, up to 4 MAC
addresses are extracted there and assigned to node aliases eth0..3
@@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
}
--
-2.7.0
+2.7.3
diff --git a/0003-SMILE-Plug-device-tree-file.patch b/0003-SMILE-Plug-device-tree-file.patch
index 6b50824c79d8..e0df398dafe5 100644
--- a/0003-SMILE-Plug-device-tree-file.patch
+++ b/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From 19dd2897d9d753a42e9610ff7ebc4370e995474e Mon Sep 17 00:00:00 2001
+From 2177f601828cab3482f837a6d34f187629b13743 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
+Subject: [PATCH 03/10] SMILE Plug device tree file
This adds a dts file for the SMILE Plug, which only differs from the Mirabox
dts with the LED definitions.
@@ -205,5 +205,5 @@ index 0000000..d01308a
+ };
+};
--
-2.7.0
+2.7.3
diff --git a/0004-fix-mvsdio-eMMC-timing.patch b/0004-fix-mvsdio-eMMC-timing.patch
index ceb304b94e8c..831a4b635410 100644
--- a/0004-fix-mvsdio-eMMC-timing.patch
+++ b/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From 011e108826ecd2d14f714543171e32e74ec52878 Mon Sep 17 00:00:00 2001
+From ee60ccbad5446a51d434b39d2e7582a9a88ad8e7 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
+Subject: [PATCH 04/10] fix mvsdio eMMC timing
These changes from Globalscale change the MMC timing to allow the eMMC versions
of the Mirabox and SMILE Plug to work.
@@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644
host->clock = ios->clock;
host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
--
-2.7.0
+2.7.3
diff --git a/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index cc74344e4e86..3ab74540ae93 100644
--- a/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,7 +1,8 @@
-From 3fc16f5db6a177bb5277962c808c45c74f75ae9e Mon Sep 17 00:00:00 2001
+From 75f7a861ec5a0f19d2724be0327914b658aec00c 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
+Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a
+ parameter
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -91,5 +92,5 @@ index 66b3ab9..3cc50f6 100644
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
--
-2.7.0
+2.7.3
diff --git a/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
index 52c3cea75bb9..6a67117152a1 100644
--- a/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@@ -1,7 +1,7 @@
-From c7df0a759a4e82d1fd4ea24a63a8f0a2c8b3821e Mon Sep 17 00:00:00 2001
+From 35c16823a040eae8f0c1bbb3f3812c11efe898f8 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
+Subject: [PATCH 06/10] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
related to input routing signals.
The following patch, based on stable v3.19, corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:
@@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644
/* input mux */
{"Capture Source", "Line", "Line Input"},
--
-2.7.0
+2.7.3
diff --git a/0007-set-default-cubietruck-led-triggers.patch b/0007-set-default-cubietruck-led-triggers.patch
index e741518ebf21..db9e25a3735b 100644
--- a/0007-set-default-cubietruck-led-triggers.patch
+++ b/0007-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From 2cc0b133d9bb620d3b48651b95d60d2c3d1ae37e Mon Sep 17 00:00:00 2001
+From c10150c254d704496c2a832434069cc47dbbe7cc 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
+Subject: [PATCH 07/10] set default cubietruck led triggers
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
@@ -29,5 +29,5 @@ index 8da939a..9957d5f 100644
};
--
-2.7.0
+2.7.3
diff --git a/0008-USB-armory-support.patch b/0008-USB-armory-support.patch
index 5b4309080a41..7a0c8e186d70 100644
--- a/0008-USB-armory-support.patch
+++ b/0008-USB-armory-support.patch
@@ -1,7 +1,7 @@
-From 19ca41a82a2fde0e6cd80b70ab1deb2b793edb86 Mon Sep 17 00:00:00 2001
+From 07ccea6eaa471307f5f7513862b47c040178a40a 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
+Subject: [PATCH 08/10] USB armory support
---
arch/arm/boot/dts/Makefile | 5 +
@@ -452,5 +452,5 @@ index 0000000..902a73b
+ status = "okay";
+};
--
-2.7.0
+2.7.3
diff --git a/0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch b/0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch
new file mode 100644
index 000000000000..53937d20377e
--- /dev/null
+++ b/0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch
@@ -0,0 +1,87 @@
+From 026b3cec564af35100ec9c3bdd7ce949768575b8 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Wed, 16 Mar 2016 07:39:26 -0600
+Subject: [PATCH 09/10] Revert "stmmac: Fix 'eth0: No PHY found' regression"
+
+This reverts commit 88f8b1bb41c6208f81b6a480244533ded7b59493.
+---
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 ++++++++++-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 +--------
+ include/linux/stmmac.h | 1 -
+ 3 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+index efb54f3..0faf163 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+@@ -199,12 +199,21 @@ int stmmac_mdio_register(struct net_device *ndev)
+ struct stmmac_priv *priv = netdev_priv(ndev);
+ struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data;
+ int addr, found;
+- struct device_node *mdio_node = priv->plat->mdio_node;
++ struct device_node *mdio_node = NULL;
++ struct device_node *child_node = NULL;
+
+ if (!mdio_bus_data)
+ return 0;
+
+ if (IS_ENABLED(CONFIG_OF)) {
++ for_each_child_of_node(priv->device->of_node, child_node) {
++ if (of_device_is_compatible(child_node,
++ "snps,dwmac-mdio")) {
++ mdio_node = child_node;
++ break;
++ }
++ }
++
+ if (mdio_node) {
+ netdev_dbg(ndev, "FOUND MDIO subnode\n");
+ } else {
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+index 4514ba7..6a52fa1 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+@@ -110,7 +110,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
+ struct device_node *np = pdev->dev.of_node;
+ struct plat_stmmacenet_data *plat;
+ struct stmmac_dma_cfg *dma_cfg;
+- struct device_node *child_node = NULL;
+
+ plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+ if (!plat)
+@@ -141,19 +140,13 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
+ plat->phy_node = of_node_get(np);
+ }
+
+- for_each_child_of_node(np, child_node)
+- if (of_device_is_compatible(child_node, "snps,dwmac-mdio")) {
+- plat->mdio_node = child_node;
+- break;
+- }
+-
+ /* "snps,phy-addr" is not a standard property. Mark it as deprecated
+ * and warn of its use. Remove this when phy node support is added.
+ */
+ if (of_property_read_u32(np, "snps,phy-addr", &plat->phy_addr) == 0)
+ dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n");
+
+- if ((plat->phy_node && !of_phy_is_fixed_link(np)) || !plat->mdio_node)
++ if ((plat->phy_node && !of_phy_is_fixed_link(np)) || plat->phy_bus_name)
+ plat->mdio_bus_data = NULL;
+ else
+ plat->mdio_bus_data =
+diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
+index 881a79d..eead8ab 100644
+--- a/include/linux/stmmac.h
++++ b/include/linux/stmmac.h
+@@ -100,7 +100,6 @@ struct plat_stmmacenet_data {
+ int interface;
+ struct stmmac_mdio_bus_data *mdio_bus_data;
+ struct device_node *phy_node;
+- struct device_node *mdio_node;
+ struct stmmac_dma_cfg *dma_cfg;
+ int clk_csr;
+ int has_gmac;
+--
+2.7.3
+
diff --git a/0010-stmmac-fix-MDIO-settings.patch b/0010-stmmac-fix-MDIO-settings.patch
new file mode 100644
index 000000000000..9cdda19c7e59
--- /dev/null
+++ b/0010-stmmac-fix-MDIO-settings.patch
@@ -0,0 +1,235 @@
+From be3687ac6bf12bd89059742faac2fb40ec8af419 Mon Sep 17 00:00:00 2001
+From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
+Date: Wed, 16 Mar 2016 10:38:49 +0100
+Subject: [PATCH 10/10] stmmac: fix MDIO settings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Initially the phy_bus_name was added to manipulate the
+driver name but it was recently just used to manage the
+fixed-link and then to take some decision at run-time.
+So the patch uses the is_pseudo_fixed_link and removes
+the phy_bus_name variable not necessary anymore.
+
+The driver can manage the mdio registration by using phy-handle,
+dwmac-mdio and own parameter e.g. snps,phy-addr.
+This patch takes care about all these possible configurations
+and fixes the mdio registration in case of there is a real
+transceiver or a switch (that needs to be managed by using
+fixed-link).
+
+Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
+Reviewed-by: Andreas Färber <afaerber@suse.de>
+Tested-by: Frank Schäfer <fschaefer.oss@googlemail.com>
+Cc: Gabriel Fernandez <gabriel.fernandez@linaro.org>
+Cc: Dinh Nguyen <dinh.linux@gmail.com>
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Phil Reid <preid@electromag.com.au>
+---
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 19 +----
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 84 +++++++++++++++++-----
+ include/linux/stmmac.h | 2 +-
+ 4 files changed, 71 insertions(+), 45 deletions(-)
+
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+index c21015b..389d7d0 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+@@ -271,7 +271,6 @@ static void stmmac_eee_ctrl_timer(unsigned long arg)
+ */
+ bool stmmac_eee_init(struct stmmac_priv *priv)
+ {
+- char *phy_bus_name = priv->plat->phy_bus_name;
+ unsigned long flags;
+ bool ret = false;
+
+@@ -283,7 +282,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
+ goto out;
+
+ /* Never init EEE in case of a switch is attached */
+- if (phy_bus_name && (!strcmp(phy_bus_name, "fixed")))
++ if (priv->phydev->is_pseudo_fixed_link)
+ goto out;
+
+ /* MAC core supports the EEE feature. */
+@@ -820,12 +819,8 @@ static int stmmac_init_phy(struct net_device *dev)
+ phydev = of_phy_connect(dev, priv->plat->phy_node,
+ &stmmac_adjust_link, 0, interface);
+ } else {
+- if (priv->plat->phy_bus_name)
+- snprintf(bus_id, MII_BUS_ID_SIZE, "%s-%x",
+- priv->plat->phy_bus_name, priv->plat->bus_id);
+- else
+- snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
+- priv->plat->bus_id);
++ snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
++ priv->plat->bus_id);
+
+ snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
+ priv->plat->phy_addr);
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+index 0faf163..3f5512f 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+@@ -198,29 +198,12 @@ int stmmac_mdio_register(struct net_device *ndev)
+ struct mii_bus *new_bus;
+ struct stmmac_priv *priv = netdev_priv(ndev);
+ struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data;
++ struct device_node *mdio_node = priv->plat->mdio_node;
+ int addr, found;
+- struct device_node *mdio_node = NULL;
+- struct device_node *child_node = NULL;
+
+ if (!mdio_bus_data)
+ return 0;
+
+- if (IS_ENABLED(CONFIG_OF)) {
+- for_each_child_of_node(priv->device->of_node, child_node) {
+- if (of_device_is_compatible(child_node,
+- "snps,dwmac-mdio")) {
+- mdio_node = child_node;
+- break;
+- }
+- }
+-
+- if (mdio_node) {
+- netdev_dbg(ndev, "FOUND MDIO subnode\n");
+- } else {
+- netdev_warn(ndev, "No MDIO subnode found\n");
+- }
+- }
+-
+ new_bus = mdiobus_alloc();
+ if (new_bus == NULL)
+ return -ENOMEM;
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+index 6a52fa1..190fb6d 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+@@ -96,6 +96,69 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)
+ }
+
+ /**
++ * stmmac_dt_phy - parse device-tree driver parameters to allocate PHY resources
++ * @plat: driver data platform structure
++ * @np: device tree node
++ * @dev: device pointer
++ * Description:
++ * The mdio bus will be allocated in case of a phy transceiver is on board;
++ * it will be NULL if the fixed-link is configured.
++ * If there is the "snps,dwmac-mdio" sub-node the mdio will be allocated
++ * in any case (for DSA, mdio must be registered even if fixed-link).
++ * The table below sums the supported configurations:
++ * -------------------------------
++ * snps,phy-addr | Y
++ * -------------------------------
++ * phy-handle | Y
++ * -------------------------------
++ * fixed-link | N
++ * -------------------------------
++ * snps,dwmac-mdio |
++ * even if | Y
++ * fixed-link |
++ * -------------------------------
++ *
++ * It returns 0 in case of success otherwise -ENODEV.
++ */
++static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
++ struct device_node *np, struct device *dev)
++{
++ bool mdio = true;
++
++ /* If phy-handle property is passed from DT, use it as the PHY */
++ plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
++ if (plat->phy_node)
++ dev_dbg(dev, "Found phy-handle subnode\n");
++
++ /* If phy-handle is not specified, check if we have a fixed-phy */
++ if (!plat->phy_node && of_phy_is_fixed_link(np)) {
++ if ((of_phy_register_fixed_link(np) < 0))
++ return -ENODEV;
++
++ dev_dbg(dev, "Found fixed-link subnode\n");
++ plat->phy_node = of_node_get(np);
++ mdio = false;
++ }
++
++ /* If snps,dwmac-mdio is passed from DT, always register the MDIO */
++ for_each_child_of_node(np, plat->mdio_node) {
++ if (of_device_is_compatible(plat->mdio_node, "snps,dwmac-mdio"))
++ break;
++ }
++
++ if (plat->mdio_node) {
++ dev_dbg(dev, "Found MDIO subnode\n");
++ mdio = true;
++ }
++
++ if (mdio)
++ plat->mdio_bus_data =
++ devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data),
++ GFP_KERNEL);
++ return 0;
++}
++
++/**
+ * stmmac_probe_config_dt - parse device-tree driver parameters
+ * @pdev: platform_device structure
+ * @plat: driver data platform structure
+@@ -129,30 +192,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
+ /* Default to phy auto-detection */
+ plat->phy_addr = -1;
+
+- /* If we find a phy-handle property, use it as the PHY */
+- plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
+-
+- /* If phy-handle is not specified, check if we have a fixed-phy */
+- if (!plat->phy_node && of_phy_is_fixed_link(np)) {
+- if ((of_phy_register_fixed_link(np) < 0))
+- return ERR_PTR(-ENODEV);
+-
+- plat->phy_node = of_node_get(np);
+- }
+-
+ /* "snps,phy-addr" is not a standard property. Mark it as deprecated
+ * and warn of its use. Remove this when phy node support is added.
+ */
+ if (of_property_read_u32(np, "snps,phy-addr", &plat->phy_addr) == 0)
+ dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n");
+
+- if ((plat->phy_node && !of_phy_is_fixed_link(np)) || plat->phy_bus_name)
+- plat->mdio_bus_data = NULL;
+- else
+- plat->mdio_bus_data =
+- devm_kzalloc(&pdev->dev,
+- sizeof(struct stmmac_mdio_bus_data),
+- GFP_KERNEL);
++ /* To Configure PHY by using all device-tree supported properties */
++ if (stmmac_dt_phy(plat, np, &pdev->dev))
++ return ERR_PTR(-ENODEV);
+
+ of_property_read_u32(np, "tx-fifo-depth", &plat->tx_fifo_size);
+
+diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
+index eead8ab..8b1ff2b 100644
+--- a/include/linux/stmmac.h
++++ b/include/linux/stmmac.h
+@@ -94,12 +94,12 @@ struct stmmac_dma_cfg {
+ };
+
+ struct plat_stmmacenet_data {
+- char *phy_bus_name;
+ int bus_id;
+ int phy_addr;
+ int interface;
+ struct stmmac_mdio_bus_data *mdio_bus_data;
+ struct device_node *phy_node;
++ struct device_node *mdio_node;
+ struct stmmac_dma_cfg *dma_cfg;
+ int clk_csr;
+ int has_gmac;
+--
+2.7.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 2af88537ff6a..a1a119ddc061 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgbase=linux-libre # Build stock kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_pkgbasever=4.5-gnu
-_pkgver=$_pkgbasever
+_pkgver=4.5.1-gnu
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
_srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}
pkgver=${_pkgver//-/_}
-pkgrel=1.1
+pkgrel=1
rcnrel=armv7-x2
arch=('i686' 'x86_64' 'armv7h')
url="http://linux-libre.fsfla.org/"
@@ -32,8 +32,8 @@ fi
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig"
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"
@@ -58,9 +58,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
'0007-set-default-cubietruck-led-triggers.patch'
- '0008-USB-armory-support.patch')
+ '0008-USB-armory-support.patch'
+ '0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch'
+ '0010-stmmac-fix-MDIO-settings.patch')
sha256sums=('c37a135518d5a69b26bae8441bc20e5a5ea87d3228cfe72f75a714cff730a84e'
'SKIP'
+ 'bde6fa0cee5ee3d32c6e4336b23f87cbe37b74b9d4d1603d1d421dc1e44d2ab9'
+ 'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
'13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
@@ -69,22 +73,24 @@ sha256sums=('c37a135518d5a69b26bae8441bc20e5a5ea87d3228cfe72f75a714cff730a84e'
'SKIP'
'40eadc1b5f9d11b4cd183491973c866d5fd96c15f75f0a82af52d0ae170948cd'
'668df07cc6664ec056365702c7554bad1182460e80b3705bfd5d12283b6ed499'
- '0f830583294bdf445ed1cef604874f5e98e4f71e69a19e2227cdd2b26c3a3274'
+ '7eccf2c95c69b07bddbac5bf336e694b5cc21bc77feb01a07275606568ce3ee8'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '93edfa289033e491ba7f9d6886943ce68c94fb45dc6817a3fc577c7ba6c369d6'
+ '2f5fe30332d1feb853ffe76a5390329ab23963fa07b06f22e48773064f90f20c'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
- '9865a47b50ccab0993f9b371f45b526162307fffc67dfadcae6fae31d05a67b9'
+ '9303951a81911d4f5de58c40b76cfe392ac69f007a66c99e492816a624081096'
'SKIP'
- 'abc20251d9becc566e46ff0fca77074eca9de5d119d2dbccb7d9c933b2d59979'
- '7db1c60b0a44e588f31bad6003bad5997ec7761d9f39590c7e07670a24fbeaa4'
- '9e75777afb39b6c3d1886b18370df883e6d283c1bdf299690ac3d516ff5af4fd'
- '01b3c73adcf5fbf97a2c5b91d30c3c0a1c4ee8dce60b5718a74c99f49c673566'
- 'bb97616b299b7c569e8a886a729493b67f22d06680a84d0bc4581fa062d62662'
- 'f03aee1273e0c349411cb1bf21983c5358b27f5f370a132b2cce05d3e56d18a9'
- 'd500fedf8332234c724a1075f69ceaa743d17e7fb73be70b62dee897f75f86f5'
- 'cda19e0f819f5475172aed8c231b7c8964f64f582d993f1cf7fa8b14d0d95cae')
+ 'd09937cbca4f408dbcde270e465bdfe0589a0b41ed07d260a596a38fe6cca987'
+ 'cc1f1b5026b373da4a5c2e8c82bc2b0f8a20e295353c201579140a04f2452545'
+ 'f68d382f9d5b9948cc0e7062290e1b26d7c3c7e4ba270fda0bd632c24465a40b'
+ '658f619cd11676996919ef290934cfc809db5d0fa35a1ebc475d3ebb59253201'
+ 'f7bf7a7cf676571f48c92fc858ddd67cc395105ae633c3d6e5386a4a5c848d81'
+ '939c11540b47f02706f3cff1b76b84a13b4dab9cae438632d4b685b16ed8249e'
+ 'db830e53d451c54f84917b663671a6cc9414b043064cdf1a17369c198abee9dd'
+ 'ef21f0524fdd559389529bd05b56a3b89642fb10b74de709153d1b3c2e21c126'
+ '9f915fedf2cf03eccfed9025d3883a1158531203a676060a2eae5809ec4989ce'
+ 'bbbdd20f4a933ae988e713de5ac3ad08bd453e4e3dfa4cdac2da483dcf2454d8')
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -111,6 +117,8 @@ prepare() {
if [ "${CARCH}" = "armv7h" ]; then
# RCN patch (CM3 firmware deblobbed)
+ # Note: features not merged into mainline kernel were removed in the RCN patch (eg. AUFS)
+ # since it are being supported by our custom kernels (eg. linux-libre-pck).
git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
# ALARM patches
@@ -122,6 +130,8 @@ prepare() {
patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch"
patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch"
patch -p1 -i "${srcdir}/0008-USB-armory-support.patch"
+ patch -p1 -i "${srcdir}/0009-Revert-stmmac-Fix-eth0-No-PHY-found-regression.patch"
+ patch -p1 -i "${srcdir}/0010-stmmac-fix-MDIO-settings.patch"
fi
# add freedo as boot logo
diff --git a/config.armv7h b/config.armv7h
index 2a1b9260033d..09cdae6797d9 100644
--- a/config.armv7h
+++ b/config.armv7h
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-gnu-1 Kernel Configuration
+# Linux/arm 4.5.1-gnu-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3314,10 +3314,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_OMAP is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_8250_OMAP=y
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
# CONFIG_SERIAL_8250_MID is not set
+# CONFIG_SERIAL_8250_MOXA is not set
CONFIG_SERIAL_OF_PLATFORM=y
#
@@ -3345,8 +3345,7 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_CONSOLE_POLL=y
# CONFIG_SERIAL_JSM is not set
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
+# CONFIG_SERIAL_OMAP is not set
# CONFIG_SERIAL_SCCNXP is not set
# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_BCM63XX is not set
@@ -3363,6 +3362,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
# CONFIG_SERIAL_ST_ASC is not set
# CONFIG_SERIAL_STM32 is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
CONFIG_SERIAL_MCTRL_GPIO=y
# CONFIG_TTY_PRINTK is not set
CONFIG_HVC_DRIVER=y
@@ -6428,13 +6428,6 @@ CONFIG_TSL2583=m
CONFIG_TSL2x7x=m
#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
-
-#
# Active energy metering IC
#
CONFIG_ADE7753=m
@@ -6455,7 +6448,6 @@ CONFIG_AD2S1210=m
#
# Triggers - standalone
#
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_XGI is not set
@@ -6530,7 +6522,9 @@ CONFIG_FB_TFT_RA8875=m
CONFIG_FB_TFT_S6D02A1=m
CONFIG_FB_TFT_S6D1121=m
CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1325=m
CONFIG_FB_TFT_SSD1331=m
CONFIG_FB_TFT_SSD1351=m
CONFIG_FB_TFT_ST7735R=m
@@ -6788,7 +6782,9 @@ CONFIG_NAU7802=m
CONFIG_PALMAS_GPADC=m
CONFIG_ROCKCHIP_SARADC=m
CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8688=m
CONFIG_TI_AM335X_ADC=m
CONFIG_TWL4030_MADC=m
@@ -6805,6 +6801,7 @@ CONFIG_AD8366=m
#
# Chemical Sensors
#
+CONFIG_ATLAS_PH_SENSOR=m
CONFIG_IAQCORE=m
CONFIG_VZ89X=m
@@ -6837,6 +6834,7 @@ CONFIG_AD5504=m
CONFIG_AD5624R_SPI=m
CONFIG_AD5686=m
CONFIG_AD5755=m
+CONFIG_AD5761=m
CONFIG_AD5764=m
CONFIG_AD5791=m
CONFIG_AD7303=m
@@ -6845,6 +6843,7 @@ CONFIG_MAX517=m
CONFIG_MAX5821=m
CONFIG_MCP4725=m
CONFIG_MCP4922=m
+CONFIG_VF610_DAC=m
#
# IIO dummy driver
@@ -6883,8 +6882,14 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
CONFIG_ITG3200=m
#
-# Health sensors
+# Health Sensors
#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
CONFIG_MAX30100=m
#
@@ -6903,6 +6908,8 @@ CONFIG_ADIS16400=m
CONFIG_ADIS16480=m
CONFIG_KMX61=m
CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
CONFIG_IIO_ADIS_LIB=m
CONFIG_IIO_ADIS_LIB_BUFFER=y
@@ -6947,6 +6954,9 @@ CONFIG_MMC35240=m
CONFIG_IIO_ST_MAGN_3AXIS=m
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
#
# Inclinometer sensors
@@ -6957,7 +6967,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
#
# Triggers - standalone
#
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
+CONFIG_IIO_HRTIMER_TRIGGER=m
CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_SYSFS_TRIGGER=m
@@ -6965,6 +6975,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
# Digital potentiometers
#
CONFIG_MCP4531=m
+CONFIG_TPL0102=m
#
# Pressure sensors
@@ -6972,6 +6983,8 @@ CONFIG_MCP4531=m
CONFIG_BMP280=m
CONFIG_HID_SENSOR_PRESS=m
CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
CONFIG_MPL3115=m
CONFIG_MS5611=m
CONFIG_MS5611_I2C=m