From f919b7bcfb7066c4c46564af585d41dcdd8e3f8c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 23 Jan 2018 02:33:42 +0000 Subject: [PATCH] core/linux-armv7-rc to 4.15.rc9-1 --- ...ags-add-support-for-Marvell-s-u-boot.patch | 4 +- ...trieve-MAC-addresses-from-Marvell-bo.patch | 6 +- .../0003-SMILE-Plug-device-tree-file.patch | 4 +- .../0004-fix-mvsdio-eMMC-timing.patch | 4 +- ...ow-mac-address-to-be-set-as-a-parame.patch | 5 +- ...-set-default-cubietruck-led-triggers.patch | 4 +- ...d-set-higher-minimum-buck2-regulator.patch | 4 +- .../0008-disable-USB3-port-on-ODROID-XU.patch | 4 +- ...9-ARM-dove-enable-ethernet-on-D3Plug.patch | 4 +- ...phys-references-to-usb-nop-xceiv-dev.patch | 81 ------------------- core/linux-armv7-rc/PKGBUILD | 29 +++---- 11 files changed, 32 insertions(+), 117 deletions(-) delete mode 100644 core/linux-armv7-rc/0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch diff --git a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index b8d21da9c..44147d56d 100644 --- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,7 +1,7 @@ -From 0b5434bba0eebdd9035b0d0184259006b4d5b8a0 Mon Sep 17 00:00:00 2001 +From 3d479a6cad6ee5f618ab002a35688ac33ef7b9ac Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot +Subject: [PATCH 1/9] 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. diff --git a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index 94e843c2d..d4ea8ae81 100644 --- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,8 +1,8 @@ -From 0f02774278458184fe86e3400a128a390ca57ba8 Mon Sep 17 00:00:00 2001 +From 8ec093bead331ec76f615d82faeac4c0e9345a34 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell - boot loader +Subject: [PATCH 2/9] 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 diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch index 7184e8e1b..244b6c619 100644 --- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch @@ -1,7 +1,7 @@ -From 148f1387b852abf522bbcc6b770b663d6807012b Mon Sep 17 00:00:00 2001 +From 1db539cd4527e19bd48e08e5cb608373b3ccabd0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 -Subject: [PATCH 03/10] SMILE Plug device tree file +Subject: [PATCH 3/9] 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. diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch index 2be0f4439..114698878 100644 --- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch @@ -1,7 +1,7 @@ -From c018608caafda694294105dcacf4c0cba5a3b14b Mon Sep 17 00:00:00 2001 +From 854e80dbac1cb0a665dc856fdf918085d7d599ae Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 04/10] fix mvsdio eMMC timing +Subject: [PATCH 4/9] 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. diff --git a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index de844bcd4..c47cbf2c2 100644 --- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,8 +1,7 @@ -From 6c29f065fb016ebe3211b12a3251aeaef7e6c46c Mon Sep 17 00:00:00 2001 +From 86bded5995f2dd4fab28d7b8d63a4caa4db107ed Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a - parameter +Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch index 980e0a3b8..9e78cf6f6 100644 --- a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch @@ -1,7 +1,7 @@ -From 3df85aa11ccdf4a43e8869ca48d2a5e76edc46f0 Mon Sep 17 00:00:00 2001 +From 4b8a8edc859c1ce4131958c798fbfad5efff90dd Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 06/10] set default cubietruck led triggers +Subject: [PATCH 6/9] set default cubietruck led triggers Signed-off-by: Kevin Mihelich --- diff --git a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index 937503e06..30ca22378 100644 --- a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,7 +1,7 @@ -From 0ce1c4867c66f0ee470904e9090a6c3d207b0b25 Mon Sep 17 00:00:00 2001 +From f11286dd3d8513aaa1bb98f4a5eb3b167b3156a1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 07/10] exynos4412-odroid: set higher minimum buck2 regulator +Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator voltage Set a higher minimum voltage to help reboot issue. diff --git a/core/linux-armv7-rc/0008-disable-USB3-port-on-ODROID-XU.patch b/core/linux-armv7-rc/0008-disable-USB3-port-on-ODROID-XU.patch index 5a12c85a5..692591b3d 100644 --- a/core/linux-armv7-rc/0008-disable-USB3-port-on-ODROID-XU.patch +++ b/core/linux-armv7-rc/0008-disable-USB3-port-on-ODROID-XU.patch @@ -1,7 +1,7 @@ -From 7de44316a3c5f6c6121101fdbc3d28f8f90224ea Mon Sep 17 00:00:00 2001 +From 7468a7c2c552024e2b243fe655b953e292cb111e Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 25 Feb 2017 19:39:51 -0700 -Subject: [PATCH 08/10] disable USB3 port on ODROID-XU +Subject: [PATCH 8/9] disable USB3 port on ODROID-XU Ports report over-current condition and are non-operable. diff --git a/core/linux-armv7-rc/0009-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7-rc/0009-ARM-dove-enable-ethernet-on-D3Plug.patch index 758bb39d5..afd91bfb0 100644 --- a/core/linux-armv7-rc/0009-ARM-dove-enable-ethernet-on-D3Plug.patch +++ b/core/linux-armv7-rc/0009-ARM-dove-enable-ethernet-on-D3Plug.patch @@ -1,7 +1,7 @@ -From d1950bd64d45bb3e2dbca710b5aa68dbd3225ca3 Mon Sep 17 00:00:00 2001 +From ecfc4a9cba2d67cd44f9a66b0777d44dd711c498 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 7 May 2017 13:32:25 -0600 -Subject: [PATCH 09/10] ARM: dove: enable ethernet on D3Plug +Subject: [PATCH 9/9] ARM: dove: enable ethernet on D3Plug Signed-off-by: Kevin Mihelich --- diff --git a/core/linux-armv7-rc/0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch b/core/linux-armv7-rc/0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch deleted file mode 100644 index 47dbdf6c1..000000000 --- a/core/linux-armv7-rc/0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch +++ /dev/null @@ -1,81 +0,0 @@ -From a8a2aa5970ad5d692db580f616ce4a3a1e7a7d18 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Fri, 12 Jan 2018 11:12:05 +0100 -Subject: [PATCH 10/10] phy: work around 'phys' references to usb-nop-xceiv - devices - -Stefan Wahren reports a problem with a warning fix that was merged -for v4.15: we had lots of device nodes with a 'phys' property pointing -to a device node that is not compliant with the binding documented in -Documentation/devicetree/bindings/phy/phy-bindings.txt - -This generally works because USB HCD drivers that support both the generic -phy subsystem and the older usb-phy subsystem ignore most errors from -phy_get() and related calls and then use the usb-phy driver instead. - -However, it turns out that making the usb-nop-xceiv device compatible with -the generic-phy binding changes the phy_get() return code from -EINVAL to --EPROBE_DEFER, and the dwc2 usb controller driver for bcm2835 now returns --EPROBE_DEFER from its probe function rather than ignoring the failure, -breaking all USB support on raspberry-pi when CONFIG_GENERIC_PHY is -enabled. The same code is used in the dwc3 driver and the usb_add_hcd() -function, so a reasonable assumption would be that many other platforms -are affected as well. - -I have reviewed all the related patches and concluded that "usb-nop-xceiv" -is the only USB phy that is affected by the change, and since it is by far -the most commonly referenced phy, all the other USB phy drivers appear -to be used in ways that are are either safe in DT (they don't use the -'phys' property), or in the driver (they already ignore -EPROBE_DEFER -from generic-phy when usb-phy is available). - -To work around the problem, this adds a special case to _of_phy_get() -so we ignore any PHY node that is compatible with "usb-nop-xceiv", -as we know that this can never load no matter how much we defer. In the -future, we might implement a generic-phy driver for "usb-nop-xceiv" -and then remove this workaround. - -Since we generally want older kernels to also want to work with the -fixed devicetree files, it would be good to backport the patch into -stable kernels as well (3.13+ are possibly affected), even though they -don't contain any of the patches that may have caused regressions. - -Fixes: 014d6da6cb25 ARM: dts: bcm283x: Fix DTC warnings about missing phy-cells -Fixes: c5bbf358b790 arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv -Fixes: 44e5dced2ef6 arm: dts: marvell: Add missing #phy-cells to usb-nop-xceiv -Fixes: f568f6f554b8 ARM: dts: omap: Add missing #phy-cells to usb-nop-xceiv -Fixes: d745d5f277bf ARM: dts: imx51-zii-rdu1: Add missing #phy-cells to usb-nop-xceiv -Fixes: 915fbe59cbf2 ARM: dts: imx: Add missing #phy-cells to usb-nop-xceiv -Link: https://marc.info/?l=linux-usb&m=151518314314753&w=2 -Link: https://patchwork.kernel.org/patch/10158145/ -Cc: stable@vger.kernel.org -Cc: Stefan Wahren -Cc: Felipe Balbi -Cc: Eric Anholt -Tested-by: Hans Verkuil -Acked-by: Kishon Vijay Abraham I -Signed-off-by: Arnd Bergmann -Tested-by: Stefan Wahren -Acked-by: Rob Herring ---- - drivers/phy/phy-core.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c -index b4964b067aec..8f6e8e28996d 100644 ---- a/drivers/phy/phy-core.c -+++ b/drivers/phy/phy-core.c -@@ -410,6 +410,10 @@ static struct phy *_of_phy_get(struct device_node *np, int index) - if (ret) - return ERR_PTR(-ENODEV); - -+ /* This phy type handled by the usb-phy subsystem for now */ -+ if (of_device_is_compatible(args.np, "usb-nop-xceiv")) -+ return ERR_PTR(-ENODEV); -+ - mutex_lock(&phy_provider_mutex); - phy_provider = of_phy_provider_lookup(args.np); - if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) { --- -2.15.0 - diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index 4a9e14b0f..1465bef96 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=4 _rcver=4.15 -_rcrel=8 +_rcrel=9 _rcnrel=armv7-x0 pkgbase=linux-armv7-rc @@ -29,26 +29,24 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' '0008-disable-USB3-port-on-ODROID-XU.patch' '0009-ARM-dove-enable-ethernet-on-D3Plug.patch' - '0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch' 'config' 'kernel.its' 'kernel.keyblock' 'kernel_data_key.vbprivk' 'linux.preset' '99-linux.hook') -md5sums=('ad8277e87079747f0e352f1fba151d38' - '51d94dedeccf5cd50b730f7a74095508' - '13e49c73b6f8ada432b295ee3942cfbc' - 'd7c27c5fb5af85b5f964cc4e62b498b2' - '3f3c1b782f6f39bed4b56b63e84436bd' - 'db48b4221f89e01c745b8a556bec4a4d' - '35f0c38a1a6705aec91907422fea125b' - 'fbcc64d159c6d385cc9bea9d8517c816' - 'd8ef99d2fbab82b3f611ac168f2ee079' - '61fa5c2852492dc079e20da535e59811' - '04a7206ed51c3359154f5acaff0b95f4' - '732d220643981cbcd77b8f499667a517' - '6dba81bd6483c3d06e2a594b60fe4589' +md5sums=('e2fab4831e54e1a188a68d431e63f540' + 'a4e873983a34620a0bfef176699182bd' + '7fe0862ef33a0c05a7cfc586a4f1dfe1' + '6a4f027a2558741fa932b2bbc0de27eb' + 'd5759bba814aaf3fe0ec4d230cca28e9' + '2bb3aff035d47e86654c4e17cf8b220a' + '1681a4a5f47477ab6e02b0f17021482f' + '13878f989bf23cf92ec3136121948fa4' + '3ae78bd2c88a5beaf85d3f9ff53289d0' + 'd7aee2b9e035fbc7e8ed2142251cba05' + 'ce8d5eed57e2841ae3021dd375b9ca8a' + 'd4a71f37c2df33af10c4e5a206a0f6e1' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -72,7 +70,6 @@ prepare() { git apply ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch git apply ../0008-disable-USB3-port-on-ODROID-XU.patch git apply ../0009-ARM-dove-enable-ethernet-on-D3Plug.patch - git apply ../0010-phy-work-around-phys-references-to-usb-nop-xceiv-dev.patch cat "${srcdir}/config" > ./.config