Revert "bcm2711: Retain support for old dtbs"

This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157.

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index b7491dd..91a758c 100644 (file)
--- a/arch/arm/mach-bcm/board_bcm2835.c
+++ b/arch/arm/mach-bcm/board_bcm2835.c
@@ -123,8 +123,6 @@ MACHINE_END
 static const char * const bcm2711_compat[] = {
 #ifdef CONFIG_ARCH_MULTI_V7
        "brcm,bcm2711",
-       // Temporary, for backwards-compatibility with old DTBs
-       "brcm,bcm2838",
 #endif
        NULL
 };

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 7f71477..06dbcea 100644 (file)
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2366,8 +2366,6 @@ static const struct cprman_plat_data cprman_bcm2711_plat_data = {
 static const struct of_device_id bcm2835_clk_of_match[] = {
        { .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data },
        { .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data },
-       // Temporary, for backwards-compatibility with old DTBs
-       { .compatible = "brcm,bcm2838-cprman", .data = &cprman_bcm2711_plat_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match);

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index cf30821..43e3127 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -1079,11 +1079,6 @@ static const struct of_device_id bcm2835_pinctrl_match[] = {
                .compatible = "brcm,bcm2711-gpio",
                .data = &bcm2711_pinconf_ops,
        },
-       // Temporary, for backwards-compatibility with old DTBs
-       {
-               .compatible = "brcm,bcm2838-gpio",
-               .data = &bcm2711_pinconf_ops,
-       },
        {}
 };