[PATCH 0/2] mx25: add iomux defines

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 0/2] mx25: add iomux defines
@ 2010-06-23 10:31 Baruch Siach
  2010-06-23 10:31 ` [PATCH 1/2] mx25: add iomux defines for UART4 on KPP pins Baruch Siach
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Baruch Siach @ 2010-06-23 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

This series adds some iomux defines needed for the UART4 and the PWM4 devices.

Baruch Siach (2):
  mx25: add iomux defines for UART4 on KPP pins
  mx25: add PWM4 to iomux

 arch/arm/plat-mxc/include/mach/iomux-mx25.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/2] mx25: add iomux defines for UART4 on KPP pins
  2010-06-23 10:31 [PATCH 0/2] mx25: add iomux defines Baruch Siach
@ 2010-06-23 10:31 ` Baruch Siach
  2010-06-23 10:31 ` [PATCH 2/2] mx25: add PWM4 to iomux Baruch Siach
  2010-06-24  7:35 ` [PATCH 0/2] mx25: add iomux defines Sascha Hauer
  2 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2010-06-23 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/plat-mxc/include/mach/iomux-mx25.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
index e88d01a..a2c2657 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
@@ -389,15 +389,19 @@
 #define MX25_PAD_KPP_ROW3__GPIO_3_0	IOMUX_PAD(0x3ac, 0x1b4, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_KPP_COL0__KPP_COL0	IOMUX_PAD(0x3b0, 0x1b8, 0x10, 0, 0, KPP_CTL_COL)
+#define MX25_PAD_KPP_COL0__UART4_RXD_MUX IOMUX_PAD(0x3b0, 0x1b8, 0x11, 0x570, 1, NO_PAD_CTRL)
 #define MX25_PAD_KPP_COL0__GPIO_3_1	IOMUX_PAD(0x3b0, 0x1b8, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_KPP_COL1__KPP_COL1	IOMUX_PAD(0x3b4, 0x1bc, 0x10, 0, 0, KPP_CTL_COL)
+#define MX25_PAD_KPP_COL1__UART4_TXD_MUX IOMUX_PAD(0x3b4, 0x1bc, 0x11, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_KPP_COL1__GPIO_3_2	IOMUX_PAD(0x3b4, 0x1bc, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_KPP_COL2__KPP_COL2	IOMUX_PAD(0x3b8, 0x1c0, 0x10, 0, 0, KPP_CTL_COL)
+#define MX25_PAD_KPP_COL2__UART4_RTS	IOMUX_PAD(0x3b8, 0x1c0, 0x11, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_KPP_COL2__GPIO_3_3	IOMUX_PAD(0x3b8, 0x1c0, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_KPP_COL3__KPP_COL3	IOMUX_PAD(0x3bc, 0x1c4, 0x10, 0, 0, KPP_CTL_COL)
+#define MX25_PAD_KPP_COL3__UART4_CTS	IOMUX_PAD(0x3bc, 0x1c4, 0x11, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_KPP_COL3__GPIO_3_4	IOMUX_PAD(0x3bc, 0x1c4, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_FEC_MDC__FEC_MDC	IOMUX_PAD(0x3c0, 0x1c8, 0x10, 0, 0, NO_PAD_CTRL)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] mx25: add PWM4 to iomux
  2010-06-23 10:31 [PATCH 0/2] mx25: add iomux defines Baruch Siach
  2010-06-23 10:31 ` [PATCH 1/2] mx25: add iomux defines for UART4 on KPP pins Baruch Siach
@ 2010-06-23 10:31 ` Baruch Siach
  2010-06-24  7:35 ` [PATCH 0/2] mx25: add iomux defines Sascha Hauer
  2 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2010-06-23 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/plat-mxc/include/mach/iomux-mx25.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
index a2c2657..564e03d 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
@@ -252,6 +252,7 @@
 #define MX25_PAD_OE_ACD__GPIO_1_25	IOMUX_PAD(0x30c, 0x114, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CONTRAST__CONTRAST	IOMUX_PAD(0x310, 0x118, 0x10, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CONTRAST__PWM4_PWMO	IOMUX_PAD(0x310, 0x118, 0x14, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CONTRAST__FEC_CRS	IOMUX_PAD(0x310, 0x118, 0x15, 0x508, 1, NO_PAD_CTRL)
 
 #define MX25_PAD_PWM__PWM		IOMUX_PAD(0x314, 0x11c, 0x10, 0, 0, NO_PAD_CTRL)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 0/2] mx25: add iomux defines
  2010-06-23 10:31 [PATCH 0/2] mx25: add iomux defines Baruch Siach
  2010-06-23 10:31 ` [PATCH 1/2] mx25: add iomux defines for UART4 on KPP pins Baruch Siach
  2010-06-23 10:31 ` [PATCH 2/2] mx25: add PWM4 to iomux Baruch Siach
@ 2010-06-24  7:35 ` Sascha Hauer
  2010-06-24  7:40   ` Baruch Siach
  2 siblings, 1 reply; 5+ messages in thread
From: Sascha Hauer @ 2010-06-24  7:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jun 23, 2010 at 01:31:25PM +0300, Baruch Siach wrote:
> This series adds some iomux defines needed for the UART4 and the PWM4 devices.
> 
> Baruch Siach (2):
>   mx25: add iomux defines for UART4 on KPP pins
>   mx25: add PWM4 to iomux

Ok, can you please rebase onto
git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.36?

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 0/2] mx25: add iomux defines
  2010-06-24  7:35 ` [PATCH 0/2] mx25: add iomux defines Sascha Hauer
@ 2010-06-24  7:40   ` Baruch Siach
  0 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2010-06-24  7:40 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Sascha,

On Thu, Jun 24, 2010 at 09:35:44AM +0200, Sascha Hauer wrote:
> On Wed, Jun 23, 2010 at 01:31:25PM +0300, Baruch Siach wrote:
> > This series adds some iomux defines needed for the UART4 and the PWM4 devices.
> > 
> > Baruch Siach (2):
> >   mx25: add iomux defines for UART4 on KPP pins
> >   mx25: add PWM4 to iomux
> 
> Ok, can you please rebase onto
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.36?

OK. I'll send a rebased version later today.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-06-24  7:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-23 10:31 [PATCH 0/2] mx25: add iomux defines Baruch Siach
2010-06-23 10:31 ` [PATCH 1/2] mx25: add iomux defines for UART4 on KPP pins Baruch Siach
2010-06-23 10:31 ` [PATCH 2/2] mx25: add PWM4 to iomux Baruch Siach
2010-06-24  7:35 ` [PATCH 0/2] mx25: add iomux defines Sascha Hauer
2010-06-24  7:40   ` Baruch Siach

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).