diff --git a/config/kernel/linux-rockchip64-current.config b/config/kernel/linux-rockchip64-current.config index d05dce0a6e..da50af3a5b 100644 --- a/config/kernel/linux-rockchip64-current.config +++ b/config/kernel/linux-rockchip64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.16 Kernel Configuration +# Linux/arm64 5.10.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -226,6 +226,7 @@ CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -7927,7 +7928,6 @@ CONFIG_RESET_SUNXI=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY_MIPI_DPHY=y CONFIG_PHY_XGENE=y -# CONFIG_USB_LGM_PHY is not set CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN6I_MIPI_DPHY=m CONFIG_PHY_SUN9I_USB=m diff --git a/config/kernel/linux-rockchip64-dev.config b/config/kernel/linux-rockchip64-dev.config index ef0b8270a3..62a4fd5e71 100644 --- a/config/kernel/linux-rockchip64-dev.config +++ b/config/kernel/linux-rockchip64-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.11.0 Kernel Configuration +# Linux/arm64 5.11.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -226,6 +226,7 @@ CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -7989,7 +7990,6 @@ CONFIG_RESET_SUNXI=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY_MIPI_DPHY=y CONFIG_PHY_XGENE=y -# CONFIG_USB_LGM_PHY is not set CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN6I_MIPI_DPHY=m CONFIG_PHY_SUN9I_USB=m diff --git a/patch/kernel/rockchip64-current/general-bluetooth-add-new-quirk.patch b/patch/kernel/rockchip64-current/general-bluetooth-add-new-quirk.patch index bbfddd536a..c2e57fe5eb 100644 --- a/patch/kernel/rockchip64-current/general-bluetooth-add-new-quirk.patch +++ b/patch/kernel/rockchip64-current/general-bluetooth-add-new-quirk.patch @@ -20,9 +20,9 @@ index 16ab6ce87883..8e4c16210d18 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -238,6 +238,13 @@ enum { - * during the hdev->setup vendor callback. + * HCI after resume. */ - HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, + HCI_QUIRK_NO_SUSPEND_NOTIFIER, + + /* When this quirk is set, max_page for local extended features + * is set to 1, even if controller reports higher number. Some diff --git a/patch/kernel/rockchip64-current/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch b/patch/kernel/rockchip64-current/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch index 95a6dd68f6..cfe781d1a2 100644 --- a/patch/kernel/rockchip64-current/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch +++ b/patch/kernel/rockchip64-current/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch @@ -1,29 +1,28 @@ -From 002593cfe8fc7539a6aa2dfb246d832e0b8b8516 Mon Sep 17 00:00:00 2001 -From: Aditya Prayoga -Date: Tue, 15 Sep 2020 13:29:45 +0700 +From 9de42a7ce7b821596a151cfaa0aca79d53c2170f Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Sun, 7 Mar 2021 15:24:02 +0100 Subject: [PATCH] PCI: rockchip: support ep-gpio undefined case Signed-off-by: Aditya Prayoga +Changed by: Igor Pecovnik --- - drivers/pci/controller/pcie-rockchip.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + drivers/pci/controller/pcie-rockchip.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c -index c53d1322a..e4f42591d 100644 +index 990a00e08..193d26562 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c -@@ -119,9 +119,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) +@@ -118,8 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) } if (rockchip->is_rc) { -- rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH); +- rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", +- GPIOD_OUT_HIGH); + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH); - if (IS_ERR(rockchip->ep_gpio)) { -- dev_err(dev, "missing ep-gpios property in node\n"); -+ dev_err(dev, "invalid ep-gpios property in node\n"); - return PTR_ERR(rockchip->ep_gpio); - } - } + if (IS_ERR(rockchip->ep_gpio)) + return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio), + "failed to get ep GPIO\n"); -- Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/kernel/rockchip64-dev/general-bluetooth-add-new-quirk.patch b/patch/kernel/rockchip64-dev/general-bluetooth-add-new-quirk.patch index bbfddd536a..c2e57fe5eb 100644 --- a/patch/kernel/rockchip64-dev/general-bluetooth-add-new-quirk.patch +++ b/patch/kernel/rockchip64-dev/general-bluetooth-add-new-quirk.patch @@ -20,9 +20,9 @@ index 16ab6ce87883..8e4c16210d18 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -238,6 +238,13 @@ enum { - * during the hdev->setup vendor callback. + * HCI after resume. */ - HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, + HCI_QUIRK_NO_SUSPEND_NOTIFIER, + + /* When this quirk is set, max_page for local extended features + * is set to 1, even if controller reports higher number. Some diff --git a/patch/kernel/rockchip64-dev/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch b/patch/kernel/rockchip64-dev/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch index 95a6dd68f6..662969fe5a 100644 --- a/patch/kernel/rockchip64-dev/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch +++ b/patch/kernel/rockchip64-dev/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch @@ -1,29 +1,28 @@ -From 002593cfe8fc7539a6aa2dfb246d832e0b8b8516 Mon Sep 17 00:00:00 2001 -From: Aditya Prayoga -Date: Tue, 15 Sep 2020 13:29:45 +0700 -Subject: [PATCH] PCI: rockchip: support ep-gpio undefined case +From 9de42a7ce7b821596a151cfaa0aca79d53c2170f Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Sun, 7 Mar 2021 15:24:02 +0100 +Subject: [PATCH] oo Signed-off-by: Aditya Prayoga +Changed by: Igor Pecovnik --- - drivers/pci/controller/pcie-rockchip.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + drivers/pci/controller/pcie-rockchip.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c -index c53d1322a..e4f42591d 100644 +index 990a00e08..193d26562 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c -@@ -119,9 +119,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) +@@ -118,8 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) } if (rockchip->is_rc) { -- rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH); +- rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", +- GPIOD_OUT_HIGH); + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH); - if (IS_ERR(rockchip->ep_gpio)) { -- dev_err(dev, "missing ep-gpios property in node\n"); -+ dev_err(dev, "invalid ep-gpios property in node\n"); - return PTR_ERR(rockchip->ep_gpio); - } - } + if (IS_ERR(rockchip->ep_gpio)) + return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio), + "failed to get ep GPIO\n"); -- Created with Armbian build tools https://github.com/armbian/build