Thu Jan 3 10:44:04 2019 UTC ()
Attach sunxirsb earlier so axppmic regulators are available for usbphy


(jmcneill)
diff -r1.14 -r1.15 src/sys/arch/evbarm/conf/GENERIC
diff -r1.72 -r1.73 src/sys/arch/evbarm/conf/GENERIC64
cvs diff -r1.14 -r1.15 src/sys/arch/evbarm/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC 2018/11/22 21:08:19 1.14
+++ src/sys/arch/evbarm/conf/GENERIC 2019/01/03 10:44:04 1.15
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC,v 1.14 2018/11/22 21:08:19 aymeric Exp $ 2# $NetBSD: GENERIC,v 1.15 2019/01/03 10:44:04 jmcneill Exp $
3# 3#
4# GENERIC ARM (aarch32) kernel 4# GENERIC ARM (aarch32) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic" 7include "arch/evbarm/conf/std.generic"
8include "arch/evbarm/conf/files.generic" 8include "arch/evbarm/conf/files.generic"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11# 11#
12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as 12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as
13# appropriate 13# appropriate
14# 14#
15makeoptions DTSARCH="arm aarch64" 15makeoptions DTSARCH="arm aarch64"
@@ -408,27 +408,27 @@ ukphy* at mii? phy ? # generic unknown @@ -408,27 +408,27 @@ ukphy* at mii? phy ? # generic unknown
408# Mini-PCIe Wireless 408# Mini-PCIe Wireless
409#options ATHHAL_AR5212,ATHHAL_RF2425 # AR5BHB63 409#options ATHHAL_AR5212,ATHHAL_RF2425 # AR5BHB63
410#ath* at pci? dev ? function ? # Atheros IEEE 802.11 410#ath* at pci? dev ? function ? # Atheros IEEE 802.11
411#athn* at pci? dev ? function ? # Atheros IEEE 802.11 411#athn* at pci? dev ? function ? # Atheros IEEE 802.11
412 412
413# UART 413# UART
414com* at fdt? # UART 414com* at fdt? # UART
415plcom* at fdt? # ARM PL011 UART 415plcom* at fdt? # ARM PL011 UART
416exuart* at fdt? # SSCOM UART 416exuart* at fdt? # SSCOM UART
417 417
418# I2C controllers 418# I2C controllers
419bsciic* at fdt? # Broadcom BCM283x Serial Control 419bsciic* at fdt? # Broadcom BCM283x Serial Control
420exyoi2c* at fdt? # Samsung Exynos I2C 420exyoi2c* at fdt? # Samsung Exynos I2C
421sunxirsb* at fdt? # Allwinner RSB 421sunxirsb* at fdt? pass 4 # Allwinner RSB
422sunxitwi* at fdt? # Allwinner TWI 422sunxitwi* at fdt? # Allwinner TWI
423tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C 423tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C
424iic* at i2cbus? 424iic* at i2cbus?
425 425
426# I2C devices 426# I2C devices
427as3722pmic* at iic? 427as3722pmic* at iic?
428as3722reg* at as3722pmic? 428as3722reg* at as3722pmic?
429axp20x* at iic? # AXP209 Power Management IC 429axp20x* at iic? # AXP209 Power Management IC
430axp20xreg* at axp20x? 430axp20xreg* at axp20x?
431axp22x* at iic? # AXP221 Power Management IC 431axp22x* at iic? # AXP221 Power Management IC
432axppmic* at iic? # X-Powers AXP Power Management IC 432axppmic* at iic? # X-Powers AXP Power Management IC
433axpreg* at axppmic? 433axpreg* at axppmic?
434max77620pmic* at iic? 434max77620pmic* at iic?
cvs diff -r1.72 -r1.73 src/sys/arch/evbarm/conf/GENERIC64 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC64 2018/12/30 16:25:15 1.72
+++ src/sys/arch/evbarm/conf/GENERIC64 2019/01/03 10:44:04 1.73
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC64,v 1.72 2018/12/30 16:25:15 skrll Exp $ 2# $NetBSD: GENERIC64,v 1.73 2019/01/03 10:44:04 jmcneill Exp $
3# 3#
4# GENERIC ARM (aarch64) kernel 4# GENERIC ARM (aarch64) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic64" 7include "arch/evbarm/conf/std.generic64"
8include "arch/evbarm/conf/files.generic64" 8include "arch/evbarm/conf/files.generic64"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11# 11#
12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as 12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as
13# appropriate 13# appropriate
14# 14#
15makeoptions DTSARCH="arm aarch64" 15makeoptions DTSARCH="arm aarch64"
@@ -266,27 +266,27 @@ ukphy* at mii? phy ? # generic unknown @@ -266,27 +266,27 @@ ukphy* at mii? phy ? # generic unknown
266# UART 266# UART
267com* at fdt? pass 4 # UART 267com* at fdt? pass 4 # UART
268com* at acpi? 268com* at acpi?
269plcom* at fdt? pass 4 # ARM PL011 UART 269plcom* at fdt? pass 4 # ARM PL011 UART
270plcom* at acpi? 270plcom* at acpi?
271puc* at pci? dev ? function ? # PCI "universal" comm. cards 271puc* at pci? dev ? function ? # PCI "universal" comm. cards
272com* at puc? port ? 272com* at puc? port ?
273 273
274# I2C controllers 274# I2C controllers
275bsciic* at fdt? # Broadcom BCM283x Serial Control 275bsciic* at fdt? # Broadcom BCM283x Serial Control
276dwiic* at fdt? # Designware I2C 276dwiic* at fdt? # Designware I2C
277dwiic* at acpi? 277dwiic* at acpi?
278rkiic* at fdt? # Rockchip I2C 278rkiic* at fdt? # Rockchip I2C
279sunxirsb* at fdt? # Allwinner RSB 279sunxirsb* at fdt? pass 4 # Allwinner RSB
280sunxitwi* at fdt? # Allwinner TWI 280sunxitwi* at fdt? # Allwinner TWI
281tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C 281tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C
282iic* at i2cbus? 282iic* at i2cbus?
283 283
284# I2C devices 284# I2C devices
285titemp* at iic? 285titemp* at iic?
286seeprom* at iic? 286seeprom* at iic?
287spdmem* at iic? # memory module SPD EEPROM decoder 287spdmem* at iic? # memory module SPD EEPROM decoder
288as3722pmic* at iic? 288as3722pmic* at iic?
289as3722reg* at as3722pmic? 289as3722reg* at as3722pmic?
290axppmic* at iic? # X-Powers AXP Power Management IC 290axppmic* at iic? # X-Powers AXP Power Management IC
291axpreg* at axppmic? 291axpreg* at axppmic?
292fan53555reg* at iic? # FAN53555 / SY82x regulator 292fan53555reg* at iic? # FAN53555 / SY82x regulator