From 3f9bc4e1a94ecadb77de5c29ac2d0d9784c57d5a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 5 Sep 2018 17:03:57 +0200 Subject: [PATCH 1/5] Slice: move linux patches to device specific directories These patches are Slice specific hacks and should not be applied to the RPi kernels. Signed-off-by: Matthias Reichl --- .../linux/linux-04-rtc-pcf8523-c.patch | 0 .../patches/linux/linux-05-cs4265-c.patch | 0 .../linux/linux-04-rtc-pcf8523-c.patch | 17 ++++++++++++++++ .../patches/linux/linux-05-cs4265-c.patch | 20 +++++++++++++++++++ 4 files changed, 37 insertions(+) rename projects/RPi/{ => devices/Slice}/patches/linux/linux-04-rtc-pcf8523-c.patch (100%) rename projects/RPi/{ => devices/Slice}/patches/linux/linux-05-cs4265-c.patch (100%) create mode 100644 projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch create mode 100644 projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch diff --git a/projects/RPi/patches/linux/linux-04-rtc-pcf8523-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch similarity index 100% rename from projects/RPi/patches/linux/linux-04-rtc-pcf8523-c.patch rename to projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch diff --git a/projects/RPi/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch similarity index 100% rename from projects/RPi/patches/linux/linux-05-cs4265-c.patch rename to projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch diff --git a/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch b/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch new file mode 100644 index 0000000000..da7593ed7e --- /dev/null +++ b/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch @@ -0,0 +1,17 @@ +--- a/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:16:30.259771931 +0100 ++++ b/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:21:29.762638800 +0100 +@@ -291,7 +291,13 @@ static int pcf8523_probe(struct i2c_clie + if (!pcf) + return -ENOMEM; + +- err = pcf8523_select_capacitance(client, true); ++ if (of_property_read_bool(client->dev.of_node, "nxp,xtalcap-7pf")) { ++ printk(KERN_ERR "PCF8523 - set 7pF crystal load"); ++ err = pcf8523_select_capacitance(client, false); ++ } else { ++ printk(KERN_ERR "PCF8523 - set 12pF crystal load"); ++ err = pcf8523_select_capacitance(client, true); ++ } + if (err < 0) + return err; + diff --git a/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch new file mode 100644 index 0000000000..51939528a9 --- /dev/null +++ b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch @@ -0,0 +1,20 @@ +--- linux-4.4-rc7-old/sound/soc/codecs/cs4265.c 2016-01-13 20:56:05.637652775 +0000 ++++ linux-4.4-rc7/sound/soc/codecs/cs4265.c 2016-01-17 11:21:16.977652775 +0000 +@@ -157,7 +157,7 @@ + SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, + 3, 1, 0), + SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), +- SOC_SINGLE("MMTLR Data Switch", 0, ++ SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, + 1, 1, 0), + SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), + SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), +@@ -199,8 +199,6 @@ + SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_IN("DIN2", NULL, 0, + SND_SOC_NOPM, 0, 0), +- SND_SOC_DAPM_AIF_IN("TXIN", NULL, 0, +- CS4265_SPDIF_CTL2, 5, 1), + + SND_SOC_DAPM_OUTPUT("LINEOUTL"), + SND_SOC_DAPM_OUTPUT("LINEOUTR"), From 046adcced5e31ca492e9979786735ad77d4d28ed Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 5 Sep 2018 17:11:42 +0200 Subject: [PATCH 2/5] linux (RPi): update to 4.14.68 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d69cf8faa8..c3b161f581 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -41,8 +41,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="0f937c8dc3201ebffa6c617c616fd7c65db65959" # 4.14.67 - PKG_SHA256="2d839aebdeebda096a40180378605ad196c98bf8bf997e55fb831ca8b331bf39" + PKG_VERSION="8c8666ff6c1254d325cfa300d16f9928b3f31fc0" # 4.14.68 + PKG_SHA256="f2122a6a0cd5fa2dd4ee6028cdb060dcb4a43a2abe57c44c4ad5ddbc60a2f59a" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From e237cbdea2253ab032218e0fcd4cfd7312ab55f0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 5 Sep 2018 17:12:47 +0200 Subject: [PATCH 3/5] Slice: fix cs4265 patch after update to kernel 4.14.68 Drop a hunk which was included in RPi kernel 4.14.68 Signed-off-by: Matthias Reichl --- .../devices/Slice/patches/linux/linux-05-cs4265-c.patch | 9 --------- .../devices/Slice3/patches/linux/linux-05-cs4265-c.patch | 9 --------- 2 files changed, 18 deletions(-) diff --git a/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch index 51939528a9..b3221302bd 100644 --- a/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch +++ b/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch @@ -1,14 +1,5 @@ --- linux-4.4-rc7-old/sound/soc/codecs/cs4265.c 2016-01-13 20:56:05.637652775 +0000 +++ linux-4.4-rc7/sound/soc/codecs/cs4265.c 2016-01-17 11:21:16.977652775 +0000 -@@ -157,7 +157,7 @@ - SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, - 3, 1, 0), - SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), -- SOC_SINGLE("MMTLR Data Switch", 0, -+ SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, - 1, 1, 0), - SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), - SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), @@ -199,8 +199,6 @@ SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("DIN2", NULL, 0, diff --git a/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch index 51939528a9..b3221302bd 100644 --- a/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch +++ b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch @@ -1,14 +1,5 @@ --- linux-4.4-rc7-old/sound/soc/codecs/cs4265.c 2016-01-13 20:56:05.637652775 +0000 +++ linux-4.4-rc7/sound/soc/codecs/cs4265.c 2016-01-17 11:21:16.977652775 +0000 -@@ -157,7 +157,7 @@ - SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, - 3, 1, 0), - SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), -- SOC_SINGLE("MMTLR Data Switch", 0, -+ SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, - 1, 1, 0), - SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), - SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), @@ -199,8 +199,6 @@ SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("DIN2", NULL, 0, From ca2d4b9c49b953e6b0aaac59a4393136bbd47f27 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 13 Sep 2018 00:03:24 +0200 Subject: [PATCH 4/5] linux (RPi): update to 4.14.69 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c3b161f581..43019dc807 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -41,8 +41,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="8c8666ff6c1254d325cfa300d16f9928b3f31fc0" # 4.14.68 - PKG_SHA256="f2122a6a0cd5fa2dd4ee6028cdb060dcb4a43a2abe57c44c4ad5ddbc60a2f59a" + PKG_VERSION="27e84c625ebbdfccf78220f2f90995a050c7b64a" # 4.14.69 + PKG_SHA256="fd75cc94436ed88133d1e3567473fd0e9a3412497d6b335de6ec953968e22fcc" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 9a4d9a8be3f94e2232a4f282f5a13bffa5c6ac72 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Sep 2018 23:17:52 +0100 Subject: [PATCH 5/5] RPi: update to firmware 70c60c5 --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 65ae36c796..f4518bbbd1 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="ec3f85659f9908b011b73dd6cad4ef2b06d8b640" -PKG_SHA256="039cd758116a6f1c34c30184864889fadc6a08273b3b2e7d8320d4e335375774" +PKG_VERSION="70c60c5c57d9d639fbd92276f18558ada51b7c53" +PKG_SHA256="a7acec466e98eb80058d7fcf7a77c265460dcbfa2aef73dc9dd18c1f3fda3874" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 48dbca7fe3..ccc47b049f 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="ec3f85659f9908b011b73dd6cad4ef2b06d8b640" -PKG_SHA256="051a77eaafd47b66972b7f290e8fe4bddf64a3430104b08c9aa98e98e02a5791" +PKG_VERSION="70c60c5c57d9d639fbd92276f18558ada51b7c53" +PKG_SHA256="cd5a035bcf56f44e8d957b27ebf0d4d615f9308902464b1dc1615f42ffd16680" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com"