diff mbox

[v3,5/5] ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig

Message ID 1393349643-6652-6-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn Feb. 25, 2014, 5:34 p.m. UTC
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>
---
 arch/arm/configs/multi_v5_defconfig | 9 +++++++++
 arch/arm/configs/mvebu_v5_defconfig | 9 +++++++++
 2 files changed, 18 insertions(+)

Comments

Arnd Bergmann Feb. 25, 2014, 6:19 p.m. UTC | #1
On Tuesday 25 February 2014 18:34:03 Andrew Lunn wrote:
> 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>
> 
Does the VGA console still work with the new PCI driver?

I noticed we're not setting 'vga_base'.

	Arnd
Andrew Lunn Feb. 25, 2014, 6:53 p.m. UTC | #2
On Tue, Feb 25, 2014 at 07:19:33PM +0100, Arnd Bergmann wrote:
> On Tuesday 25 February 2014 18:34:03 Andrew Lunn wrote:
> > 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>
> > 
> Does the VGA console still work with the new PCI driver?

I've not plugged in a monitor, but i do see:

xgifb 0000:01:00.0: Relocate IO address: 10000 [00010030]
PCI: enabling device 0000:00:01.0 (0140 -> 0143)
xgifb 0000:01:00.0: chipid = 32
xgifb: SR14=51 DramSzie 2000000 ChannelNum 1
xgifb 0000:01:00.0: Framebuffer at 0xe0000000, mapped to 0xe1000000, size 32768k
xgifb 0000:01:00.0: MMIO at 0xe4000000, mapped to 0xe0a00000, size 256k
xgifb 0000:01:00.0: No or unknown bridge type detected
xgifb: Default mode is 800x600x16 (60Hz)

so it looks like the frame buffer is happy.
 
I will see if i can find a cable and a monitor.

 Andrew
Arnd Bergmann Feb. 25, 2014, 7:04 p.m. UTC | #3
On Tuesday 25 February 2014 19:53:17 Andrew Lunn wrote:
> On Tue, Feb 25, 2014 at 07:19:33PM +0100, Arnd Bergmann wrote:
> > On Tuesday 25 February 2014 18:34:03 Andrew Lunn wrote:
> > > 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>
> > > 
> > Does the VGA console still work with the new PCI driver?
> 
> I've not plugged in a monitor, but i do see:
> 
> xgifb 0000:01:00.0: Relocate IO address: 10000 [00010030]
> PCI: enabling device 0000:00:01.0 (0140 -> 0143)
> xgifb 0000:01:00.0: chipid = 32
> xgifb: SR14=51 DramSzie 2000000 ChannelNum 1
> xgifb 0000:01:00.0: Framebuffer at 0xe0000000, mapped to 0xe1000000, size 32768k
> xgifb 0000:01:00.0: MMIO at 0xe4000000, mapped to 0xe0a00000, size 256k
> xgifb 0000:01:00.0: No or unknown bridge type detected
> xgifb: Default mode is 800x600x16 (60Hz)
> 
> so it looks like the frame buffer is happy.
>  
> I will see if i can find a cable and a monitor.

Ok, xgifb doesn't rely on vga_base, so that probably hasn't
changed. In theory, it could have worked with vgacon or
vga16fb before but that would be broken now.

	Arnd
diff mbox

Patch

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
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_T5325=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y
@@ -101,6 +102,12 @@  CONFIG_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_KIRKWOOD_SOC=y
+CONFIG_SND_KIRKWOOD_SOC_T5325=y
 # CONFIG_ABX500_CORE is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -150,6 +157,8 @@  CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
+CONFIG_STAGING=y
+CONFIG_FB_XGI=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # 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
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_T5325=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
@@ -93,6 +94,12 @@  CONFIG_SENSORS_LM85=y
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_KIRKWOOD_SOC=y
+CONFIG_SND_KIRKWOOD_SOC_T5325=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_HID_DRAGONRISE=y
@@ -137,6 +144,8 @@  CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
+CONFIG_STAGING=y
+CONFIG_FB_XGI=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set