Skip to content

Commit

Permalink
ARM: Kirkwood: t5325: Remove platform device to instantiate audio
Browse files Browse the repository at this point in the history
Remove platform device instantiating of the audio, which results in
board-t5325.c being removed. A DT node will be added to take its
place.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1399141819-23924-7-git-send-email-andrew@lunn.ch
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed May 8, 2014
1 parent 7745b25 commit efdf811
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 43 deletions.
7 changes: 0 additions & 7 deletions arch/arm/mach-mvebu/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ config MACH_KIRKWOOD
Say 'Y' here if you want your kernel to support boards based
on the Marvell Kirkwood device tree.

config MACH_T5325
bool "HP T5325 thin client"
depends on MACH_KIRKWOOD
help
Say 'Y' here if you want your kernel to support the
HP T5325 Thin client

endmenu

endif
1 change: 0 additions & 1 deletion arch/arm/mach-mvebu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ endif

obj-$(CONFIG_MACH_DOVE) += dove.o
obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o
obj-$(CONFIG_MACH_T5325) += board-t5325.o
26 changes: 0 additions & 26 deletions arch/arm/mach-mvebu/board-t5325.c

This file was deleted.

6 changes: 0 additions & 6 deletions arch/arm/mach-mvebu/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,4 @@
#ifndef __ARCH_MVEBU_BOARD_H
#define __ARCH_MVEBU_BOARD_H

#ifdef CONFIG_MACH_T5325
void t5325_init(void);
#else
static inline void t5325_init(void) {};
#endif

#endif
3 changes: 0 additions & 3 deletions arch/arm/mach-mvebu/kirkwood.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ static void __init kirkwood_dt_init(void)
kirkwood_pm_init();
kirkwood_dt_eth_fixup();

if (of_machine_is_compatible("hp,t5325"))
t5325_init();

of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
}

Expand Down

0 comments on commit efdf811

Please sign in to comment.