Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efdf811d authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: t5325: Remove platform device to instantiate audio 



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: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1399141819-23924-7-git-send-email-andrew@lunn.ch


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 7745b251

arch/arm/mach-mvebu/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-mvebu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-mvebu/board-t5325.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * HP T5325 Board Setup

 *

 * Copyright (C) 2014

 *

 * Andrew Lunn <andrew@lunn.ch>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include "board.h"



static struct platform_device hp_t5325_audio_device = {

	.name		= "t5325-audio",

	.id		= -1,

};



void __init t5325_init(void)

{

	platform_device_register(&hp_t5325_audio_device);

}

arch/arm/mach-mvebu/board.h

+0 −6
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-mvebu/kirkwood.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}