Skip to content

Commit

Permalink
MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.c
Browse files Browse the repository at this point in the history
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: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 18, 2012
1 parent 54292a4 commit 6ed3e2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 8 additions & 0 deletions arch/arm/mach-sa1100/assabet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
};

Expand Down
6 changes: 0 additions & 6 deletions drivers/mfd/mcp-sa11x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <asm/system.h>
#include <mach/mcp.h>

#include <mach/assabet.h>

#define DRIVER_NAME "sa11x0-mcp"

struct mcp_sa11x0 {
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 6ed3e2a

Please sign in to comment.