Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-08 10:23:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
AmadeusGhost 2020-11-02 12:12:50 +08:00
commit ad7218a6c6
138 changed files with 287 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/Config-kernel.in
View File

@ -46,6 +46,7 @@ config KERNEL_DEBUG_FS
config KERNEL_MIPS_FP_SUPPORT config KERNEL_MIPS_FP_SUPPORT
bool bool
default y if TARGET_pistachio
config KERNEL_ARM_PMU config KERNEL_ARM_PMU
bool bool

4
include/kernel-version.mk
View File

@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif endif
LINUX_VERSION-5.4 = .72 LINUX_VERSION-5.4 = .73
LINUX_KERNEL_HASH-5.4.72 = 0e24645bd56fe5b55a7a662895f5562c103d71b54d097281f0c9c71ff22c1172 LINUX_KERNEL_HASH-5.4.73 = 5a424b403b726bbe7dfa1d1524e431676c4a64f22a8db524534ed678bfe576b2
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

11
package/devel/gdb/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gdb PKG_NAME:=gdb
PKG_VERSION:=8.3.1 PKG_VERSION:=10.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/gdb PKG_SOURCE_URL:=@GNU/gdb
PKG_HASH:=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4 PKG_HASH:=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/gdb/Default define Package/gdb/Default
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib DEPENDS:=+!USE_MUSL:libthread-db +zlib
URL:=https://www.gnu.org/software/gdb/ URL:=https://www.gnu.org/software/gdb/
endef endef
@ -55,8 +55,11 @@ endef
# XXX: add --disable-werror to prevent build failure with arm # XXX: add --disable-werror to prevent build failure with arm
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-system-readline \ --with-system-readline \
--with-system-zlib \
--without-expat \ --without-expat \
--without-lzma \ --without-lzma \
--disable-unit-tests \
--disable-ubsan \
--disable-sim \ --disable-sim \
--disable-werror \ --disable-werror \
--disable-source-highlight --disable-source-highlight
@ -72,7 +75,7 @@ define Build/Install
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
install-gdb install-gdb install-gdbserver
endef endef
define Package/gdb/install define Package/gdb/install

4
package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
View File

@ -1,7 +1,7 @@
See http://sourceware.org/bugzilla/show_bug.cgi?id=14523 See http://sourceware.org/bugzilla/show_bug.cgi?id=14523
--- a/gdb/common/signals.c --- a/gdbsupport/signals.cc
+++ b/gdb/common/signals.c +++ b/gdbsupport/signals.cc
@@ -348,6 +348,11 @@ gdb_signal_from_host (int hostsig) @@ -348,6 +348,11 @@ gdb_signal_from_host (int hostsig)
else if (64 <= hostsig && hostsig <= 127) else if (64 <= hostsig && hostsig <= 127)
return (enum gdb_signal) return (enum gdb_signal)

10
package/devel/gdb/patches/100-musl_fix.patch
View File

@ -8,9 +8,9 @@
#include "defs.h" #include "defs.h"
#include "inferior.h" #include "inferior.h"
#include "infrun.h" #include "infrun.h"
@@ -72,6 +73,10 @@ @@ -70,6 +71,10 @@
#define SPUFS_MAGIC 0x23c9b64e #include "gdbsupport/gdb-sigmask.h"
#endif #include "debug.h"
+#ifndef __SIGRTMIN +#ifndef __SIGRTMIN
+#define __SIGRTMIN SIGRTMIN +#define __SIGRTMIN SIGRTMIN
@ -39,8 +39,8 @@
#include <asm/cputable.h> #include <asm/cputable.h>
/* This sometimes isn't defined. */ /* This sometimes isn't defined. */
--- a/gdb/gdbserver/linux-ppc-low.c --- a/gdbserver/linux-ppc-low.cc
+++ b/gdb/gdbserver/linux-ppc-low.c +++ b/gdbserver/linux-ppc-low.cc
@@ -23,7 +23,9 @@ @@ -23,7 +23,9 @@
#include "elf/common.h" #include "elf/common.h"
#include <sys/uio.h> #include <sys/uio.h>

12
package/devel/gdb/patches/110-shared_libgcc.patch
View File

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1283,13 +1283,13 @@ if test -z "$LD"; then @@ -1302,13 +1302,13 @@ if test -z "$LD"; then
fi fi
fi fi
@ -17,7 +17,7 @@
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_LINK_IFELSE([AC_LANG_SOURCE([
#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
@@ -1629,7 +1629,7 @@ AC_ARG_WITH(stage1-ldflags, @@ -1648,7 +1648,7 @@ AC_ARG_WITH(stage1-ldflags,
# trust that they are doing what they want. # trust that they are doing what they want.
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
-a "$have_static_libs" = yes; then -a "$have_static_libs" = yes; then
@ -26,7 +26,7 @@
fi]) fi])
AC_SUBST(stage1_ldflags) AC_SUBST(stage1_ldflags)
@@ -1658,7 +1658,7 @@ AC_ARG_WITH(boot-ldflags, @@ -1677,7 +1677,7 @@ AC_ARG_WITH(boot-ldflags,
# statically. But if the user explicitly specified the libraries to # statically. But if the user explicitly specified the libraries to
# use, trust that they are doing what they want. # use, trust that they are doing what they want.
if test "$poststage1_libs" = ""; then if test "$poststage1_libs" = ""; then
@ -37,7 +37,7 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -5053,14 +5053,14 @@ if test -z "$LD"; then @@ -5075,14 +5075,14 @@ if test -z "$LD"; then
fi fi
fi fi
@ -56,7 +56,7 @@
ac_ext=cpp ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5861,7 +5861,7 @@ else @@ -5883,7 +5883,7 @@ else
# trust that they are doing what they want. # trust that they are doing what they want.
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
-a "$have_static_libs" = yes; then -a "$have_static_libs" = yes; then
@ -65,7 +65,7 @@
fi fi
fi fi
@@ -5897,7 +5897,7 @@ else @@ -5919,7 +5919,7 @@ else
# statically. But if the user explicitly specified the libraries to # statically. But if the user explicitly specified the libraries to
# use, trust that they are doing what they want. # use, trust that they are doing what they want.
if test "$poststage1_libs" = ""; then if test "$poststage1_libs" = ""; then

10
package/devel/gdb/patches/120-sigprocmask-invalid-call.patch
View File

@ -25,14 +25,14 @@ gdb/ChangeLog:
gdb/common/signals-state-save-restore.c | 2 +- gdb/common/signals-state-save-restore.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-) 2 files changed, 6 insertions(+), 1 deletion(-)
--- a/gdb/common/signals-state-save-restore.c --- a/gdbsupport/signals-state-save-restore.cc
+++ b/gdb/common/signals-state-save-restore.c +++ b/gdbsupport/signals-state-save-restore.cc
@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) @@ -38,7 +38,7 @@ save_original_signals_state (bool quiet)
int i; int i;
int res; int res;
- res = sigprocmask (0, NULL, &original_signal_mask); - res = gdb_sigmask (0, NULL, &original_signal_mask);
+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); + res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask);
if (res == -1) if (res == -1)
perror_with_name (("sigprocmask")); perror_with_name (("sigprocmask"));

6
package/devel/gdb/patches/130-uclibc-fix.patch
View File

@ -1,6 +1,6 @@
--- a/gdb/dwarf-index-write.c --- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf-index-write.c +++ b/gdb/dwarf2/index-write.c
@@ -701,7 +701,7 @@ public: @@ -777,7 +777,7 @@ public:
gdb_assert (m_abbrev_table.empty ()); gdb_assert (m_abbrev_table.empty ());
const size_t name_count = m_name_to_value_set.size (); const size_t name_count = m_name_to_value_set.size ();
m_bucket_table.resize m_bucket_table.resize

4
package/firmware/linux-firmware/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=linux-firmware PKG_NAME:=linux-firmware
PKG_VERSION:=20200918 PKG_VERSION:=20201022
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=e2787907e0892e0b1a3c06f1def6fd3cdc0eff850b0919c7f21b5bda7563d2d8 PKG_HASH:=bf586e0beb4c65f22bf0a79811f259aa0a5a7cc9f70eebecb260525b6914cef7
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

6
package/network/services/hostapd/Makefile
View File

@ -102,6 +102,9 @@ ifeq ($(SSL_VARIANT),openssl)
DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y
TARGET_LDFLAGS += -lcrypto -lssl TARGET_LDFLAGS += -lcrypto -lssl
ifeq ($(LOCAL_VARIANT),basic)
DRIVER_MAKEOPTS += CONFIG_OWE=y
endif
ifeq ($(LOCAL_VARIANT),mesh) ifeq ($(LOCAL_VARIANT),mesh)
DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y
endif endif
@ -114,6 +117,9 @@ ifeq ($(SSL_VARIANT),wolfssl)
DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y
TARGET_LDFLAGS += -lwolfssl TARGET_LDFLAGS += -lwolfssl
ifeq ($(LOCAL_VARIANT),basic)
DRIVER_MAKEOPTS += CONFIG_OWE=y
endif
ifeq ($(LOCAL_VARIANT),mesh) ifeq ($(LOCAL_VARIANT),mesh)
DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1 DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1
endif endif

6
package/network/services/odhcpd/Makefile
View File

@ -12,9 +12,9 @@ PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
PKG_SOURCE_DATE:=2020-06-21 PKG_SOURCE_DATE:=2020-11-01
PKG_SOURCE_VERSION:=5da52992a3926b36e53d0a5d55955a6ccbc35872 PKG_SOURCE_VERSION:=735c7836bfcc08f3ecd8cdaf1368665b8a241b94
PKG_MIRROR_HASH:=6e1f06fd1467d078dc8b4c5ee3cf13a695aa7222e98b2193479e862a4bd21049 PKG_MIRROR_HASH:=887a2c07375dc5127b31edd71c281f48962d8a40e64995401baf648ed4c94b95
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com> PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

