summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-22 23:23:33 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-19 03:15:44 +0400
commit6ed3e2acc7995625625592abe8cd3383c34a471b (patch)
tree5c34373aa5c6a468f176f70c7f9528ead08536b4
parent54292a4649a5dd93562d10f188a8e201afebfe2f (diff)
downloadlinux-6ed3e2acc7995625625592abe8cd3383c34a471b.tar.xz
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: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/assabet.c8
-rw-r--r--drivers/mfd/mcp-sa11x0.c6
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index c45402f866cc..b5955ad35945 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -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,
};
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index c381436ed3de..1c0ceacaa1f6 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -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.