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

Commit 6ed3e2ac authored by Russell King's avatar Russell King
Browse files

MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.c 



Move the assabet specific reset handling out of mcp-sa11x0.c, into its
board file.  This leaves the mcp code free from all board specific
details.

Acked-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 54292a46

arch/arm/mach-sa1100/assabet.c

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,13 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val) 


EXPORT_SYMBOL(ASSABET_BCR_frob);



static void assabet_ucb1x00_reset(enum ucb1x00_reset state)

{

	if (state == UCB_RST_PROBE)

		ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);

}





static void assabet_backlight_power(int on)

{

#ifndef ASSABET_PAL_VIDEO
@@ -201,6 +208,7 @@ static struct irda_platform_data assabet_irda_data = { 
};



static struct ucb1x00_plat_data assabet_ucb1x00_data = {

	.reset		= assabet_ucb1x00_reset,

	.gpio_base	= -1,

};

drivers/mfd/mcp-sa11x0.c

+0 −6
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <asm/system.h>

#include <mach/mcp.h>



#include <mach/assabet.h>



#define DRIVER_NAME "sa11x0-mcp"



struct mcp_sa11x0 {
@@ -208,10 +206,6 @@ static int mcp_sa11x0_probe(struct platform_device *dev) 


	platform_set_drvdata(dev, mcp);



	if (machine_is_assabet()) {

		ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);

	}



	/*

	 * Initialise device.  Note that we initially

	 * set the sampling rate to minimum.