6
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -9,8 +9,7 @@ board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
"ath9k-eeprom-ahb-18100000.wmac.bin") "ath9k-eeprom-ahb-18100000.wmac.bin")
case $board in case $board in
8dev,lima|\ 8dev,lima)
ubnt,unifi)
caldata_extract "art" 0x1000 0x800 caldata_extract "art" 0x1000 0x800
;; ;;
avm,fritz1750e|\ avm,fritz1750e|\
@ -78,7 +77,8 @@ case "$FIRMWARE" in
engenius,enh202-v1) engenius,enh202-v1)
caldata_extract "art" 0x1000 0xeb8 caldata_extract "art" 0x1000 0xeb8
;; ;;
buffalo,wzr-hp-g450h) buffalo,wzr-hp-g450h|\
ubnt,unifi)
caldata_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
;; ;;
dlink,dir-825-c1|\ dlink,dir-825-c1|\

1
target/linux/ath79/generic/config-default
View File

@ -1,4 +1,3 @@
CONFIG_AT803X_PHY=y
CONFIG_BCM_NET_PHYLIB=y CONFIG_BCM_NET_PHYLIB=y
CONFIG_BROADCOM_PHY=y CONFIG_BROADCOM_PHY=y
CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X=y

1
target/linux/ath79/mikrotik/config-default
View File

@ -1,4 +1,3 @@
CONFIG_AT803X_PHY=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEFLATE=y
CONFIG_GPIO_LATCH=y CONFIG_GPIO_LATCH=y

24
target/linux/ath79/patches-5.4/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
View File

@ -1,24 +0,0 @@
From 0c8856211d26f84277f7fcb0b9595e5c646bc464 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 6 Mar 2018 10:00:55 +0100
Subject: [PATCH 11/33] MIPS: ath79: select the PINCTRL subsystem
The pinmux on QCA SoCs is controlled by a single register. The
"pinctrl-single" driver can be used but requires the target
to select PINCTRL.
Signed-off-by: John Crispin <john@phrozen.org>
---
arch/mips/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -296,6 +296,7 @@ config BCM63XX
select SYS_HAS_EARLY_PRINTK
select SWAP_IO_SPACE
select GPIOLIB
+ select PINCTRL
select HAVE_CLK
select MIPS_L1_CACHE_SHIFT_4
select CLKDEV_LOOKUP

2
target/linux/ath79/patches-5.4/0061-tty-serial-ar933x-uart-rs485-gpio.patch
View File

@ -34,7 +34,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
--- a/drivers/tty/serial/Kconfig --- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig
@@ -1279,6 +1279,7 @@ config SERIAL_AR933X @@ -1280,6 +1280,7 @@ config SERIAL_AR933X
tristate "AR933X serial port support" tristate "AR933X serial port support"
depends on HAVE_CLK && ATH79 depends on HAVE_CLK && ATH79
select SERIAL_CORE select SERIAL_CORE

4
target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2265,8 +2265,15 @@ static int bcm2835_clk_probe(struct plat @@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct plat
if (ret) if (ret)
return ret; return ret;
@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
} }
static const struct cprman_plat_data cprman_bcm2835_plat_data = { static const struct cprman_plat_data cprman_bcm2835_plat_data = {
@@ -2292,7 +2299,11 @@ static struct platform_driver bcm2835_cl @@ -2294,7 +2301,11 @@ static struct platform_driver bcm2835_cl
.probe = bcm2835_clk_probe, .probe = bcm2835_clk_probe,
}; };

2
target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1379,6 +1379,11 @@ bcm2835_register_pll_divider(struct bcm2 @@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2
divider->div.hw.init = &init; divider->div.hw.init = &init;
divider->div.table = NULL; divider->div.table = NULL;

10
target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
pll = kzalloc(sizeof(*pll), GFP_KERNEL); pll = kzalloc(sizeof(*pll), GFP_KERNEL);
if (!pll) if (!pll)
return NULL; return NULL;
@@ -1380,8 +1385,10 @@ bcm2835_register_pll_divider(struct bcm2 @@ -1382,8 +1387,10 @@ bcm2835_register_pll_divider(struct bcm2
divider->div.table = NULL; divider->div.table = NULL;
if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
} }
divider->cprman = cprman; divider->cprman = cprman;
@@ -2189,6 +2196,8 @@ static const struct bcm2835_clk_desc clk @@ -2191,6 +2198,8 @@ static const struct bcm2835_clk_desc clk
.ctl_reg = CM_PERIICTL), .ctl_reg = CM_PERIICTL),
}; };
@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* /*
* Permanently take a reference on the parent of the SDRAM clock. * Permanently take a reference on the parent of the SDRAM clock.
* *
@@ -2208,6 +2217,19 @@ static int bcm2835_mark_sdc_parent_criti @@ -2210,6 +2219,19 @@ static int bcm2835_mark_sdc_parent_criti
return clk_prepare_enable(parent); return clk_prepare_enable(parent);
} }
@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int bcm2835_clk_probe(struct platform_device *pdev) static int bcm2835_clk_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@@ -2218,6 +2240,7 @@ static int bcm2835_clk_probe(struct plat @@ -2220,6 +2242,7 @@ static int bcm2835_clk_probe(struct plat
const size_t asize = ARRAY_SIZE(clk_desc_array); const size_t asize = ARRAY_SIZE(clk_desc_array);
const struct cprman_plat_data *pdata; const struct cprman_plat_data *pdata;
size_t i; size_t i;
@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
int ret; int ret;
pdata = of_device_get_match_data(&pdev->dev); pdata = of_device_get_match_data(&pdev->dev);
@@ -2237,6 +2260,13 @@ static int bcm2835_clk_probe(struct plat @@ -2239,6 +2262,13 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs)) if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs); return PTR_ERR(cprman->regs);

4
target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch
View File

@ -90,7 +90,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.set_rate = bcm2835_clock_set_rate, .set_rate = bcm2835_clock_set_rate,
.determine_rate = bcm2835_clock_determine_rate, .determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent, .set_parent = bcm2835_clock_set_parent,
@@ -2239,6 +2267,7 @@ static int bcm2835_clk_probe(struct plat @@ -2241,6 +2269,7 @@ static int bcm2835_clk_probe(struct plat
const struct bcm2835_clk_desc *desc; const struct bcm2835_clk_desc *desc;
const size_t asize = ARRAY_SIZE(clk_desc_array); const size_t asize = ARRAY_SIZE(clk_desc_array);
const struct cprman_plat_data *pdata; const struct cprman_plat_data *pdata;
@ -98,7 +98,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
size_t i; size_t i;
u32 clk_id; u32 clk_id;
int ret; int ret;
@@ -2260,6 +2289,14 @@ static int bcm2835_clk_probe(struct plat @@ -2262,6 +2291,14 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs)) if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs); return PTR_ERR(cprman->regs);

2
target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1471,6 +1471,15 @@ static struct clk_hw *bcm2835_register_c @@ -1473,6 +1473,15 @@ static struct clk_hw *bcm2835_register_c
init.flags = data->flags | CLK_IGNORE_UNUSED; init.flags = data->flags | CLK_IGNORE_UNUSED;
/* /*

8
target/linux/bcm27xx/patches-5.4/950-0040-fbdev-add-FBIOCOPYAREA-ioctl.patch
View File

@ -234,7 +234,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
static int bcm2708_fb_register(struct bcm2708_fb *fb) static int bcm2708_fb_register(struct bcm2708_fb *fb)
--- a/drivers/video/fbdev/core/fbmem.c --- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c
@@ -1072,6 +1072,30 @@ fb_blank(struct fb_info *info, int blank @@ -1076,6 +1076,30 @@ fb_blank(struct fb_info *info, int blank
} }
EXPORT_SYMBOL(fb_blank); EXPORT_SYMBOL(fb_blank);
@ -265,7 +265,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
@@ -1080,6 +1104,7 @@ static long do_fb_ioctl(struct fb_info * @@ -1084,6 +1108,7 @@ static long do_fb_ioctl(struct fb_info *
struct fb_fix_screeninfo fix; struct fb_fix_screeninfo fix;
struct fb_cmap cmap_from; struct fb_cmap cmap_from;
struct fb_cmap_user cmap; struct fb_cmap_user cmap;
@ -273,7 +273,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
long ret = 0; long ret = 0;
@@ -1155,6 +1180,15 @@ static long do_fb_ioctl(struct fb_info * @@ -1159,6 +1184,15 @@ static long do_fb_ioctl(struct fb_info *
unlock_fb_info(info); unlock_fb_info(info);
console_unlock(); console_unlock();
break; break;
@ -289,7 +289,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
default: default:
lock_fb_info(info); lock_fb_info(info);
fb = info->fbops; fb = info->fbops;
@@ -1300,6 +1334,7 @@ static long fb_compat_ioctl(struct file @@ -1304,6 +1338,7 @@ static long fb_compat_ioctl(struct file
case FBIOPAN_DISPLAY: case FBIOPAN_DISPLAY:
case FBIOGET_CON2FBMAP: case FBIOGET_CON2FBMAP:
case FBIOPUT_CON2FBMAP: case FBIOPUT_CON2FBMAP:

2
target/linux/bcm27xx/patches-5.4/950-0153-media-tc358743-Increase-FIFO-level-to-374.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/media/i2c/tc358743.c --- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c
@@ -1947,7 +1947,7 @@ static int tc358743_probe_of(struct tc35 @@ -1949,7 +1949,7 @@ static int tc358743_probe_of(struct tc35
state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS; state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS;
state->pdata.enable_hdcp = false; state->pdata.enable_hdcp = false;
/* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */ /* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */

