svn commit: r356006 - in stable/12/sys: arm/broadcom/bcm2835 arm/conf conf

[Kyle Evans]

Author: kevans
Date: Sun Dec 22 15:55:52 2019
New Revision: 356006
URL: https://svnweb.freebsd.org/changeset/base/356006

Log:
  MFC r355867, r355875: rpi mapping detection fixes
  
  r355867: arm: add SOC_BRCM_BCM2837 option, include it in GENERIC
  r355875: bcm2835_vcbus: add legacy compat mappings

Modified:
  stable/12/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  stable/12/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
  stable/12/sys/arm/conf/GENERIC
  stable/12/sys/conf/options.arm
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
==============================================================================
--- stable/12/sys/arm/broadcom/bcm2835/bcm2835_machdep.c	Sun Dec 22 11:58:44 2019	(r356005)
+++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_machdep.c	Sun Dec 22 15:55:52 2019	(r356006)
@@ -139,7 +139,7 @@ FDT_PLATFORM_DEF2(bcm2835, bcm2835_legacy, "bcm2835 (l
 FDT_PLATFORM_DEF2(bcm2835, bcm2835, "bcm2835", 0, "brcm,bcm2835", 100);
 #endif
 
-#ifdef SOC_BCM2836
+#if defined(SOC_BCM2836) || defined(SOC_BRCM_BCM2837)
 static platform_method_t bcm2836_methods[] = {
 	PLATFORMMETHOD(platform_devmap_init,	bcm2836_devmap_init),
 	PLATFORMMETHOD(platform_late_init,	bcm2835_late_init),
@@ -155,4 +155,4 @@ static platform_method_t bcm2836_methods[] = {
 FDT_PLATFORM_DEF2(bcm2836, bcm2836_legacy, "bcm2836 (legacy)", 0, "brcm,bcm2709", 100);
 FDT_PLATFORM_DEF2(bcm2836, bcm2836, "bcm2836", 0, "brcm,bcm2836", 100);
 FDT_PLATFORM_DEF2(bcm2836, bcm2837, "bcm2837", 0, "brcm,bcm2837", 100);
-#endif
+#endif	/* defined(SOC_BCM2836) || defined(SOC_BRCM_BCM2837) */

Modified: stable/12/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
==============================================================================
--- stable/12/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c	Sun Dec 22 11:58:44 2019	(r356005)
+++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c	Sun Dec 22 15:55:52 2019	(r356006)
@@ -152,13 +152,27 @@ static struct bcm283x_memory_soc_cfg {
 	bus_addr_t			 busdma_lowaddr;
 } bcm283x_memory_configs[] = {
 #ifdef SOC_BCM2835
+	/* Legacy */
 	{
 		.memmap = bcm2835_memmap,
+		.soc_compat = "raspberrypi,model-b",
+		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
+	},
+	/* Modern */
+	{
+		.memmap = bcm2835_memmap,
 		.soc_compat = "brcm,bcm2835",
 		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
 	},
 #endif
 #ifdef SOC_BCM2836
+	/* Legacy */
+	{
+		.memmap = bcm2836_memmap,
+		.soc_compat = "brcm,bcm2709",
+		.busdma_lowaddr = BUS_SPACE_MAXADDR_32BIT,
+	},
+	/* Modern */
 	{
 		.memmap = bcm2836_memmap,
 		.soc_compat = "brcm,bcm2836",

Modified: stable/12/sys/arm/conf/GENERIC
==============================================================================
--- stable/12/sys/arm/conf/GENERIC	Sun Dec 22 11:58:44 2019	(r356005)
+++ stable/12/sys/arm/conf/GENERIC	Sun Dec 22 15:55:52 2019	(r356006)
@@ -57,6 +57,7 @@ options 	SOC_ALLWINNER_A83T
 options 	SOC_ALLWINNER_H2PLUS
 options 	SOC_ALLWINNER_H3
 options 	SOC_BCM2836
+options 	SOC_BRCM_BCM2837
 options 	SOC_MV_ARMADA38X
 options 	SOC_MV_ARMADAXP
 options		SOC_TI_AM335X

Modified: stable/12/sys/conf/options.arm
==============================================================================
--- stable/12/sys/conf/options.arm	Sun Dec 22 11:58:44 2019	(r356005)
+++ stable/12/sys/conf/options.arm	Sun Dec 22 15:55:52 2019	(r356006)
@@ -47,6 +47,7 @@ SOC_ALTERA_ARRIA10	opt_global.h
 SOC_ALTERA_CYCLONE5	opt_global.h
 SOC_BCM2835		opt_global.h
 SOC_BCM2836		opt_global.h
+SOC_BRCM_BCM2837	opt_global.h
 SOC_IMX51		opt_global.h
 SOC_IMX53		opt_global.h
 SOC_IMX6		opt_global.h