summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-04-12 13:28:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 11:29:08 +0100
commit81447b2ee6a62cef884aa017e70bbe8c02f0d63b (patch)
treef54135121703e5a0175f7fa2fd2403529a3cd40e /arch/arm/configs
parent5dc3339aa5ba29593ea57814049ddca8c12831c8 (diff)
downloadlinux-3.10-81447b2ee6a62cef884aa017e70bbe8c02f0d63b.tar.gz
linux-3.10-81447b2ee6a62cef884aa017e70bbe8c02f0d63b.tar.bz2
linux-3.10-81447b2ee6a62cef884aa017e70bbe8c02f0d63b.zip
[ARM] 4965/1: magician: use htc-pasic3,leds-pasic3,ds1wm,leds-gpio
This patch enables LEDs and the 1-wire bus (connected to a DS2760 battery monitor) on the magician. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/magician_defconfig23
1 files changed, 19 insertions, 4 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index 69ac0e4f1fe..4d11678584d 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc6
-# Sat Dec 22 10:38:43 2007
+# Sun Dec 30 13:02:54 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -694,12 +694,26 @@ CONFIG_I2C_PXA=m
#
# CONFIG_SPI is not set
# CONFIG_SPI_MASTER is not set
-# CONFIG_W1 is not set
+CONFIG_W1=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_DS2482 is not set
+CONFIG_W1_MASTER_DS1WM=y
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+CONFIG_W1_SLAVE_DS2760=y
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=y
# CONFIG_APM_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2760=y
# CONFIG_HWMON is not set
# CONFIG_WATCHDOG is not set
@@ -714,6 +728,7 @@ CONFIG_SSB_POSSIBLE=y
#
# CONFIG_MFD_SM501 is not set
CONFIG_HTC_EGPIO=y
+CONFIG_HTC_PASIC3=y
#
# Multimedia devices
@@ -855,7 +870,7 @@ CONFIG_SDIO_UART=m
# MMC/SD Host Controller Drivers
#
CONFIG_MMC_PXA=y
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y