4
target/linux/bcm27xx/patches-5.4/950-0154-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
--- a/drivers/media/i2c/tc358743.c --- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c
@@ -1606,11 +1606,20 @@ static int tc358743_g_mbus_config(struct @@ -1608,11 +1608,20 @@ static int tc358743_g_mbus_config(struct
struct v4l2_mbus_config *cfg) struct v4l2_mbus_config *cfg)
{ {
struct tc358743_state *state = to_state(sd); struct tc358743_state *state = to_state(sd);
@ -47,7 +47,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
switch (state->csi_lanes_in_use) { switch (state->csi_lanes_in_use) {
case 1: case 1:
@@ -2052,6 +2061,7 @@ static int tc358743_probe(struct i2c_cli @@ -2054,6 +2063,7 @@ static int tc358743_probe(struct i2c_cli
if (pdata) { if (pdata) {
state->pdata = *pdata; state->pdata = *pdata;
state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;

4
target/linux/bcm27xx/patches-5.4/950-0155-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/media/i2c/tc358743.c --- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c
@@ -1976,6 +1976,7 @@ static int tc358743_probe_of(struct tc35 @@ -1978,6 +1978,7 @@ static int tc358743_probe_of(struct tc35
/* /*
* The CSI bps per lane must be between 62.5 Mbps and 1 Gbps. * The CSI bps per lane must be between 62.5 Mbps and 1 Gbps.
* The default is 594 Mbps for 4-lane 1080p60 or 2-lane 720p60. * The default is 594 Mbps for 4-lane 1080p60 or 2-lane 720p60.
@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
*/ */
bps_pr_lane = 2 * endpoint.link_frequencies[0]; bps_pr_lane = 2 * endpoint.link_frequencies[0];
if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) { if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {
@@ -1988,23 +1989,41 @@ static int tc358743_probe_of(struct tc35 @@ -1990,23 +1991,41 @@ static int tc358743_probe_of(struct tc35
state->pdata.refclk_hz * state->pdata.pll_prd; state->pdata.refclk_hz * state->pdata.pll_prd;
/* /*

4
target/linux/bcm27xx/patches-5.4/950-0156-media-tc358743-Check-I2C-succeeded-during-probe.patch
View File

@ -78,7 +78,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val) static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
{ {
i2c_wrreg(sd, reg, val, 2); i2c_wrreg(sd, reg, val, 2);
@@ -2062,6 +2079,7 @@ static int tc358743_probe(struct i2c_cli @@ -2064,6 +2081,7 @@ static int tc358743_probe(struct i2c_cli
struct tc358743_platform_data *pdata = client->dev.platform_data; struct tc358743_platform_data *pdata = client->dev.platform_data;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK; u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK;
@ -86,7 +86,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
int err; int err;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
@@ -2094,7 +2112,8 @@ static int tc358743_probe(struct i2c_cli @@ -2096,7 +2114,8 @@ static int tc358743_probe(struct i2c_cli
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
/* i2c access */ /* i2c access */

6
target/linux/bcm27xx/patches-5.4/950-0162-media-tc358743-Return-an-appropriate-colorspace-from.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/media/i2c/tc358743.c --- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c
@@ -1688,12 +1688,23 @@ static int tc358743_enum_mbus_code(struc @@ -1690,12 +1690,23 @@ static int tc358743_enum_mbus_code(struc
return 0; return 0;
} }
@ -51,7 +51,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
if (format->pad != 0) if (format->pad != 0)
return -EINVAL; return -EINVAL;
@@ -1703,23 +1714,7 @@ static int tc358743_get_fmt(struct v4l2_ @@ -1705,23 +1716,7 @@ static int tc358743_get_fmt(struct v4l2_
format->format.height = state->timings.bt.height; format->format.height = state->timings.bt.height;
format->format.field = V4L2_FIELD_NONE; format->format.field = V4L2_FIELD_NONE;
@ -76,7 +76,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
return 0; return 0;
} }
@@ -1734,18 +1729,11 @@ static int tc358743_set_fmt(struct v4l2_ @@ -1736,18 +1731,11 @@ static int tc358743_set_fmt(struct v4l2_
int ret = tc358743_get_fmt(sd, cfg, format); int ret = tc358743_get_fmt(sd, cfg, format);
format->format.code = code; format->format.code = code;

2
target/linux/bcm27xx/patches-5.4/950-0179-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2352,7 +2352,7 @@ static int bcm2835_clk_probe(struct plat @@ -2354,7 +2354,7 @@ static int bcm2835_clk_probe(struct plat
return ret; return ret;
/* note that we have registered all the clocks */ /* note that we have registered all the clocks */

2
target/linux/bcm27xx/patches-5.4/950-0219-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
View File

@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
cprman_write(cprman, data->ctl_reg, ctl); cprman_write(cprman, data->ctl_reg, ctl);
@@ -1492,7 +1496,7 @@ static struct clk_hw *bcm2835_register_c @@ -1494,7 +1498,7 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops; init.ops = &bcm2835_vpu_clock_clk_ops;
} else { } else {
init.ops = &bcm2835_clock_clk_ops; init.ops = &bcm2835_clock_clk_ops;

2
target/linux/bcm27xx/patches-5.4/950-0220-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
View File

@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
.determine_rate = bcm2835_clock_determine_rate, .determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent, .set_parent = bcm2835_clock_set_parent,
.get_parent = bcm2835_clock_get_parent, .get_parent = bcm2835_clock_get_parent,
@@ -1496,7 +1510,6 @@ static struct clk_hw *bcm2835_register_c @@ -1498,7 +1512,6 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops; init.ops = &bcm2835_vpu_clock_clk_ops;
} else { } else {
init.ops = &bcm2835_clock_clk_ops; init.ops = &bcm2835_clock_clk_ops;

2
target/linux/bcm27xx/patches-5.4/950-0222-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
View File

@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
* non-error returns are a promise to giveback() the urb later * non-error returns are a promise to giveback() the urb later
* we drop ownership so next owner (or urb unlink) can get it * we drop ownership so next owner (or urb unlink) can get it
*/ */
@@ -5335,6 +5432,7 @@ static const struct hc_driver xhci_hc_dr @@ -5334,6 +5431,7 @@ static const struct hc_driver xhci_hc_dr
.endpoint_reset = xhci_endpoint_reset, .endpoint_reset = xhci_endpoint_reset,
.check_bandwidth = xhci_check_bandwidth, .check_bandwidth = xhci_check_bandwidth,
.reset_bandwidth = xhci_reset_bandwidth, .reset_bandwidth = xhci_reset_bandwidth,

2
target/linux/bcm27xx/patches-5.4/950-0270-clk-bcm2835-Avoid-null-pointer-exception.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2278,9 +2278,11 @@ static bool bcm2835_clk_is_claimed(const @@ -2280,9 +2280,11 @@ static bool bcm2835_clk_is_claimed(const
int i; int i;
for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) { for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {

2
target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
#define USB_VENDOR_ID_BELKIN 0x050d #define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201 #define USB_DEVICE_ID_FLIP_KVM 0x3201
@@ -1244,6 +1247,9 @@ @@ -1245,6 +1248,9 @@
#define USB_VENDOR_ID_XAT 0x2505 #define USB_VENDOR_ID_XAT 0x2505
#define USB_DEVICE_ID_XAT_CSR 0x0220 #define USB_DEVICE_ID_XAT_CSR 0x0220

4
target/linux/bcm27xx/patches-5.4/950-0351-clk-bcm2835-Disable-v3d-clock.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1732,16 +1732,12 @@ static const struct bcm2835_clk_desc clk @@ -1734,16 +1734,12 @@ static const struct bcm2835_clk_desc clk
.hold_mask = CM_PLLA_HOLDCORE, .hold_mask = CM_PLLA_HOLDCORE,
.fixed_divider = 1, .fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT), .flags = CLK_SET_RATE_PARENT),
@ -35,7 +35,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
SOC_ALL, SOC_ALL,
.name = "plla_dsi0", .name = "plla_dsi0",
@@ -2019,14 +2015,12 @@ static const struct bcm2835_clk_desc clk @@ -2021,14 +2017,12 @@ static const struct bcm2835_clk_desc clk
.int_bits = 6, .int_bits = 6,
.frac_bits = 0, .frac_bits = 0,
.tcnt_mux = 3), .tcnt_mux = 3),

2
target/linux/bcm27xx/patches-5.4/950-0394-Initialise-rpi-firmware-before-clk-bcm2835.patch
View File

@ -25,7 +25,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c --- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2399,7 +2399,7 @@ static int __init __bcm2835_clk_driver_i @@ -2401,7 +2401,7 @@ static int __init __bcm2835_clk_driver_i
{ {
return platform_driver_register(&bcm2835_clk_driver); return platform_driver_register(&bcm2835_clk_driver);
} }

6
target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch
View File

@ -82,7 +82,7 @@ Cc: linux-rockchip@lists.infradead.org
--- a/drivers/pci/controller/pci-aardvark.c --- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c
@@ -1019,7 +1019,8 @@ static int advk_pcie_probe(struct platfo @@ -1018,7 +1018,8 @@ static int advk_pcie_probe(struct platfo
return ret; return ret;
} }
@ -402,7 +402,7 @@ Cc: linux-rockchip@lists.infradead.org
} }
--- a/include/linux/pci.h --- a/include/linux/pci.h
+++ b/include/linux/pci.h +++ b/include/linux/pci.h
@@ -2277,6 +2277,7 @@ struct irq_domain; @@ -2278,6 +2278,7 @@ struct irq_domain;
struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus); struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
int pci_parse_request_of_pci_ranges(struct device *dev, int pci_parse_request_of_pci_ranges(struct device *dev,
struct list_head *resources, struct list_head *resources,
@ -410,7 +410,7 @@ Cc: linux-rockchip@lists.infradead.org
struct resource **bus_range); struct resource **bus_range);
/* Arch may override this (weak) */ /* Arch may override this (weak) */
@@ -2285,9 +2286,11 @@ struct device_node *pcibios_get_phb_of_n @@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_n
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline struct irq_domain * static inline struct irq_domain *
pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

2
target/linux/bcm27xx/patches-5.4/950-0706-media-i2c-tc358743-Fix-fallthrough-warning.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
--- a/drivers/media/i2c/tc358743.c --- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c
@@ -2002,6 +2002,7 @@ static int tc358743_probe_of(struct tc35 @@ -2004,6 +2004,7 @@ static int tc358743_probe_of(struct tc35
switch (bps_pr_lane) { switch (bps_pr_lane) {
default: default:
dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane); dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane);

2
target/linux/generic/backport-5.4/756-v5.8-net-dsa-rtl8366-Pass-GENMASK-signed-bits.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/rtl8366.c --- a/drivers/net/dsa/rtl8366.c
+++ b/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c
@@ -285,7 +285,7 @@ int rtl8366_init_vlan(struct realtek_smi @@ -311,7 +311,7 @@ int rtl8366_init_vlan(struct realtek_smi
/* For the CPU port, make all ports members of this /* For the CPU port, make all ports members of this
* VLAN. * VLAN.
*/ */

4
target/linux/generic/hack-5.4/204-module_strip.patch
View File

@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config MODULES_TREE_LOOKUP config MODULES_TREE_LOOKUP
--- a/kernel/module.c --- a/kernel/module.c
+++ b/kernel/module.c +++ b/kernel/module.c
@@ -3126,9 +3126,11 @@ static int setup_load_info(struct load_i @@ -3127,9 +3127,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags) static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{ {
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC) if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL; modmagic = NULL;
@@ -3149,6 +3151,7 @@ static int check_modinfo(struct module * @@ -3150,6 +3152,7 @@ static int check_modinfo(struct module *
mod->name); mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
} }

2
target/linux/generic/hack-5.4/901-debloat_sock_diag.patch
View File

@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{ {
struct dst_entry *dst = __sk_dst_get(sk); struct dst_entry *dst = __sk_dst_get(sk);
@@ -1747,9 +1760,11 @@ static void __sk_free(struct sock *sk) @@ -1743,9 +1756,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt)) if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1); sock_inuse_add(sock_net(sk), -1);

2
target/linux/generic/hack-5.4/902-debloat_proc.patch
View File

@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -3634,6 +3634,8 @@ static __net_initdata struct pernet_oper @@ -3630,6 +3630,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void) static int __init proto_init(void)
{ {

2
target/linux/generic/hack-5.4/904-debloat_dma_buf.patch
View File

@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
* Perform scheduler related setup for a newly forked process p. * Perform scheduler related setup for a newly forked process p.
--- a/fs/d_path.c --- a/fs/d_path.c
+++ b/fs/d_path.c +++ b/fs/d_path.c
@@ -307,6 +307,7 @@ char *dynamic_dname(struct dentry *dentr @@ -311,6 +311,7 @@ char *dynamic_dname(struct dentry *dentr
buffer += buflen - sz; buffer += buflen - sz;
return memcpy(buffer, temp, sz); return memcpy(buffer, temp, sz);
} }

39
target/linux/generic/pending-5.4/445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
View File

@ -1,39 +0,0 @@
From 5f312dcb38b8003d9711290366cd4b1def5daf3b Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 16 Aug 2020 14:43:35 +0200
Subject: [PATCH v2 445/447] mtd: spinand: gigadevice: Only one dummy byte in
QUADIO
The datasheet only lists one dummy byte in the 0xEH operation for the
following chips:
* GD5F1GQ4xExxG
* GD5F1GQ4xFxxG
* GD5F1GQ4UAYIG
* GD5F4GQ4UAYIG
Fixes: c93c613214ac ("mtd: spinand: add support for GigaDevice GD5FxGQ4xA")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
drivers/mtd/nand/spi/gigadevice.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -21,7 +21,7 @@
#define GD5FXGQ4UXFXXG_STATUS_ECC_UNCOR_ERROR (7 << 4)
static SPINAND_OP_VARIANTS(read_cache_variants,
- SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
@@ -29,7 +29,7 @@ static SPINAND_OP_VARIANTS(read_cache_va
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
static SPINAND_OP_VARIANTS(read_cache_variants_f,
- SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0),

67
target/linux/generic/pending-5.4/446-mtd-spinand-gigadevice-Add-QE-Bit.patch
View File

@ -1,67 +0,0 @@
From f72e99ada020a81e3e4ef79c0a83ede7e9d6c7b1 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 16 Aug 2020 14:42:17 +0200
Subject: [PATCH v2 446/447] mtd: spinand: gigadevice: Add QE Bit
The following GigaDevice chips have the QE BIT in the feature flags, I
checked the datasheets, but did not try this.
* GD5F1GQ4xExxG
* GD5F1GQ4xFxxG
* GD5F1GQ4UAYIG
* GD5F4GQ4UAYIG
The Quad operations like 0xEB mention that the QE bit has to be set.
Fixes: c93c613214ac ("mtd: spinand: add support for GigaDevice GD5FxGQ4xA")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
drivers/mtd/nand/spi/gigadevice.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -201,7 +201,7 @@ static const struct spinand_info gigadev
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
&write_cache_variants,
&update_cache_variants),
- 0,
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
gd5fxgq4xa_ecc_get_status)),
SPINAND_INFO("GD5F2GQ4xA", 0xF2,
@@ -210,7 +210,7 @@ static const struct spinand_info gigadev
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
&write_cache_variants,
&update_cache_variants),
- 0,
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
gd5fxgq4xa_ecc_get_status)),
SPINAND_INFO("GD5F4GQ4xA", 0xF4,
@@ -219,7 +219,7 @@ static const struct spinand_info gigadev
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
&write_cache_variants,
&update_cache_variants),
- 0,
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
gd5fxgq4xa_ecc_get_status)),
SPINAND_INFO("GD5F1GQ4UExxG", 0xd1,
@@ -228,7 +228,7 @@ static const struct spinand_info gigadev
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
&write_cache_variants,
&update_cache_variants),
- 0,
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&gd5fxgq4_variant2_ooblayout,
gd5fxgq4uexxg_ecc_get_status)),
SPINAND_INFO("GD5F1GQ4UFxxG", 0xb148,
@@ -237,7 +237,7 @@ static const struct spinand_info gigadev
SPINAND_INFO_OP_VARIANTS(&read_cache_variants_f,
&write_cache_variants,
&update_cache_variants),
- 0,
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&gd5fxgq4_variant2_ooblayout,
gd5fxgq4ufxxg_ecc_get_status)),
};

2
target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* /*
* Get the required data from the packet. * Get the required data from the packet.
*/ */
@@ -1123,7 +1129,7 @@ int nf_conntrack_tcp_packet(struct nf_co @@ -1130,7 +1136,7 @@ int nf_conntrack_tcp_packet(struct nf_co
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK]; timeout = timeouts[TCP_CONNTRACK_UNACK];

9
target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
View File

@ -978,11 +978,20 @@ static int edma_axi_probe(struct platform_device *pdev)
edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG | edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG |
NETIF_F_TSO | NETIF_F_GRO; NETIF_F_TSO | NETIF_F_GRO;
if (of_property_read_bool(np, "qcom,single-phy") && edma_cinfo->num_gmac == 1)
edma_netdev[i]->features |= NETIF_F_HW_VLAN_CTAG_TX;
#ifdef CONFIG_RFS_ACCEL #ifdef CONFIG_RFS_ACCEL
edma_netdev[i]->features |= NETIF_F_NTUPLE; edma_netdev[i]->features |= NETIF_F_NTUPLE;
edma_netdev[i]->hw_features |= NETIF_F_NTUPLE; edma_netdev[i]->hw_features |= NETIF_F_NTUPLE;
edma_netdev[i]->vlan_features |= NETIF_F_NTUPLE; edma_netdev[i]->vlan_features |= NETIF_F_NTUPLE;
edma_netdev[i]->wanted_features |= NETIF_F_NTUPLE; edma_netdev[i]->wanted_features |= NETIF_F_NTUPLE;
if (of_property_read_bool(np, "qcom,single-phy") && edma_cinfo->num_gmac == 1) {
edma_netdev[i]->features |= NETIF_F_RXHASH;
edma_netdev[i]->hw_features |= NETIF_F_RXHASH;
edma_netdev[i]->vlan_features |= NETIF_F_RXHASH;
edma_netdev[i]->wanted_features |= NETIF_F_RXHASH;
}
#endif #endif
edma_set_ethtool_ops(edma_netdev[i]); edma_set_ethtool_ops(edma_netdev[i]);

2
target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
View File

@ -39,7 +39,7 @@ Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
--- a/drivers/opp/core.c --- a/drivers/opp/core.c
+++ b/drivers/opp/core.c +++ b/drivers/opp/core.c
@@ -2095,6 +2095,75 @@ put_table: @@ -2101,6 +2101,75 @@ put_table:
} }
/** /**

4
target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
--- a/drivers/opp/core.c --- a/drivers/opp/core.c
+++ b/drivers/opp/core.c +++ b/drivers/opp/core.c
@@ -2135,6 +2135,7 @@ int dev_pm_opp_adjust_voltage(struct dev @@ -2141,6 +2141,7 @@ int dev_pm_opp_adjust_voltage(struct dev
struct opp_table *opp_table; struct opp_table *opp_table;
struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV); struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV);
int r = 0; int r = 0;
@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
/* Find the opp_table */ /* Find the opp_table */
opp_table = _find_opp_table(dev); opp_table = _find_opp_table(dev);
@@ -2164,8 +2165,17 @@ int dev_pm_opp_adjust_voltage(struct dev @@ -2170,8 +2171,17 @@ int dev_pm_opp_adjust_voltage(struct dev
goto adjust_unlock; goto adjust_unlock;
opp->supplies->u_volt = u_volt; opp->supplies->u_volt = u_volt;

9
target/linux/ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch
View File

@ -15,11 +15,9 @@ Cc: stable@vger.kernel.org # v4.19+
drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++ drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++
1 file changed, 13 insertions(+) 1 file changed, 13 insertions(+)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 3aac77a295ba..82336bbaf8dc 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c --- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -302,6 +302,9 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) @@ -296,6 +296,9 @@ static void qcom_pcie_deinit_2_1_0(struc
reset_control_assert(res->por_reset); reset_control_assert(res->por_reset);
reset_control_assert(res->ext_reset); reset_control_assert(res->ext_reset);
reset_control_assert(res->phy_reset); reset_control_assert(res->phy_reset);
@ -29,7 +27,7 @@ index 3aac77a295ba..82336bbaf8dc 100644
regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
} }
@@ -314,6 +317,16 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) @@ -308,6 +311,16 @@ static int qcom_pcie_init_2_1_0(struct q
u32 val; u32 val;
int ret; int ret;
@ -46,6 +44,3 @@ index 3aac77a295ba..82336bbaf8dc 100644
ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies); ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "cannot enable regulators\n"); dev_err(dev, "cannot enable regulators\n");
--
2.27.0

2
target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch
View File

@ -5480,7 +5480,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
(transaction layer end-to-end CRC checking). (transaction layer end-to-end CRC checking).
--- a/include/linux/pci.h --- a/include/linux/pci.h
+++ b/include/linux/pci.h +++ b/include/linux/pci.h
@@ -1389,6 +1389,8 @@ void pci_walk_bus(struct pci_bus *top, i @@ -1390,6 +1390,8 @@ void pci_walk_bus(struct pci_bus *top, i
void *userdata); void *userdata);
int pci_cfg_space_size(struct pci_dev *dev); int pci_cfg_space_size(struct pci_dev *dev);
unsigned char pci_bus_max_busnr(struct pci_bus *bus); unsigned char pci_bus_max_busnr(struct pci_bus *bus);

5
target/linux/layerscape/patches-5.4/302-dts-0119-arm64-dts-lx2160a-add-more-thermal-zone-support.patch
View File

@ -12,8 +12,6 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
.../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 130 +++++++++++++++++- .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 130 +++++++++++++++++-
1 file changed, 125 insertions(+), 5 deletions(-) 1 file changed, 125 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
index cab7468c3..fe9b8bf4d 100644
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -440,19 +440,19 @@ @@ -440,19 +440,19 @@
@ -184,6 +182,3 @@ index cab7468c3..fe9b8bf4d 100644
little-endian; little-endian;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
}; };
--
2.17.1

7
target/linux/layerscape/patches-5.4/302-dts-0120-arm64-dts-ls1046a-fix-ippdexpcr-offset-not-correct.patch
View File

@ -12,11 +12,9 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 718af5e..1ef5743 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -796,7 +796,7 @@ @@ -808,7 +808,7 @@
rcpm: rcpm@1ee208c { rcpm: rcpm@1ee208c {
compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+"; compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+";
@ -25,6 +23,3 @@ index 718af5e..1ef5743 100644
#fsl,rcpm-wakeup-cells = <1>; #fsl,rcpm-wakeup-cells = <1>;
}; };
--
2.7.4

11
target/linux/layerscape/patches-5.4/302-dts-0121-arm64-dts-ls1043a-update-USB-nodes-status-to-match-b.patch
View File

@ -23,8 +23,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +++ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +++
3 files changed, 15 insertions(+) 3 files changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
index 219a98780..fe4c4e1fa 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
@@ -167,6 +167,10 @@ @@ -167,6 +167,10 @@
@ -38,11 +36,9 @@ index 219a98780..fe4c4e1fa 100644
#include "fsl-ls1043-post.dtsi" #include "fsl-ls1043-post.dtsi"
&fman0 { &fman0 {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
index ace1d6061..aa2f88f8e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
@@ -213,3 +213,11 @@ @@ -212,3 +212,11 @@
}; };
}; };
}; };
@ -54,8 +50,6 @@ index ace1d6061..aa2f88f8e 100644
+&usb1 { +&usb1 {
+ status = "okay"; + status = "okay";
+}; +};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index e19e05dda..f879ac8f0 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -706,6 +706,7 @@ @@ -706,6 +706,7 @@
@ -82,6 +76,3 @@ index e19e05dda..f879ac8f0 100644
}; };
sata: sata@3200000 { sata: sata@3200000 {
--
2.17.1

7
target/linux/layerscape/patches-5.4/302-dts-0122-arm64-dts-ls1043a-remove-thermal-zone-5-from-dts.patch
View File

@ -11,11 +11,9 @@ Signed-off-by: Yuantian <andy.tang@nxp.com>
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 4 ---- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index e19e05ddae08..fd898d51f53a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -915,8 +915,4 @@ @@ -918,8 +918,4 @@
thermal-zone4 { thermal-zone4 {
status = "okay"; status = "okay";
}; };
@ -24,6 +22,3 @@ index e19e05ddae08..fd898d51f53a 100644
- status = "okay"; - status = "okay";
- }; - };
}; };
--
2.17.1

