[src/trunk]: src/sys/arch Rename watchdog -> bcmpmwdog and sdhost to bcmsdhost

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71e431f34869
branches:  trunk
changeset: 452206:71e431f34869
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jun 22 07:58:55 2019 +0000

description:
Rename watchdog -> bcmpmwdog and sdhost to bcmsdhost

diffstat:

 sys/arch/arm/broadcom/files.bcm2835 |  10 +++++-----
 sys/arch/evbarm/conf/GENERIC        |   6 +++---
 sys/arch/evbarm/conf/GENERIC64      |   6 +++---
 sys/arch/evbarm/conf/RPI            |   8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (131 lines):

diff -r c92b1543c358 -r 71e431f34869 sys/arch/arm/broadcom/files.bcm2835
--- a/sys/arch/arm/broadcom/files.bcm2835       Sat Jun 22 07:17:13 2019 +0000
+++ b/sys/arch/arm/broadcom/files.bcm2835       Sat Jun 22 07:58:55 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.bcm2835,v 1.33 2019/05/08 13:40:14 isaki Exp $
+#      $NetBSD: files.bcm2835,v 1.34 2019/06/22 07:58:55 skrll Exp $
 #
 # Configuration info for Broadcom BCM2835 ARM Peripherals
 #
@@ -25,8 +25,8 @@
 file   arch/arm/broadcom/bcm2835_tmr.c         bcmtmr & !soc_bcm2836
 
 # Power Management, Reset Controller, and Watchdog (BCM2835_PM_BASE)
-device watchdog: sysmon_wdog
-attach watchdog at fdt with bcmpmwdog_fdt
+device bcmpmwdog: sysmon_wdog
+attach bcmpmwdog at fdt with bcmpmwdog_fdt
 file   arch/arm/broadcom/bcm2835_pmwdog.c      bcmpmwdog_fdt
 
 # Random number generator (BCM2835_RNG_BASE)
@@ -48,8 +48,8 @@
 file   arch/arm/broadcom/bcm2835_emmc.c        bcmemmc
 
 # SD Host Controller (BCM2835_SDHOST_BASE)
-device sdhost: sdmmcbus
-attach sdhost at fdt with bcmsdhost
+device bcmsdhost: sdmmcbus
+attach bcmsdhost at fdt with bcmsdhost
 file   arch/arm/broadcom/bcm2835_sdhost.c      bcmsdhost       needs-flag
 
 # DMA Controller (BCM2835_DMA0_BASE)
diff -r c92b1543c358 -r 71e431f34869 sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC      Sat Jun 22 07:17:13 2019 +0000
+++ b/sys/arch/evbarm/conf/GENERIC      Sat Jun 22 07:58:55 2019 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.40 2019/06/14 21:28:10 tnn Exp $
+#      $NetBSD: GENERIC,v 1.41 2019/06/22 07:58:55 skrll Exp $
 #
 #      GENERIC ARM (aarch32) kernel
 #
@@ -310,7 +310,7 @@
 dwcwdt*        at fdt?                 # DesignWare watchdog
 mesonwdt*      at fdt?                 # Amlogic Meson watchdog
 sunxiwdt*      at fdt?                 # Allwinner watchdog
-watchdog*      at fdt?                 # Broadcom BCM283x watchdog
+bcmpmwdog*     at fdt?                 # Broadcom BCM283x watchdog
 
 # Interrupt controller
 gic*           at fdt? pass 1          # ARM GIC
@@ -515,13 +515,13 @@
 spkr*          at audio?
 
 # SDMMC
+bcmsdhost*     at fdt?                 # Broadcom BCM283x SD Host Interface
 dwcmmc*                at fdt?                 # DesignWare SDMMC
 mesonsdio*     at fdt?                 # Amlogic Meson SDIO controller
 mesonsdhc*     at fdt?                 # Amlogic Meson SDHC controller
 mmcpwrseq*     at fdt?                 # Simple MMC power sequence provider
 plmmc*         at fdt?                 # ARM PrimeCell MCI
 sdhc*          at fdt?                 # SD Host Controller Interface
-sdhost*                at fdt?                 # Broadcom BCM283x SD Host Interface
 sunximmc*      at fdt?                 # Allwinner SD/MMC
 sdmmc*         at sdmmcbus?
 ld0            at sdmmc0
diff -r c92b1543c358 -r 71e431f34869 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Sat Jun 22 07:17:13 2019 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Sat Jun 22 07:58:55 2019 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.99 2019/06/15 06:40:34 maxv Exp $
+#      $NetBSD: GENERIC64,v 1.100 2019/06/22 07:58:55 skrll Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -196,10 +196,10 @@
 tegratimer*    at fdt?                 # Timers
 
 # Watchdog
+bcmpmwdog*     at fdt?                 # Broadcom BCM283x watchdog
 mesongxwdt*    at fdt?                 # Amlogic Meson GX watchdog
 sbsawdt*       at acpi?                # ARM SBSA-compliant watchdog
 sunxiwdt*      at fdt?                 # Allwinner watchdog
-watchdog*      at fdt?                 # Broadcom BCM283x watchdog
 
 # Interrupt controller
 bcmicu*                at fdt? pass 1          # Broadcom BCM283x ICU
@@ -369,12 +369,12 @@
 tegrartc*      at fdt?                 # NVIDIA Tegra RTC
 
 # SDMMC
+bcmsdhost*     at fdt?                 # Broadcom BCM283x SD Host Interface
 dwcmmc*                at fdt?                 # Designware SD/MMC
 mesongxmmc*    at fdt?                 # Amlogic Meson GX eMMC/SD/SDIO controller
 mmcpwrseq*     at fdt?                 # Simple MMC power sequence provider
 rkemmcphy*     at fdt?                 # Rockchip eMMC PHY
 sdhc*          at fdt?                 # SD Host Controller Interface
-sdhost*                at fdt?                 # Broadcom BCM283x SD Host Interface
 sunximmc*      at fdt?                 # Allwinner SD/MMC
 sdmmc*         at sdmmcbus?
 ld0            at sdmmc0
diff -r c92b1543c358 -r 71e431f34869 sys/arch/evbarm/conf/RPI
--- a/sys/arch/evbarm/conf/RPI  Sat Jun 22 07:17:13 2019 +0000
+++ b/sys/arch/evbarm/conf/RPI  Sat Jun 22 07:58:55 2019 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RPI,v 1.86 2019/03/09 15:23:59 skrll Exp $
+#      $NetBSD: RPI,v 1.87 2019/06/22 07:58:55 skrll Exp $
 #
 #      RPi -- Raspberry Pi
 #
@@ -117,7 +117,7 @@
 #options       RPI_HWCURSOR
 
 # Power management, Reset controller and Watchdog registers
-watchdog0      at fdt?
+bcmpmwdog*     at fdt?
 
 # Random number generator
 bcmrng0        at fdt?
@@ -130,8 +130,8 @@
 sdmmc*         at sdhc?
 
 # SD host controller
-sdhost*        at fdt?
-sdmmc*                 at sdhost?
+bcmsdhost*     at fdt?
+sdmmc*                 at bcmsdhost?
 
 ld*     at sdmmc?