aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-02-25 12:34:03 -0500
committerJason Cooper <jason@lakedaemon.net>2014-02-25 15:31:11 -0500
commit7c8f827f57ad1a7f52e1679ded1b99d8a0c881ad (patch)
treee3f7cd6da8672b81af0926c78d55add3363dda3f
parenta36bf67c0e58d5c834a059bb0bab9787e3fc6013 (diff)
ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
The HP T5325 has a PCI based VGA controller. Add the frame buffer driver, and frame buffer support to the defconfig's. Additionally add the soc audio framework and the necessary codec. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/configs/multi_v5_defconfig9
-rw-r--r--arch/arm/configs/mvebu_v5_defconfig9
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 2bc1e1707930..84ba24a0ead7 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
11# CONFIG_ARCH_MULTI_V7 is not set 11# CONFIG_ARCH_MULTI_V7 is not set
12CONFIG_ARCH_MVEBU=y 12CONFIG_ARCH_MVEBU=y
13CONFIG_MACH_KIRKWOOD=y 13CONFIG_MACH_KIRKWOOD=y
14CONFIG_MACH_T5325=y
14CONFIG_ARCH_MXC=y 15CONFIG_ARCH_MXC=y
15CONFIG_MACH_IMX25_DT=y 16CONFIG_MACH_IMX25_DT=y
16CONFIG_MACH_IMX27_DT=y 17CONFIG_MACH_IMX27_DT=y
@@ -101,6 +102,12 @@ CONFIG_THERMAL=y
101CONFIG_KIRKWOOD_THERMAL=y 102CONFIG_KIRKWOOD_THERMAL=y
102CONFIG_WATCHDOG=y 103CONFIG_WATCHDOG=y
103CONFIG_ORION_WATCHDOG=y 104CONFIG_ORION_WATCHDOG=y
105CONFIG_FB=y
106CONFIG_SOUND=y
107CONFIG_SND=y
108CONFIG_SND_SOC=y
109CONFIG_SND_KIRKWOOD_SOC=y
110CONFIG_SND_KIRKWOOD_SOC_T5325=y
104# CONFIG_ABX500_CORE is not set 111# CONFIG_ABX500_CORE is not set
105CONFIG_REGULATOR=y 112CONFIG_REGULATOR=y
106CONFIG_REGULATOR_FIXED_VOLTAGE=y 113CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -150,6 +157,8 @@ CONFIG_RTC_DRV_S35390A=y
150CONFIG_RTC_DRV_MV=y 157CONFIG_RTC_DRV_MV=y
151CONFIG_DMADEVICES=y 158CONFIG_DMADEVICES=y
152CONFIG_MV_XOR=y 159CONFIG_MV_XOR=y
160CONFIG_STAGING=y
161CONFIG_FB_XGI=y
153CONFIG_EXT2_FS=y 162CONFIG_EXT2_FS=y
154CONFIG_EXT3_FS=y 163CONFIG_EXT3_FS=y
155# CONFIG_EXT3_FS_XATTR is not set 164# CONFIG_EXT3_FS_XATTR is not set
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 2844636c0cf2..36484a37a1ca 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
11# CONFIG_ARCH_MULTI_V7 is not set 11# CONFIG_ARCH_MULTI_V7 is not set
12CONFIG_ARCH_MVEBU=y 12CONFIG_ARCH_MVEBU=y
13CONFIG_MACH_KIRKWOOD=y 13CONFIG_MACH_KIRKWOOD=y
14CONFIG_MACH_T5325=y
14# CONFIG_CPU_FEROCEON_OLD_ID is not set 15# CONFIG_CPU_FEROCEON_OLD_ID is not set
15CONFIG_PCI_MVEBU=y 16CONFIG_PCI_MVEBU=y
16CONFIG_PREEMPT=y 17CONFIG_PREEMPT=y
@@ -93,6 +94,12 @@ CONFIG_SENSORS_LM85=y
93CONFIG_THERMAL=y 94CONFIG_THERMAL=y
94CONFIG_WATCHDOG=y 95CONFIG_WATCHDOG=y
95CONFIG_ORION_WATCHDOG=y 96CONFIG_ORION_WATCHDOG=y
97CONFIG_FB=y
98CONFIG_SOUND=y
99CONFIG_SND=y
100CONFIG_SND_SOC=y
101CONFIG_SND_KIRKWOOD_SOC=y
102CONFIG_SND_KIRKWOOD_SOC_T5325=y
96CONFIG_REGULATOR=y 103CONFIG_REGULATOR=y
97CONFIG_REGULATOR_FIXED_VOLTAGE=y 104CONFIG_REGULATOR_FIXED_VOLTAGE=y
98CONFIG_HID_DRAGONRISE=y 105CONFIG_HID_DRAGONRISE=y
@@ -137,6 +144,8 @@ CONFIG_RTC_DRV_S35390A=y
137CONFIG_RTC_DRV_MV=y 144CONFIG_RTC_DRV_MV=y
138CONFIG_DMADEVICES=y 145CONFIG_DMADEVICES=y
139CONFIG_MV_XOR=y 146CONFIG_MV_XOR=y
147CONFIG_STAGING=y
148CONFIG_FB_XGI=y
140CONFIG_EXT2_FS=y 149CONFIG_EXT2_FS=y
141CONFIG_EXT3_FS=y 150CONFIG_EXT3_FS=y
142# CONFIG_EXT3_FS_XATTR is not set 151# CONFIG_EXT3_FS_XATTR is not set