mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
Merge pull request #3743 from MilhouseVH/linux5.2.7+
linux (Mainline/RPi): update to linux-5.2.13
This commit is contained in:
Matthias Reichl
GitHub
commit
bff2c32018
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="94bae1b0a88a7fcaf171a4c91b9e1fdb03aad9ae"
|
||||
PKG_SHA256="62ee04722ccf8c8e9169d914b1fed318052e59587ddd8cb8605bd2c3a2b87c16"
|
||||
PKG_VERSION="e2e17cd035fb8cd1a0b74d35d6615d7e267e408b"
|
||||
PKG_SHA256="0df42b970163d3be28aaece497dc5bb56d5bb4214f1d1af1b9be53558014aa4a"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -23,14 +23,14 @@ case "$LINUX" in
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="a3dfdf36d13214285bf7d828e0a87b1a2b5bd92c" # 5.2.6
|
||||
PKG_SHA256="9b28d8e3b6206d66a81f5fe2d61c027e3099256cc7de2452fb9082f5e231a08d"
|
||||
PKG_VERSION="1eb8d4d37ec7330414020773806497ccd23e0203" # 5.2.13
|
||||
PKG_SHA256="1e4843f3e1cbcbbf081de1729b679c648ae13c951372e118021f36d436eae96d"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="5.2.6"
|
||||
PKG_SHA256="be105afb7394dce98953bcea79c2ce02345587eee4638fce9a5f5a1e7e7b1ff2"
|
||||
PKG_VERSION="5.2.13"
|
||||
PKG_SHA256="17b60f55241dee4b9a2919a653de144ef1002e2de49ccf5d15225b1f07bc178a"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="94bae1b0a88a7fcaf171a4c91b9e1fdb03aad9ae"
|
||||
PKG_SHA256="23679dc76a1972bfcf8242199a3e39e5acd00224643386b000fbe2468f4cd133"
|
||||
PKG_VERSION="e2e17cd035fb8cd1a0b74d35d6615d7e267e408b"
|
||||
PKG_SHA256="999eb1881f61ee4028d362d0cae3f4846620018106ab4586fbd71b5c34fe09af"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -371,81 +371,6 @@ index 240a800217df..011924a75263 100644
|
||||
--
|
||||
2.22.0
|
||||
|
||||
From 95b579d069348a59d0fa6463a2f821089876ebfd Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Sat, 6 Jul 2019 11:07:49 +0200
|
||||
Subject: [PATCH 1/2] regulator: axp20x: fix DCDCA and DCDCD for AXP806
|
||||
|
||||
Refactoring of the driver introduced few bugs in AXP806's DCDCA and
|
||||
DCDCD regulator definitions.
|
||||
|
||||
Fix them.
|
||||
|
||||
Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
drivers/regulator/axp20x-regulator.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
|
||||
index 152053361862..c951568994a1 100644
|
||||
--- a/drivers/regulator/axp20x-regulator.c
|
||||
+++ b/drivers/regulator/axp20x-regulator.c
|
||||
@@ -240,7 +240,7 @@
|
||||
#define AXP806_DCDCA_600mV_END \
|
||||
(AXP806_DCDCA_600mV_START + AXP806_DCDCA_600mV_STEPS)
|
||||
#define AXP806_DCDCA_1120mV_START 0x33
|
||||
-#define AXP806_DCDCA_1120mV_STEPS 14
|
||||
+#define AXP806_DCDCA_1120mV_STEPS 20
|
||||
#define AXP806_DCDCA_1120mV_END \
|
||||
(AXP806_DCDCA_1120mV_START + AXP806_DCDCA_1120mV_STEPS)
|
||||
#define AXP806_DCDCA_NUM_VOLTAGES 72
|
||||
@@ -774,8 +774,8 @@ static const struct regulator_linear_range axp806_dcdcd_ranges[] = {
|
||||
AXP806_DCDCD_600mV_END,
|
||||
20000),
|
||||
REGULATOR_LINEAR_RANGE(1600000,
|
||||
- AXP806_DCDCD_600mV_START,
|
||||
- AXP806_DCDCD_600mV_END,
|
||||
+ AXP806_DCDCD_1600mV_START,
|
||||
+ AXP806_DCDCD_1600mV_END,
|
||||
100000),
|
||||
};
|
||||
|
||||
--
|
||||
2.22.0
|
||||
|
||||
From a8e790b1850f368daff2d3c35b52f8a69978be6e Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
Date: Sat, 6 Jul 2019 11:15:13 +0200
|
||||
Subject: [PATCH 2/2] regulator: axp20x: fix DCDC6 for AXP803
|
||||
|
||||
Refactoring of axp20x driver introduced a bug in AXP803's DCDC6
|
||||
regulator definition.
|
||||
|
||||
Fix it.
|
||||
|
||||
Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
---
|
||||
drivers/regulator/axp20x-regulator.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
|
||||
index c951568994a1..29b92ce521b7 100644
|
||||
--- a/drivers/regulator/axp20x-regulator.c
|
||||
+++ b/drivers/regulator/axp20x-regulator.c
|
||||
@@ -181,7 +181,7 @@
|
||||
#define AXP803_DCDC6_600mV_END \
|
||||
(AXP803_DCDC6_600mV_START + AXP803_DCDC6_600mV_STEPS)
|
||||
#define AXP803_DCDC6_1120mV_START 0x33
|
||||
-#define AXP803_DCDC6_1120mV_STEPS 14
|
||||
+#define AXP803_DCDC6_1120mV_STEPS 20
|
||||
#define AXP803_DCDC6_1120mV_END \
|
||||
(AXP803_DCDC6_1120mV_START + AXP803_DCDC6_1120mV_STEPS)
|
||||
#define AXP803_DCDC6_NUM_VOLTAGES 72
|
||||
--
|
||||
2.22.0
|
||||
|
||||
From: Ondrej Jirman <megous@megous.com>
|
||||
Subject: [PATCH v8 3/4] drm: sun4i: Add support for enabling DDC I2C bus to
|
||||
sun8i_dw_hdmi glue
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.2.0 Kernel Configuration
|
||||
# Linux/arm64 5.2.9 Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
@ -505,6 +505,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
|
||||
# CONFIG_ARM_SDE_INTERFACE is not set
|
||||
CONFIG_DMIID=y
|
||||
# CONFIG_DMI_SYSFS is not set
|
||||
# CONFIG_ISCSI_IBFT is not set
|
||||
# CONFIG_FW_CFG_SYSFS is not set
|
||||
CONFIG_QCOM_SCM=y
|
||||
CONFIG_QCOM_SCM_64=y
|
||||
|
||||
@ -2259,7 +2259,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
# CONFIG_SENSORS_G762 is not set
|
||||
# CONFIG_SENSORS_GPIO_FAN is not set
|
||||
CONFIG_SENSORS_GPIO_FAN=m
|
||||
# CONFIG_SENSORS_HIH6130 is not set
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
# CONFIG_SENSORS_JC42 is not set
|
||||
|
||||
@ -2379,7 +2379,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
# CONFIG_SENSORS_G762 is not set
|
||||
# CONFIG_SENSORS_GPIO_FAN is not set
|
||||
CONFIG_SENSORS_GPIO_FAN=m
|
||||
# CONFIG_SENSORS_HIH6130 is not set
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
# CONFIG_SENSORS_JC42 is not set
|
||||
|
||||
@ -2798,7 +2798,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
# CONFIG_SENSORS_G762 is not set
|
||||
# CONFIG_SENSORS_GPIO_FAN is not set
|
||||
CONFIG_SENSORS_GPIO_FAN=m
|
||||
# CONFIG_SENSORS_HIH6130 is not set
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
# CONFIG_SENSORS_JC42 is not set
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user