mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-03 22:44:27 -05:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
@@ -297,7 +297,7 @@ enum cvmx_board_types_enum {
|
|
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
- CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
|
|
+ CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
|
CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
|
|
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
|
|
|
@@ -400,7 +400,7 @@ static inline const char *cvmx_board_typ
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
- ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
|
|
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
|
}
|
|
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
|
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
|
@@ -773,7 +773,7 @@ int __init octeon_prune_device_tree(void
|
|
if (fdt_check_header(initial_boot_params))
|
|
panic("Corrupt Device Tree.");
|
|
|
|
- WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N,
|
|
+ WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_ITUS_SHIELD,
|
|
"Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.",
|
|
cvmx_board_type_to_string(octeon_bootinfo->board_type));
|
|
|
|
--- a/arch/mips/pci/pci-octeon.c
|
|
+++ b/arch/mips/pci/pci-octeon.c
|
|
@@ -211,8 +211,6 @@ const char *octeon_get_pci_interrupts(vo
|
|
return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
|
|
case CVMX_BOARD_TYPE_BBGW_REF:
|
|
return "AABCD";
|
|
- case CVMX_BOARD_TYPE_CUST_DSR1000N:
|
|
- return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";
|
|
case CVMX_BOARD_TYPE_THUNDER:
|
|
case CVMX_BOARD_TYPE_EBH3000:
|
|
default:
|