From d0f12e6a1aa6b9b727b48d659255bc9228617ed5 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 17 Oct 2017 00:34:48 +0000 Subject: [PATCH] core/linux-armv7-rc to 4.14.rc5-1 --- ...ags-add-support-for-Marvell-s-u-boot.patch | 6 ++-- ...trieve-MAC-addresses-from-Marvell-bo.patch | 8 ++--- .../0003-SMILE-Plug-device-tree-file.patch | 6 ++-- .../0004-fix-mvsdio-eMMC-timing.patch | 6 ++-- ...ow-mac-address-to-be-set-as-a-parame.patch | 7 ++--- ...-set-default-cubietruck-led-triggers.patch | 6 ++-- ...d-set-higher-minimum-buck2-regulator.patch | 6 ++-- .../0008-disable-USB3-port-on-ODROID-XU.patch | 6 ++-- ...9-ARM-dove-enable-ethernet-on-D3Plug.patch | 6 ++-- ...-drm-tegra-trace-Fix-path-to-include.patch | 30 ------------------- core/linux-armv7-rc/PKGBUILD | 29 ++++++++---------- core/linux-armv7-rc/config | 27 ++++++++++------- 12 files changed, 57 insertions(+), 86 deletions(-) delete mode 100644 core/linux-armv7-rc/0010-drm-tegra-trace-Fix-path-to-include.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 039e97fb3..de6f5c6d6 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 93380eda20be4157dd6133b010b1f6576204f3f9 Mon Sep 17 00:00:00 2001 +From 043141070b13388a29ce9f73d1378db6fee9ea00 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. @@ -47,5 +47,5 @@ index 979ff4016404..d1d0c1950fa4 100644 }; -- -2.14.1 +2.14.2 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 7b22732b0..0034af55f 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 f4ea9833a8f541786c87516d4fea54bae26920c2 Mon Sep 17 00:00:00 2001 +From 278772450de941a06782c07a43e7511b6bdbf430 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 @@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644 } -- -2.14.1 +2.14.2 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 9986925cc..83ee1dadc 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 bd3324b8727dc28a4a385ebe6bb5b438ec0335d0 Mon Sep 17 00:00:00 2001 +From db678c33357f6349df02b0f4979fc8c9ee365697 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. @@ -205,5 +205,5 @@ index 000000000000..d01308ab848b + }; +}; -- -2.14.1 +2.14.2 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 d58d0040d..a0f40efa4 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 bb5c4d7c21f8c94d8f3397f4b94cb3de3a4beb7b Mon Sep 17 00:00:00 2001 +From 1b4696de4df2ebd2d2a0da05a284705e11427e06 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. @@ -34,5 +34,5 @@ index 58d74b8d6c79..c9715530d676 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.14.1 +2.14.2 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 d83c10ce7..516c66b80 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 eb62494bf2ffa2462b6a7c2c75600580ad33658d Mon Sep 17 00:00:00 2001 +From ffd117b73c6a0185d3089ec9abee06122e88eecb 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 ++++++++++++++++++++++++++++++++++++++++++++++ @@ -92,5 +91,5 @@ index 309b88acd3d0..7bc9feb891a1 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.14.1 +2.14.2 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 04fddc303..df27ce380 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 59311cef8b24abeac61467982ddb326b260100fe Mon Sep 17 00:00:00 2001 +From e2567ba6352c663819406b73d4aa3aa31ad4ca06 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 --- @@ -29,5 +29,5 @@ index 852a0aa24dce..82c963629a55 100644 }; -- -2.14.1 +2.14.2 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 37550554b..3deb7f825 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 0d3b065a7f8d1018c65db3007a34fff1171c630c Mon Sep 17 00:00:00 2001 +From dc9e6fcc9675737091fb99550b361aea81a94b90 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. @@ -26,5 +26,5 @@ index 102acd78be15..5b65992e5667 100644 regulator-always-on; regulator-boot-on; -- -2.14.1 +2.14.2 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 403ecee1a..dec2ae607 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 8c7b63483f5573435fdb42476fe9413b0960ac36 Mon Sep 17 00:00:00 2001 +From c5b29f6344d0e5da1d5ef64e4e7e5ed4937541be 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. @@ -23,5 +23,5 @@ index c4de1353e5df..f80fa58995c5 100644 &usbdrd_dwc3_1 { -- -2.14.1 +2.14.2 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 7830d2d67..d5efc4aeb 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 beadb0c4a18e303bf3adc3e07479bab5d668afaa Mon Sep 17 00:00:00 2001 +From 43fc6d48884feb1d121bef1dd64ab444b5c46169 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 --- @@ -27,5 +27,5 @@ index e88ff83f1dec..5004f09d76b7 100644 /* Samsung M8G2F eMMC */ &sdio0 { -- -2.14.1 +2.14.2 diff --git a/core/linux-armv7-rc/0010-drm-tegra-trace-Fix-path-to-include.patch b/core/linux-armv7-rc/0010-drm-tegra-trace-Fix-path-to-include.patch deleted file mode 100644 index b34fa492e..000000000 --- a/core/linux-armv7-rc/0010-drm-tegra-trace-Fix-path-to-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bbd35007962a22912557820b2b8825782ed96222 Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Wed, 23 Aug 2017 19:13:26 +0200 -Subject: [PATCH 10/10] drm/tegra: trace: Fix path to include - -The TRACE_INCLUDE_FILE macro needs to specify the path relative to the -define_trace.h header rather than relative to the file defining it. - -Reported-by: Dmitry Osipenko -Signed-off-by: Thierry Reding -Tested-by: Dmitry Osipenko ---- - drivers/gpu/drm/tegra/trace.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/tegra/trace.h b/drivers/gpu/drm/tegra/trace.h -index e9b7cdad5c4c..5a1ab4046e92 100644 ---- a/drivers/gpu/drm/tegra/trace.h -+++ b/drivers/gpu/drm/tegra/trace.h -@@ -63,6 +63,6 @@ DEFINE_EVENT(register_access, sor_readl, - - /* This part must be outside protection */ - #undef TRACE_INCLUDE_PATH --#define TRACE_INCLUDE_PATH . -+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/tegra - #define TRACE_INCLUDE_FILE trace - #include --- -2.14.1 - diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index d9dad5c3b..44c7b4f9c 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=4 _rcver=4.14 -_rcrel=2 +_rcrel=5 _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-drm-tegra-trace-Fix-path-to-include.patch' 'config' 'kernel.its' 'kernel.keyblock' 'kernel_data_key.vbprivk' 'linux.preset' '99-linux.hook') -md5sums=('f795ac9a3dc666344cd1502b40d6545f' - '932ca12e7b9eb31da29709f5eef220b8' - '8e34ac6d3e50a94e1decf3b269cd3ce3' - '2165eb00619d71aa6d91ba42dc88db8e' - '5080b51044124764d0cb88bc18a50f6e' - '3d598c1cf796c78ddd00da87a4d7cab5' - 'fd3dba6efc61aa15dda4d4c262e6b027' - '74fa0965af249e78518c8cfe0f12cf66' - '46217c2d4fee7a9a00764cd93a54cb91' - '692c4c74970a77a1073b8d693d4ae9b6' - '5afe7344adbc163511425b85b88e7077' - '14633a85bc261c3b014f0d11450902c4' - 'd3590a9d61a9fb2263c115dbf812ddc6' +md5sums=('f8bca0a469b08821c6824c3a4647c3ac' + 'b64b70df513660b2d7924b7f089b29bd' + 'a9a96c56f83a0190a55511bf340774e1' + '0783eff6ee3c3e69d860468ea350a091' + '98c229baab4561144eb37210a20283a1' + 'a5a7083d247fd3827fe22b06b78f909c' + '33067cc37863c18b4bc1820020c83859' + '2dbc0a7f497085917711f3a0cc6aa66e' + '1073c8192dc512674ccbf923334c5b79' + 'c1712dcecd00d08884cf2e078159b023' + '90d0639b90925ad2e79cc26a7ec51e58' + 'a5202c8cbdef390680581436b06799c4' '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-drm-tegra-trace-Fix-path-to-include.patch cat "${srcdir}/config" > ./.config diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index acdba3bb5..6f262a3f2 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.0-rc2-1 Kernel Configuration +# Linux/arm 4.14.0-rc5-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1744,7 +1744,6 @@ CONFIG_BT_6LOWPAN=m # CONFIG_BT_LEDS is not set # CONFIG_BT_SELFTEST is not set CONFIG_BT_DEBUGFS=y -CONFIG_BT_LEGACY_IOCTL=y # # Bluetooth device drivers @@ -2847,8 +2846,12 @@ CONFIG_NET_VENDOR_VIA=y # CONFIG_VIA_RHINE is not set CONFIG_VIA_VELOCITY=m CONFIG_NET_VENDOR_WIZNET=y -# CONFIG_WIZNET_W5100 is not set +CONFIG_WIZNET_W5100=m # CONFIG_WIZNET_W5300 is not set +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_WIZNET_W5100_SPI=m CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=m CONFIG_NET_VENDOR_SYNOPSYS=y @@ -4050,6 +4053,7 @@ CONFIG_BATTERY_DA9052=m CONFIG_CHARGER_AXP20X=m CONFIG_BATTERY_AXP20X=m CONFIG_AXP20X_POWER=y +CONFIG_AXP288_CHARGER=m CONFIG_AXP288_FUEL_GAUGE=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set @@ -4569,6 +4573,7 @@ CONFIG_REGULATOR_VEXPRESS=y CONFIG_REGULATOR_WM8994=y CONFIG_CEC_CORE=m CONFIG_CEC_NOTIFIER=y +CONFIG_CEC_PIN=y CONFIG_RC_CORE=y CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -5354,6 +5359,7 @@ CONFIG_DRM_ARMADA=m # CONFIG_DRM_RCAR_DW_HDMI is not set CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I_HDMI=m +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_OMAP=m @@ -5390,7 +5396,7 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m # CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set CONFIG_DRM_TILCDC=m -CONFIG_DRM_TILCDC_SLAVE_COMPAT=y +# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m CONFIG_DRM_VIRTIO_GPU=m @@ -6511,7 +6517,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MMC_MXC=y CONFIG_MMC_TIFM_SD=m CONFIG_MMC_MVSDIO=y -# CONFIG_MMC_SPI is not set +CONFIG_MMC_SPI=y CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=y CONFIG_MMC_DW=y @@ -7344,7 +7350,7 @@ CONFIG_EXTCON=y # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set -# CONFIG_EXTCON_AXP288 is not set +CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_GPIO=y CONFIG_EXTCON_MAX14577=y CONFIG_EXTCON_MAX3355=y @@ -7800,7 +7806,6 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_ATH79 is not set # CONFIG_RESET_BERLIN is not set -# CONFIG_RESET_HSDK_V1 is not set CONFIG_RESET_IMX7=y # CONFIG_RESET_LANTIQ is not set # CONFIG_RESET_LPC18XX is not set @@ -8359,6 +8364,7 @@ CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_DMA_API_DEBUG is not set # # Runtime Testing @@ -8381,17 +8387,16 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_TEST_UUID is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set -# CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set -# CONFIG_MEMTEST is not set # CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_TEST_KMOD is not set +# CONFIG_MEMTEST is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_KGDB=y @@ -8679,7 +8684,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set # CONFIG_CRC4 is not set -CONFIG_CRC7=m +CONFIG_CRC7=y CONFIG_LIBCRC32C=y # CONFIG_CRC8 is not set CONFIG_XXHASH=y