From 820661759dae361df907bef9e8f264082689ad81 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sat, 11 Jun 2011 12:34:08 +0000 Subject: [PATCH] Follow up r222980 on PowerPC: add sound(4) and common device drivers to PowerPC GENERIC (along with a small rearrangement). --- sys/powerpc/conf/GENERIC | 12 ++++++++---- sys/powerpc/conf/GENERIC64 | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 54d463995b50..2950a498ec7e 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -174,7 +174,9 @@ device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) # Misc -device ad7417 # PowerMac7,2 temperature sensor +device iicbus # I2C bus code +device kiic # Keywest I2C +device ad7417 # PowerMac7,2 temperature sensor device ds1775 # PowerMac7,2 temperature sensor device fcu # Apple Fan Control Unit device max6690 # PowerMac7,2 temperature sensor @@ -187,7 +189,9 @@ device adb device cuda device pmu -# Powermac I2C support -device iicbus # I2C bus code -device kiic # Keywest I2C +# Sound support +device sound # Generic sound driver (required) +device snd_ai2s # Apple I2S audio +device snd_davbus # Apple DAVBUS audio +device snd_uaudio # USB Audio diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index ab4a0dcbc994..7e385a11ab9d 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -175,7 +175,9 @@ device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) # Misc -device ad7417 # PowerMac7,2 temperature sensor +device iicbus # I2C bus code +device kiic # Keywest I2C +device ad7417 # PowerMac7,2 temperature sensor device ds1775 # PowerMac7,2 temperature sensor device fcu # Apple Fan Control Unit device max6690 # PowerMac7,2 temperature sensor @@ -186,7 +188,8 @@ device smu # Apple System Management Unit device adb device pmu -# Powermac I2C support -device iicbus # I2C bus code -device kiic # Keywest I2C +# Sound support +device sound # Generic sound driver (required) +device snd_ai2s # Apple I2S audio +device snd_uaudio # USB Audio