From caf87bb49010f4379aca7d9827bd4a2729624ed2 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Mon, 16 Jul 2007 13:32:24 -0500
Subject: [PATCH] --- yaml --- r: 67483 b: refs/heads/master c:
 7f21f52940212c25b4387c2450018e161043549a h: refs/heads/master i:   67481:
 520c9acdcda445039b9fccc4a309367f4b38f93d   67479:
 f8e686f1535b196f57b6ff796b128fe76a0d9d4f v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/powerpc/sysdev/cpm2_common.c | 33 +++++++++++++++++++++++++
 trunk/include/asm-powerpc/cpm2.h        |  9 +++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 14960f805262..564fb74fbbdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2652d4ec4a363487d0106a8bf51f1b081dd7e397
+refs/heads/master: 7f21f52940212c25b4387c2450018e161043549a
diff --git a/trunk/arch/powerpc/sysdev/cpm2_common.c b/trunk/arch/powerpc/sysdev/cpm2_common.c
index c6dc0bf614b3..fc4c99565381 100644
--- a/trunk/arch/powerpc/sysdev/cpm2_common.c
+++ b/trunk/arch/powerpc/sysdev/cpm2_common.c
@@ -422,3 +422,36 @@ void *cpm_dpram_addr(unsigned long offset)
 	return (void *)(im_dprambase + offset);
 }
 EXPORT_SYMBOL(cpm_dpram_addr);
+
+struct cpm2_ioports {
+	u32 dir, par, sor, odr, dat;
+	u32 res[3];
+};
+
+void cpm2_set_pin(int port, int pin, int flags)
+{
+	struct cpm2_ioports __iomem *iop =
+		(struct cpm2_ioports __iomem *)&cpm2_immr->im_ioport;
+
+	pin = 1 << (31 - pin);
+
+	if (flags & CPM_PIN_OUTPUT)
+		setbits32(&iop[port].dir, pin);
+	else
+		clrbits32(&iop[port].dir, pin);
+
+	if (!(flags & CPM_PIN_GPIO))
+		setbits32(&iop[port].par, pin);
+	else
+		clrbits32(&iop[port].par, pin);
+
+	if (flags & CPM_PIN_SECONDARY)
+		setbits32(&iop[port].sor, pin);
+	else
+		clrbits32(&iop[port].sor, pin);
+
+	if (flags & CPM_PIN_OPENDRAIN)
+		setbits32(&iop[port].odr, pin);
+	else
+		clrbits32(&iop[port].odr, pin);
+}
diff --git a/trunk/include/asm-powerpc/cpm2.h b/trunk/include/asm-powerpc/cpm2.h
index 41a45db0c8b1..d7b57ac55892 100644
--- a/trunk/include/asm-powerpc/cpm2.h
+++ b/trunk/include/asm-powerpc/cpm2.h
@@ -1247,5 +1247,14 @@ enum cpm_clk {
 extern int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode);
 extern int cpm2_smc_clk_setup(enum cpm_clk_target target, int clock);
 
+#define CPM_PIN_INPUT     0
+#define CPM_PIN_OUTPUT    1
+#define CPM_PIN_PRIMARY   0
+#define CPM_PIN_SECONDARY 2
+#define CPM_PIN_GPIO      4
+#define CPM_PIN_OPENDRAIN 8
+
+void cpm2_set_pin(int port, int pin, int flags);
+
 #endif /* __CPM2__ */
 #endif /* __KERNEL__ */