2
target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch
View File

@ -28,7 +28,7 @@ This reverts commit e75f4940e8ad0dd76527302a10c06b58bf7eb590.
ret = snd_pcm_hw_constraint_list(substream->runtime, 0, ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints); SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints);
@@ -1049,35 +1039,30 @@ static int fsl_sai_remove(struct platfor @@ -1052,35 +1042,30 @@ static int fsl_sai_remove(struct platfor
static const struct fsl_sai_soc_data fsl_sai_vf610_data = { static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
.use_imx_pcm = false, .use_imx_pcm = false,

2
target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Implement-set_bclk_ratio.patch
View File

@ -62,4 +62,4 @@ This reverts commit 63d1a3488ff58e094a7f517cf93c0250f0a3f6be.
- unsigned int bclk_ratio; - unsigned int bclk_ratio;
const struct fsl_sai_soc_data *soc_data; const struct fsl_sai_soc_data *soc_data;
struct snd_dmaengine_dai_dma_data dma_params_rx; struct snd_soc_dai_driver cpu_dai_drv;

2
target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch
View File

@ -10,7 +10,7 @@ This reverts commit 6eeb60be5ebb73b2e5911e26fb1aed02940b7d09.
--- a/sound/soc/fsl/fsl_sai.c --- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -1044,19 +1044,12 @@ static const struct fsl_sai_soc_data fsl @@ -1047,19 +1047,12 @@ static const struct fsl_sai_soc_data fsl
.reg_offset = 8, .reg_offset = 8,
}; };

2
target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch
View File

@ -10,7 +10,7 @@ This reverts commit a860fac420971c5a90d4f78959b44ead793aee4f.
--- a/sound/soc/fsl/fsl_sai.c --- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -1032,24 +1032,10 @@ static const struct fsl_sai_soc_data fsl @@ -1035,24 +1035,10 @@ static const struct fsl_sai_soc_data fsl
.reg_offset = 0, .reg_offset = 0,
}; };

