svn commit: r350602 - in stable/12/sys: arm/allwinner arm/conf modules/allwinner modules/allwinner/aw_rsb modules/allwinner/aw_rtc modules/allwinner/aw_sid modules/allwinner/aw_thermal modules/allw...
Emmanuel Vadot
manu at FreeBSD.org
Mon Aug 5 18:05:24 UTC 2019
Author: manu
Date: Mon Aug 5 18:05:22 2019
New Revision: 350602
URL: https://svnweb.freebsd.org/changeset/base/350602
Log:
MFC r346305, r346691-r346694, r346696-r346697
r346305:
arm: allwinner: Makes more device optional
r346691:
arm: allwinner: Add pnpinfo for aw_sid and add module Makefile
r346692:
arm: allwinner: Add pnp info to aw_thermal and compile it as module too
r346693:
arm: allwinner: Add pnp info to axp81x and compile it as module too
r346694:
arm: allwinner: Add pnp info to aw_rtc and compile it as module too
r346696:
arm: allwinner: Add pnp info to if_awg and compile it as module too
While here make it depend on aw_sid as it's needed for mac generation.
r346697:
arm: allwinner: Add pnp info to aw_rsb and compile it as module too
Added:
stable/12/sys/modules/allwinner/aw_rsb/
- copied from r346697, head/sys/modules/allwinner/aw_rsb/
stable/12/sys/modules/allwinner/aw_rtc/
- copied from r346694, head/sys/modules/allwinner/aw_rtc/
stable/12/sys/modules/allwinner/aw_sid/
- copied from r346694, head/sys/modules/allwinner/aw_sid/
stable/12/sys/modules/allwinner/aw_thermal/
- copied from r346694, head/sys/modules/allwinner/aw_thermal/
stable/12/sys/modules/allwinner/axp81x/
- copied from r346694, head/sys/modules/allwinner/axp81x/
stable/12/sys/modules/allwinner/if_awg/
- copied from r346697, head/sys/modules/allwinner/if_awg/
Modified:
stable/12/sys/arm/allwinner/aw_rsb.c
stable/12/sys/arm/allwinner/aw_rtc.c
stable/12/sys/arm/allwinner/aw_sid.c
stable/12/sys/arm/allwinner/aw_thermal.c
stable/12/sys/arm/allwinner/axp81x.c
stable/12/sys/arm/allwinner/files.allwinner
stable/12/sys/arm/allwinner/if_awg.c
stable/12/sys/arm/conf/GENERIC
stable/12/sys/modules/allwinner/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm/allwinner/aw_rsb.c
==============================================================================
--- stable/12/sys/arm/allwinner/aw_rsb.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/aw_rsb.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -496,3 +496,5 @@ EARLY_DRIVER_MODULE(iicbus, rsb, iicbus_driver, iicbus
EARLY_DRIVER_MODULE(rsb, simplebus, rsb_driver, rsb_devclass, 0, 0,
BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(rsb, 1);
+MODULE_DEPEND(rsb, iicbus, 1, 1, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
Modified: stable/12/sys/arm/allwinner/aw_rtc.c
==============================================================================
--- stable/12/sys/arm/allwinner/aw_rtc.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/aw_rtc.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -185,6 +185,8 @@ static devclass_t aw_rtc_devclass;
EARLY_DRIVER_MODULE(aw_rtc, simplebus, aw_rtc_driver, aw_rtc_devclass, 0, 0,
BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+MODULE_VERSION(aw_rtc, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
static int
aw_rtc_probe(device_t dev)
Modified: stable/12/sys/arm/allwinner/aw_sid.c
==============================================================================
--- stable/12/sys/arm/allwinner/aw_sid.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/aw_sid.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -414,3 +414,4 @@ static devclass_t aw_sid_devclass;
EARLY_DRIVER_MODULE(aw_sid, simplebus, aw_sid_driver, aw_sid_devclass, 0, 0,
BUS_PASS_RESOURCE + BUS_PASS_ORDER_FIRST);
MODULE_VERSION(aw_sid, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
Modified: stable/12/sys/arm/allwinner/aw_thermal.c
==============================================================================
--- stable/12/sys/arm/allwinner/aw_thermal.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/aw_thermal.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -728,3 +728,5 @@ static devclass_t aw_thermal_devclass;
DRIVER_MODULE(aw_thermal, simplebus, aw_thermal_driver, aw_thermal_devclass,
0, 0);
MODULE_VERSION(aw_thermal, 1);
+MODULE_DEPEND(aw_thermal, aw_sid, 1, 1, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
Modified: stable/12/sys/arm/allwinner/axp81x.c
==============================================================================
--- stable/12/sys/arm/allwinner/axp81x.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/axp81x.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -1172,3 +1172,4 @@ EARLY_DRIVER_MODULE(ofw_gpiobus, axp8xx_pmu, ofw_gpiob
DRIVER_MODULE(gpioc, axp8xx_pmu, gpioc_driver, gpioc_devclass, 0, 0);
MODULE_VERSION(axp8xx, 1);
MODULE_DEPEND(axp8xx, iicbus, 1, 1, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
Modified: stable/12/sys/arm/allwinner/files.allwinner
==============================================================================
--- stable/12/sys/arm/allwinner/files.allwinner Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/files.allwinner Mon Aug 5 18:05:22 2019 (r350602)
@@ -3,10 +3,10 @@ kern/kern_clocksource.c standard
arm/allwinner/a10_ahci.c optional ahci
arm/allwinner/a10_codec.c optional sound
-arm/allwinner/a10_dmac.c standard
-arm/allwinner/a31_dmac.c standard
+arm/allwinner/a10_dmac.c optional a10_dmac
+arm/allwinner/a31_dmac.c optional a31_dmac
arm/allwinner/a10_ehci.c optional ehci
-arm/allwinner/a10_sramc.c standard
+arm/allwinner/a10_sramc.c optional SOC_ALLWINNER_A10
arm/allwinner/aw_gpio.c optional gpio
arm/allwinner/aw_if_dwc.c optional dwc
arm/allwinner/aw_machdep.c standard
@@ -14,21 +14,21 @@ arm/allwinner/aw_mmc.c optional mmc | mmccam
arm/allwinner/aw_mp.c optional smp
arm/allwinner/aw_nmi.c optional intrng
arm/allwinner/aw_rsb.c optional rsb | p2wi
-arm/allwinner/aw_rtc.c standard
+arm/allwinner/aw_rtc.c optional aw_rtc
arm/allwinner/aw_syscon.c optional ext_resources syscon
-arm/allwinner/aw_ts.c standard
+arm/allwinner/aw_ts.c optional aw_thermal
arm/allwinner/aw_usbphy.c optional ehci | ohci
-arm/allwinner/aw_wdog.c standard
+arm/allwinner/aw_wdog.c optional aw_wdog
arm/allwinner/axp209.c optional axp209
arm/allwinner/axp81x.c optional axp81x
arm/allwinner/if_awg.c optional awg ext_resources syscon
arm/allwinner/if_emac.c optional emac
-arm/allwinner/sunxi_dma_if.m standard
+arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac
dev/iicbus/twsi/a10_twsi.c optional twsi
dev/usb/controller/generic_ohci.c optional ohci
dev/usb/controller/generic_usb_if.m optional ohci
-arm/allwinner/aw_sid.c standard
-arm/allwinner/aw_thermal.c standard
+arm/allwinner/aw_sid.c optional aw_sid
+arm/allwinner/aw_thermal.c optional aw_thermal
dev/iicbus/sy8106a.c optional sy8106a
arm/allwinner/aw_cir.c optional aw_cir evdev
Modified: stable/12/sys/arm/allwinner/if_awg.c
==============================================================================
--- stable/12/sys/arm/allwinner/if_awg.c Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/allwinner/if_awg.c Mon Aug 5 18:05:22 2019 (r350602)
@@ -1967,6 +1967,7 @@ static devclass_t awg_devclass;
DRIVER_MODULE(awg, simplebus, awg_driver, awg_devclass, 0, 0);
DRIVER_MODULE(miibus, awg, miibus_driver, miibus_devclass, 0, 0);
-
MODULE_DEPEND(awg, ether, 1, 1, 1);
MODULE_DEPEND(awg, miibus, 1, 1, 1);
+MODULE_DEPEND(awg, aw_sid, 1, 1, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
Modified: stable/12/sys/arm/conf/GENERIC
==============================================================================
--- stable/12/sys/arm/conf/GENERIC Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/arm/conf/GENERIC Mon Aug 5 18:05:22 2019 (r350602)
@@ -183,6 +183,7 @@ device pwm
# watchdog.
device ti_wdt
device imxwdt # Watchdog. WARNING: can't be disabled!!!
+device aw_wdog # Allwinner Watchdog
device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
@@ -255,6 +256,8 @@ device ti_mbox
# DMA controller
device fslsdma
device ti_sdma
+device a10_dmac
+device a31_dmac
# Extensible Firmware Interface
options EFI
@@ -264,8 +267,15 @@ device cesa
device crypto
device cryptodev
-# imx6 on-chip RTC
-device imx6_snvs # On-chip RTC
+# RTC
+device imx6_snvs # IMX6 On-chip RTC
+device aw_rtc # Allwinner On-chip RTC
+
+# EFUSE
+device aw_sid # Allwinner Secure ID EFUSE
+
+# Thermal sensors
+device aw_thermal # Allwinner Thermal Sensor Controller
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
Modified: stable/12/sys/modules/allwinner/Makefile
==============================================================================
--- stable/12/sys/modules/allwinner/Makefile Mon Aug 5 17:54:08 2019 (r350601)
+++ stable/12/sys/modules/allwinner/Makefile Mon Aug 5 18:05:22 2019 (r350602)
@@ -3,6 +3,12 @@
SUBDIR = \
aw_pwm \
+ aw_rtc \
+ aw_rsb \
+ aw_sid \
aw_spi \
+ aw_thermal \
+ axp81x \
+ if_awg
.include <bsd.subdir.mk>
More information about the svn-src-stable
mailing list