Skip to content

Commit

Permalink
bcm2711: Retain support for old dtbs
Browse files Browse the repository at this point in the history
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: #3244

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  • Loading branch information
Phil Elwell authored and popcornmix committed Feb 20, 2020
1 parent d01d371 commit d8f58f5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-bcm/board_bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down
2 changes: 2 additions & 0 deletions drivers/clk/bcm/clk-bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -2370,6 +2370,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);
Expand Down
5 changes: 5 additions & 0 deletions drivers/pinctrl/bcm/pinctrl-bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{}
};

Expand Down

0 comments on commit d8f58f5

Please sign in to comment.