6
target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
View File

@ -494,7 +494,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev, sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
"bus", base, &fsl_sai_regmap_config); "bus", base, &fsl_sai_regmap_config);
@@ -1023,13 +983,11 @@ static int fsl_sai_remove(struct platfor @@ -1026,13 +986,11 @@ static int fsl_sai_remove(struct platfor
static const struct fsl_sai_soc_data fsl_sai_vf610_data = { static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
.use_imx_pcm = false, .use_imx_pcm = false,
.fifo_depth = 32, .fifo_depth = 32,
@ -508,7 +508,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
}; };
static const struct of_device_id fsl_sai_ids[] = { static const struct of_device_id fsl_sai_ids[] = {
@@ -1062,7 +1020,6 @@ static int fsl_sai_runtime_suspend(struc @@ -1065,7 +1023,6 @@ static int fsl_sai_runtime_suspend(struc
static int fsl_sai_runtime_resume(struct device *dev) static int fsl_sai_runtime_resume(struct device *dev)
{ {
struct fsl_sai *sai = dev_get_drvdata(dev); struct fsl_sai *sai = dev_get_drvdata(dev);
@ -516,7 +516,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
int ret; int ret;
ret = clk_prepare_enable(sai->bus_clk); ret = clk_prepare_enable(sai->bus_clk);
@@ -1084,11 +1041,11 @@ static int fsl_sai_runtime_resume(struct @@ -1087,11 +1044,11 @@ static int fsl_sai_runtime_resume(struct
} }
regcache_cache_only(sai->regmap, false); regcache_cache_only(sai->regmap, false);

2
target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch
View File

@ -119,7 +119,7 @@ This reverts commit 5f0ac20ed6db1d6da2eea8b862cf3d54fdfb5830.
case FSL_SAI_TMR: case FSL_SAI_TMR:
case FSL_SAI_RCSR: case FSL_SAI_RCSR:
case FSL_SAI_RCR1: case FSL_SAI_RCR1:
@@ -939,8 +883,8 @@ static int fsl_sai_probe(struct platform @@ -942,8 +886,8 @@ static int fsl_sai_probe(struct platform
MCLK_DIR(index)); MCLK_DIR(index));
} }

2
target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
View File

@ -295,7 +295,7 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0, ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,
--- a/sound/soc/qcom/lpass-platform.c --- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c
@@ -564,8 +564,11 @@ int asoc_qcom_lpass_platform_register(st @@ -565,8 +565,11 @@ int asoc_qcom_lpass_platform_register(st
int ret; int ret;
drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif"); drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif");

2
target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch
View File

@ -21,7 +21,7 @@ This reverts commit bd517707d85f19a7339ea8b882fcbf0fd9976bd6.
regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK, regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
FSL_SAI_MAXBURST_RX - 1); FSL_SAI_MAXBURST_RX - 1);
@@ -925,12 +925,10 @@ static int fsl_sai_remove(struct platfor @@ -928,12 +928,10 @@ static int fsl_sai_remove(struct platfor
static const struct fsl_sai_soc_data fsl_sai_vf610_data = { static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
.use_imx_pcm = false, .use_imx_pcm = false,

6
target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
@@ -898,7 +900,7 @@ static int fsl_sai_probe(struct platform @@ -901,7 +903,7 @@ static int fsl_sai_probe(struct platform
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;
@ -43,7 +43,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;
@@ -923,18 +925,10 @@ static int fsl_sai_remove(struct platfor @@ -926,18 +928,10 @@ static int fsl_sai_remove(struct platfor
return 0; return 0;
} }
@ -91,6 +91,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
unsigned int slot_width; unsigned int slot_width;
- const struct fsl_sai_soc_data *soc_data; - const struct fsl_sai_soc_data *soc_data;
struct snd_soc_dai_driver cpu_dai_drv;
struct snd_dmaengine_dai_dma_data dma_params_rx; struct snd_dmaengine_dai_dma_data dma_params_rx;
struct snd_dmaengine_dai_dma_data dma_params_tx; struct snd_dmaengine_dai_dma_data dma_params_tx;
};

12
target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
View File

@ -277,7 +277,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
@@ -933,8 +1027,8 @@ static int fsl_sai_probe(struct platform @@ -936,8 +1030,8 @@ static int fsl_sai_probe(struct platform
MCLK_DIR(index)); MCLK_DIR(index));
} }
@ -288,7 +288,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;
@@ -947,7 +1041,7 @@ static int fsl_sai_probe(struct platform @@ -950,7 +1044,7 @@ static int fsl_sai_probe(struct platform
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;
@ -297,7 +297,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;
@@ -993,6 +1087,9 @@ static int fsl_sai_runtime_suspend(struc @@ -996,6 +1090,9 @@ static int fsl_sai_runtime_suspend(struc
clk_disable_unprepare(sai->bus_clk); clk_disable_unprepare(sai->bus_clk);
@ -307,7 +307,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
regcache_cache_only(sai->regmap, true); regcache_cache_only(sai->regmap, true);
regcache_mark_dirty(sai->regmap); regcache_mark_dirty(sai->regmap);
@@ -1022,6 +1119,10 @@ static int fsl_sai_runtime_resume(struct @@ -1025,6 +1122,10 @@ static int fsl_sai_runtime_resume(struct
goto disable_tx_clk; goto disable_tx_clk;
} }
@ -412,8 +412,8 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
unsigned int mclk_id[2]; unsigned int mclk_id[2];
unsigned int mclk_streams; unsigned int mclk_streams;
@@ -146,6 +173,8 @@ struct fsl_sai { @@ -147,6 +174,8 @@ struct fsl_sai {
struct snd_soc_dai_driver cpu_dai_drv;
struct snd_dmaengine_dai_dma_data dma_params_rx; struct snd_dmaengine_dai_dma_data dma_params_rx;
struct snd_dmaengine_dai_dma_data dma_params_tx; struct snd_dmaengine_dai_dma_data dma_params_tx;
+ const struct fsl_sai_soc_data *soc; + const struct fsl_sai_soc_data *soc;

4
target/linux/layerscape/patches-5.4/801-audio-0027-MLK-15140-1-ASoC-fsl_sai-support-latest-sai-module.patch
View File

@ -590,7 +590,7 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to claim irq %u\n", irq); dev_err(&pdev->dev, "failed to claim irq %u\n", irq);
return ret; return ret;
@@ -1088,6 +1132,7 @@ static int fsl_sai_runtime_suspend(struc @@ -1091,6 +1135,7 @@ static int fsl_sai_runtime_suspend(struc
static int fsl_sai_runtime_resume(struct device *dev) static int fsl_sai_runtime_resume(struct device *dev)
{ {
struct fsl_sai *sai = dev_get_drvdata(dev); struct fsl_sai *sai = dev_get_drvdata(dev);
@ -598,7 +598,7 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
int ret; int ret;
ret = clk_prepare_enable(sai->bus_clk); ret = clk_prepare_enable(sai->bus_clk);
@@ -1113,11 +1158,11 @@ static int fsl_sai_runtime_resume(struct @@ -1116,11 +1161,11 @@ static int fsl_sai_runtime_resume(struct
PM_QOS_CPU_DMA_LATENCY, 0); PM_QOS_CPU_DMA_LATENCY, 0);
regcache_cache_only(sai->regmap, false); regcache_cache_only(sai->regmap, false);

6
target/linux/layerscape/patches-5.4/801-audio-0030-MLK-15960-2-ASoC-fsl_sai-refine-the-pm-runtime-funct.patch
View File

@ -16,16 +16,16 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
--- a/sound/soc/fsl/fsl_sai.c --- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -1094,6 +1094,8 @@ static int fsl_sai_probe(struct platform @@ -1097,6 +1097,8 @@ static int fsl_sai_probe(struct platform
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
+ regcache_cache_only(sai->regmap, true); + regcache_cache_only(sai->regmap, true);
+ +
ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component,
&fsl_sai_dai, 1); &sai->cpu_dai_drv, 1);
if (ret) if (ret)
@@ -1137,6 +1139,8 @@ static int fsl_sai_runtime_suspend(struc @@ -1140,6 +1142,8 @@ static int fsl_sai_runtime_suspend(struc
{ {
struct fsl_sai *sai = dev_get_drvdata(dev); struct fsl_sai *sai = dev_get_drvdata(dev);

2
target/linux/layerscape/patches-5.4/801-audio-0035-MLK-16929-1-ASoC-fsl_sai-add-bitclk_freq.patch
View File

@ -51,5 +51,5 @@ Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
unsigned int slot_width; unsigned int slot_width;
+ unsigned int bitclk_freq; + unsigned int bitclk_freq;
struct snd_soc_dai_driver cpu_dai_drv;
struct snd_dmaengine_dai_dma_data dma_params_rx; struct snd_dmaengine_dai_dma_data dma_params_rx;
struct snd_dmaengine_dai_dma_data dma_params_tx;

4
target/linux/layerscape/patches-5.4/801-audio-0037-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch
View File

@ -274,7 +274,7 @@ Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
if ((of_find_property(np, "fsl,i2s-xtor", NULL) != NULL) || if ((of_find_property(np, "fsl,i2s-xtor", NULL) != NULL) ||
(of_find_property(np, "fsl,txm-rxs", NULL) != NULL)) (of_find_property(np, "fsl,txm-rxs", NULL) != NULL))
{ {
@@ -1141,6 +1280,11 @@ static int fsl_sai_probe(struct platform @@ -1144,6 +1283,11 @@ static int fsl_sai_probe(struct platform
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;
@ -315,7 +315,7 @@ Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
unsigned int masterflag[2]; unsigned int masterflag[2];
unsigned int mclk_id[2]; unsigned int mclk_id[2];
@@ -187,6 +195,8 @@ struct fsl_sai { @@ -188,6 +196,8 @@ struct fsl_sai {
struct snd_dmaengine_dai_dma_data dma_params_tx; struct snd_dmaengine_dai_dma_data dma_params_tx;
const struct fsl_sai_soc_data *soc; const struct fsl_sai_soc_data *soc;
struct pm_qos_request pm_qos_req; struct pm_qos_request pm_qos_req;

2
target/linux/layerscape/patches-5.4/801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
View File

@ -36,7 +36,7 @@ Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
+ return 0; + return 0;
+} +}
+ +
static struct snd_soc_dai_driver fsl_sai_dai = { static struct snd_soc_dai_driver fsl_sai_dai_template = {
.probe = fsl_sai_dai_probe, .probe = fsl_sai_dai_probe,
.playback = { .playback = {
@@ -913,6 +930,7 @@ static struct snd_soc_dai_driver fsl_sai @@ -913,6 +930,7 @@ static struct snd_soc_dai_driver fsl_sai

4
target/linux/layerscape/patches-5.4/801-audio-0048-MLK-17580-ASoC-fsl-sai-Use-DSD-helper.patch
View File

@ -73,7 +73,7 @@ Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
if (ret) { if (ret) {
dev_err(cpu_dai->dev, dev_err(cpu_dai->dev,
"failed to set proper pins state: %d\n", ret); "failed to set proper pins state: %d\n", ret);
@@ -1354,9 +1345,6 @@ static int fsl_sai_probe(struct platform @@ -1357,9 +1348,6 @@ static int fsl_sai_probe(struct platform
sai->pinctrl = devm_pinctrl_get(&pdev->dev); sai->pinctrl = devm_pinctrl_get(&pdev->dev);
@ -85,7 +85,7 @@ Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
--- a/sound/soc/fsl/fsl_sai.h --- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h
@@ -211,7 +211,7 @@ struct fsl_sai { @@ -212,7 +212,7 @@ struct fsl_sai {
const struct fsl_sai_soc_data *soc; const struct fsl_sai_soc_data *soc;
struct pm_qos_request pm_qos_req; struct pm_qos_request pm_qos_req;
struct pinctrl *pinctrl; struct pinctrl *pinctrl;

2
target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); ret = pinctrl_select_state(sai->pinctrl, sai->pins_state);
if (ret) { if (ret) {
dev_err(cpu_dai->dev, dev_err(cpu_dai->dev,
@@ -1343,7 +1346,7 @@ static int fsl_sai_probe(struct platform @@ -1346,7 +1349,7 @@ static int fsl_sai_probe(struct platform
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;

2
target/linux/layerscape/patches-5.4/801-audio-0050-MLK-17531-1-ASoC-fsl-sai-add-support-for-SAI-v3.01.patch
View File

@ -238,7 +238,7 @@ Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
struct fsl_sai { struct fsl_sai {
struct platform_device *pdev; struct platform_device *pdev;
struct regmap *regmap; struct regmap *regmap;
@@ -212,6 +266,9 @@ struct fsl_sai { @@ -213,6 +267,9 @@ struct fsl_sai {
struct pm_qos_request pm_qos_req; struct pm_qos_request pm_qos_req;
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
struct pinctrl_state *pins_state; struct pinctrl_state *pins_state;

2
target/linux/layerscape/patches-5.4/801-audio-0052-MLK-18682-1-ASoC-fsl-sai-use-set_bclk_ratio-to-calcu.patch
View File

@ -94,5 +94,5 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
- unsigned int bitclk_freq; - unsigned int bitclk_freq;
+ unsigned int bitclk_ratio; + unsigned int bitclk_ratio;
struct snd_soc_dai_driver cpu_dai_drv;
struct snd_dmaengine_dai_dma_data dma_params_rx; struct snd_dmaengine_dai_dma_data dma_params_rx;
struct snd_dmaengine_dai_dma_data dma_params_tx;

2
target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
break; break;
case SND_SOC_DAIFMT_CBM_CFS: case SND_SOC_DAIFMT_CBM_CFS:
val_cr4 |= FSL_SAI_CR4_FSD_MSTR; val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
@@ -1572,14 +1570,6 @@ static int fsl_sai_remove(struct platfor @@ -1575,14 +1573,6 @@ static int fsl_sai_remove(struct platfor
return 0; return 0;
} }

2
target/linux/layerscape/patches-5.4/801-audio-0064-ASoC-fsl_sai-Mark-cache-dirty-at-resume.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
--- a/sound/soc/fsl/fsl_sai.c --- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -1614,6 +1614,8 @@ static int fsl_sai_runtime_resume(struct @@ -1617,6 +1617,8 @@ static int fsl_sai_runtime_resume(struct
PM_QOS_CPU_DMA_LATENCY, 0); PM_QOS_CPU_DMA_LATENCY, 0);
regcache_cache_only(sai->regmap, false); regcache_cache_only(sai->regmap, false);

4
target/linux/layerscape/patches-5.4/801-audio-0065-LF-106-ASoC-fsl_sai-request-BUS_FREQ_AUDIO.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
#include "fsl_dsd.h" #include "fsl_dsd.h"
#include "fsl_sai.h" #include "fsl_sai.h"
@@ -1568,6 +1569,8 @@ static int fsl_sai_runtime_suspend(struc @@ -1571,6 +1572,8 @@ static int fsl_sai_runtime_suspend(struc
regcache_cache_only(sai->regmap, true); regcache_cache_only(sai->regmap, true);
@ -29,7 +29,7 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)) if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE))
clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]); clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]);
@@ -1609,6 +1612,8 @@ static int fsl_sai_runtime_resume(struct @@ -1612,6 +1615,8 @@ static int fsl_sai_runtime_resume(struct
goto disable_tx_clk; goto disable_tx_clk;
} }

2
target/linux/layerscape/patches-5.4/801-audio-0071-MLK-21957-2-ASoC-fsl_sai-read-SAI-version-and-params.patch
View File

@ -79,7 +79,7 @@ Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
for (id = 0; id < FSL_SAI_MCLK_MAX; id++) { for (id = 0; id < FSL_SAI_MCLK_MAX; id++) {
clk_rate = clk_get_rate(sai->mclk_clk[id]); clk_rate = clk_get_rate(sai->mclk_clk[id]);
if (!clk_rate) if (!clk_rate)
@@ -1517,6 +1523,10 @@ static int fsl_sai_probe(struct platform @@ -1520,6 +1526,10 @@ static int fsl_sai_probe(struct platform
platform_set_drvdata(pdev, sai); platform_set_drvdata(pdev, sai);

2
target/linux/layerscape/patches-5.4/801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
View File

@ -109,7 +109,7 @@ Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
@@ -1030,6 +1114,7 @@ static int fsl_sai_dai_resume(struct snd @@ -1030,6 +1114,7 @@ static int fsl_sai_dai_resume(struct snd
} }
static struct snd_soc_dai_driver fsl_sai_dai = { static struct snd_soc_dai_driver fsl_sai_dai_template = {
+ .pcm_new = fsl_sai_pcm_new, + .pcm_new = fsl_sai_pcm_new,
.probe = fsl_sai_dai_probe, .probe = fsl_sai_dai_probe,
.playback = { .playback = {

2
target/linux/layerscape/patches-5.4/801-audio-0074-ASoC-fsl_sai-fix-build-issue-of-incomplete-parenthes.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/sound/soc/fsl/fsl_sai.c --- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -1631,7 +1631,7 @@ static int fsl_sai_probe(struct platform @@ -1634,7 +1634,7 @@ static int fsl_sai_probe(struct platform
if (ret) if (ret)
goto err_pm_disable; goto err_pm_disable;

4
target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- a/drivers/net/can/flexcan.c --- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c
@@ -1548,7 +1548,6 @@ static int flexcan_probe(struct platform @@ -1570,7 +1570,6 @@ static int flexcan_probe(struct platform
struct net_device *dev; struct net_device *dev;
struct flexcan_priv *priv; struct flexcan_priv *priv;
struct regulator *reg_xceiver; struct regulator *reg_xceiver;
@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
struct clk *clk_ipg = NULL, *clk_per = NULL; struct clk *clk_ipg = NULL, *clk_per = NULL;
struct flexcan_regs __iomem *regs; struct flexcan_regs __iomem *regs;
int err, irq; int err, irq;
@@ -1583,12 +1582,11 @@ static int flexcan_probe(struct platform @@ -1605,12 +1604,11 @@ static int flexcan_probe(struct platform
clock_freq = clk_get_rate(clk_per); clock_freq = clk_get_rate(clk_per);
} }

2
target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
netif_wake_queue(dev); netif_wake_queue(dev);
} }
@@ -1299,7 +1299,7 @@ static int flexcan_open(struct net_devic @@ -1321,7 +1321,7 @@ static int flexcan_open(struct net_devic
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx); priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
priv->reg_imask1_default = 0; priv->reg_imask1_default = 0;

4
target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
View File

@ -72,7 +72,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
enable_irq(dev->irq); enable_irq(dev->irq);
/* print chip status */ /* print chip status */
@@ -1298,8 +1298,8 @@ static int flexcan_open(struct net_devic @@ -1320,8 +1320,8 @@ static int flexcan_open(struct net_devic
priv->tx_mb_idx = priv->mb_count - 1; priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx); priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
@ -83,7 +83,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
priv->offload.mailbox_read = flexcan_mailbox_read; priv->offload.mailbox_read = flexcan_mailbox_read;
@@ -1311,12 +1311,12 @@ static int flexcan_open(struct net_devic @@ -1333,12 +1333,12 @@ static int flexcan_open(struct net_devic
imask = GENMASK_ULL(priv->offload.mb_last, imask = GENMASK_ULL(priv->offload.mb_last,
priv->offload.mb_first); priv->offload.mb_first);

4
target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch
View File

@ -43,7 +43,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
enable_irq(dev->irq); enable_irq(dev->irq);
/* print chip status */ /* print chip status */
@@ -1298,9 +1297,6 @@ static int flexcan_open(struct net_devic @@ -1320,9 +1319,6 @@ static int flexcan_open(struct net_devic
priv->tx_mb_idx = priv->mb_count - 1; priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx); priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
priv->offload.mailbox_read = flexcan_mailbox_read; priv->offload.mailbox_read = flexcan_mailbox_read;
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) { if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
@@ -1311,12 +1307,12 @@ static int flexcan_open(struct net_devic @@ -1333,12 +1329,12 @@ static int flexcan_open(struct net_devic
imask = GENMASK_ULL(priv->offload.mb_last, imask = GENMASK_ULL(priv->offload.mb_last,
priv->offload.mb_first); priv->offload.mb_first);

2
target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
View File

@ -82,7 +82,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
enable_irq(dev->irq); enable_irq(dev->irq);
/* print chip status */ /* print chip status */
@@ -1300,19 +1301,14 @@ static int flexcan_open(struct net_devic @@ -1322,19 +1323,14 @@ static int flexcan_open(struct net_devic
priv->offload.mailbox_read = flexcan_mailbox_read; priv->offload.mailbox_read = flexcan_mailbox_read;
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) { if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

2
target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch
View File

@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
priv->write(upper_32_bits(reg_imask), &regs->imask2); priv->write(upper_32_bits(reg_imask), &regs->imask2);
priv->write(lower_32_bits(reg_imask), &regs->imask1); priv->write(lower_32_bits(reg_imask), &regs->imask1);
enable_irq(dev->irq); enable_irq(dev->irq);
@@ -1297,6 +1298,7 @@ static int flexcan_open(struct net_devic @@ -1319,6 +1320,7 @@ static int flexcan_open(struct net_devic
flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO); flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
priv->tx_mb_idx = priv->mb_count - 1; priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx); priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);

6
target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
View File

@ -351,7 +351,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) { if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
reg_ctrl2 = priv->read(&regs->ctrl2); reg_ctrl2 = priv->read(&regs->ctrl2);
reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS; reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;
@@ -1288,6 +1456,12 @@ static int flexcan_open(struct net_devic @@ -1310,6 +1478,12 @@ static int flexcan_open(struct net_devic
struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_priv *priv = netdev_priv(dev);
int err; int err;
@ -364,7 +364,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
err = pm_runtime_get_sync(priv->dev); err = pm_runtime_get_sync(priv->dev);
if (err < 0) if (err < 0)
return err; return err;
@@ -1300,7 +1474,10 @@ static int flexcan_open(struct net_devic @@ -1322,7 +1496,10 @@ static int flexcan_open(struct net_devic
if (err) if (err)
goto out_close; goto out_close;
@ -376,7 +376,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) + priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
(sizeof(priv->regs->mb[1]) / priv->mb_size); (sizeof(priv->regs->mb[1]) / priv->mb_size);
@@ -1645,6 +1822,18 @@ static int flexcan_probe(struct platform @@ -1667,6 +1844,18 @@ static int flexcan_probe(struct platform
priv->devtype_data = devtype_data; priv->devtype_data = devtype_data;
priv->reg_xceiver = reg_xceiver; priv->reg_xceiver = reg_xceiver;

2
target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
View File

@ -54,7 +54,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
} }
if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) { if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
@@ -1831,7 +1837,7 @@ static int flexcan_probe(struct platform @@ -1853,7 +1859,7 @@ static int flexcan_probe(struct platform
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) { if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) { if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

2
target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
View File

@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
static const struct flexcan_devtype_data fsl_vf610_devtype_data = { static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
@@ -1738,6 +1745,7 @@ out_put_node: @@ -1760,6 +1767,7 @@ out_put_node:
} }
static const struct of_device_id flexcan_of_match[] = { static const struct of_device_id flexcan_of_match[] = {

2
target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch
View File

@ -35,7 +35,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = { static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
@@ -1754,6 +1761,7 @@ static const struct of_device_id flexcan @@ -1776,6 +1783,7 @@ static const struct of_device_id flexcan
{ .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
{ .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, }, { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, }, { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },

6
target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
#include <linux/regmap.h> #include <linux/regmap.h>
#define DRV_NAME "flexcan" #define DRV_NAME "flexcan"
@@ -1920,7 +1921,7 @@ static int __maybe_unused flexcan_suspen @@ -1942,7 +1943,7 @@ static int __maybe_unused flexcan_suspen
{ {
struct net_device *dev = dev_get_drvdata(device); struct net_device *dev = dev_get_drvdata(device);
struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_priv *priv = netdev_priv(dev);
@ -37,7 +37,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
if (netif_running(dev)) { if (netif_running(dev)) {
/* if wakeup is enabled, enter stop mode /* if wakeup is enabled, enter stop mode
@@ -1932,25 +1933,27 @@ static int __maybe_unused flexcan_suspen @@ -1954,25 +1955,27 @@ static int __maybe_unused flexcan_suspen
if (err) if (err)
return err; return err;
} else { } else {
@ -69,7 +69,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
priv->can.state = CAN_STATE_ERROR_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE;
if (netif_running(dev)) { if (netif_running(dev)) {
@@ -1962,15 +1965,19 @@ static int __maybe_unused flexcan_resume @@ -1984,15 +1987,19 @@ static int __maybe_unused flexcan_resume
if (err) if (err)
return err; return err;
} else { } else {

6
target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
View File

@ -126,7 +126,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
reg_mcr = priv->read(&regs->mcr); reg_mcr = priv->read(&regs->mcr);
@@ -1745,11 +1789,6 @@ static int flexcan_setup_stop_mode(struc @@ -1767,11 +1811,6 @@ static int flexcan_setup_stop_mode(struc
gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit, gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit,
priv->stm.ack_gpr, priv->stm.ack_bit); priv->stm.ack_gpr, priv->stm.ack_bit);
@ -138,7 +138,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
return 0; return 0;
out_put_node: out_put_node:
@@ -1757,6 +1796,30 @@ out_put_node: @@ -1779,6 +1818,30 @@ out_put_node:
return ret; return ret;
} }
@ -169,7 +169,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
static const struct of_device_id flexcan_of_match[] = { static const struct of_device_id flexcan_of_match[] = {
{ .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, }, { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
{ .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
@@ -1899,9 +1962,19 @@ static int flexcan_probe(struct platform @@ -1921,9 +1984,19 @@ static int flexcan_probe(struct platform
devm_can_led_init(dev); devm_can_led_init(dev);
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) { if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {

2
target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch
View File

@ -36,7 +36,7 @@ Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
static const struct can_bittiming_const flexcan_bittiming_const = { static const struct can_bittiming_const flexcan_bittiming_const = {
.name = DRV_NAME, .name = DRV_NAME,
.tseg1_min = 4, .tseg1_min = 4,
@@ -1831,6 +1836,8 @@ static const struct of_device_id flexcan @@ -1853,6 +1858,8 @@ static const struct of_device_id flexcan
{ .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, }, { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, }, { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
{ .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, }, { .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },

2
target/linux/layerscape/patches-5.4/804-crypto-0014-MLK-9769-8-crypto-caam-add-a-test-for-the-RNG.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -147,6 +147,14 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API @@ -148,6 +148,14 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API
Selecting this will register the SEC4 hardware rng to Selecting this will register the SEC4 hardware rng to
the hw_random API for suppying the kernel entropy pool. the hw_random API for suppying the kernel entropy pool.

2
target/linux/layerscape/patches-5.4/804-crypto-0019-MLKU-38-3-crypto-caam-add-SNVS-SECVIO-support.patch
View File

@ -67,7 +67,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -155,6 +155,13 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST @@ -156,6 +156,13 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST
caam RNG. This test is several minutes long and executes caam RNG. This test is several minutes long and executes
just before the RNG is registered with the hw_random API. just before the RNG is registered with the hw_random API.

2
target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch
View File

@ -91,7 +91,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -155,6 +155,36 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST @@ -156,6 +156,36 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST
caam RNG. This test is several minutes long and executes caam RNG. This test is several minutes long and executes
just before the RNG is registered with the hw_random API. just before the RNG is registered with the hw_random API.

2
target/linux/layerscape/patches-5.4/804-crypto-0021-MLK-19801-1-crypto-caam-add-tag-functionality.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -147,6 +147,16 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API @@ -148,6 +148,16 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API
Selecting this will register the SEC4 hardware rng to Selecting this will register the SEC4 hardware rng to
the hw_random API for suppying the kernel entropy pool. the hw_random API for suppying the kernel entropy pool.

14
target/linux/layerscape/patches-5.4/804-crypto-0028-crypto-caam-qi-add-support-for-TLS-1.0-record.patch
View File

@ -485,7 +485,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
const bool is_qi); const bool is_qi);
--- a/drivers/crypto/caam/caamalg_qi.c --- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c
@@ -290,6 +290,167 @@ static int des3_aead_setkey(struct crypt @@ -296,6 +296,167 @@ static int des3_aead_setkey(struct crypt
return err; return err;
} }
@ -653,7 +653,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
static int gcm_set_sh_desc(struct crypto_aead *aead) static int gcm_set_sh_desc(struct crypto_aead *aead)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(aead); struct caam_ctx *ctx = crypto_aead_ctx(aead);
@@ -809,6 +970,29 @@ struct aead_edesc { @@ -820,6 +981,29 @@ struct aead_edesc {
}; };
/* /*
@ -683,7 +683,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
* skcipher_edesc - s/w-extended skcipher descriptor * skcipher_edesc - s/w-extended skcipher descriptor
* @src_nents: number of segments in input scatterlist * @src_nents: number of segments in input scatterlist
* @dst_nents: number of segments in output scatterlist * @dst_nents: number of segments in output scatterlist
@@ -900,6 +1084,18 @@ static void aead_unmap(struct device *de @@ -911,6 +1095,18 @@ static void aead_unmap(struct device *de
dma_unmap_single(dev, edesc->assoclen_dma, 4, DMA_TO_DEVICE); dma_unmap_single(dev, edesc->assoclen_dma, 4, DMA_TO_DEVICE);
} }
@ -702,7 +702,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
static void skcipher_unmap(struct device *dev, struct skcipher_edesc *edesc, static void skcipher_unmap(struct device *dev, struct skcipher_edesc *edesc,
struct skcipher_request *req) struct skcipher_request *req)
{ {
@@ -1192,6 +1388,243 @@ static int aead_decrypt(struct aead_requ @@ -1203,6 +1399,243 @@ static int aead_decrypt(struct aead_requ
return aead_crypt(req, false); return aead_crypt(req, false);
} }
@ -946,7 +946,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
static int ipsec_gcm_encrypt(struct aead_request *req) static int ipsec_gcm_encrypt(struct aead_request *req)
{ {
return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_crypt(req, return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_crypt(req,
@@ -2411,6 +2844,26 @@ static struct caam_aead_alg driver_aeads @@ -2446,6 +2879,26 @@ static struct caam_aead_alg driver_aeads
.geniv = true, .geniv = true,
} }
}, },
@ -973,7 +973,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
}; };
static int caam_init_common(struct caam_ctx *ctx, struct caam_alg_entry *caam, static int caam_init_common(struct caam_ctx *ctx, struct caam_alg_entry *caam,
@@ -2418,6 +2871,16 @@ static int caam_init_common(struct caam_ @@ -2453,6 +2906,16 @@ static int caam_init_common(struct caam_
{ {
struct caam_drv_private *priv; struct caam_drv_private *priv;
struct device *dev; struct device *dev;
@ -990,7 +990,7 @@ Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
/* /*
* distribute tfms across job rings to ensure in-order * distribute tfms across job rings to ensure in-order
@@ -2449,6 +2912,21 @@ static int caam_init_common(struct caam_ @@ -2484,6 +2947,21 @@ static int caam_init_common(struct caam_
ctx->adata.algtype = OP_TYPE_CLASS2_ALG | caam->class2_alg_type; ctx->adata.algtype = OP_TYPE_CLASS2_ALG | caam->class2_alg_type;
ctx->qidev = dev; ctx->qidev = dev;

2
target/linux/layerscape/patches-5.4/804-crypto-0032-crypto-caam-add-CAAM-job-ring-UIO-support.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -202,6 +202,17 @@ config CRYPTO_DEV_FSL_CAAM_SECVIO @@ -203,6 +203,17 @@ config CRYPTO_DEV_FSL_CAAM_SECVIO
handler functions which can be specified to act on the consequences handler functions which can be specified to act on the consequences
of a security violation. of a security violation.

2
target/linux/layerscape/patches-5.4/804-crypto-0033-LFV-26-crypto-caam-fix-Secure-Memory-driver-init.patch
View File

@ -33,7 +33,7 @@ Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -166,7 +166,7 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST @@ -167,7 +167,7 @@ config CRYPTO_DEV_FSL_CAAM_RNG_TEST
just before the RNG is registered with the hw_random API. just before the RNG is registered with the hw_random API.
config CRYPTO_DEV_FSL_CAAM_SM config CRYPTO_DEV_FSL_CAAM_SM

2
target/linux/layerscape/patches-5.4/804-crypto-0034-LF-63-1-crypto-caam-fix-SM-test-init.patch
View File

@ -46,7 +46,7 @@ Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
--- a/drivers/crypto/caam/Kconfig --- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig
@@ -190,6 +190,7 @@ config CRYPTO_DEV_FSL_CAAM_SM_SLOTSIZE @@ -191,6 +191,7 @@ config CRYPTO_DEV_FSL_CAAM_SM_SLOTSIZE
config CRYPTO_DEV_FSL_CAAM_SM_TEST config CRYPTO_DEV_FSL_CAAM_SM_TEST
tristate "CAAM Secure Memory - Keystore Test/Example (EXPERIMENTAL)" tristate "CAAM Secure Memory - Keystore Test/Example (EXPERIMENTAL)"
depends on CRYPTO_DEV_FSL_CAAM_SM depends on CRYPTO_DEV_FSL_CAAM_SM

Some files were not shown because too many files have changed in this diff Show More