bcm2711: Retain support for old dtbs

Source: kernel.org MR: 103889 Type: Enhancement Disposition: Merged from https://github.com/raspberrypi/linux.git rpi-5.4.y ChangeID: cfdedc6a080a1bf76b24db170756e919a4928ae7 Description: The recent series switching to bcm2711 as the DT identifier broke Pis running with old DTBs. Add some bcm2838 compatible strings as a temporary measure, at least until the next full Raspbian image with bcm2711 DTBs. See: raspberrypi/linux#3244 Signed-off-by: Phil Elwell <phil@raspberrypi.org> Signed-off-by: Corey Minyard <cminyard@mvista.com>
MontaVista-OpenSourceTechnology · Jun 4, 2020 · b01b88c · b01b88c
1 parent 65abf81
commit b01b88c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
@@ -110,6 +110,8 @@ static const char * const bcm2835_compat[] = {
 	"brcm,bcm2836",
 	"brcm,bcm2837",
 	"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
@@ -2372,6 +2372,8 @@ 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
@@ -1078,6 +1078,11 @@ 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,
+	},
 	{}
 };