From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] arm: am33xx: add pinmux and clock config for UART2
Date: Thu, 23 May 2013 15:38:49 +0200 [thread overview]
Message-ID: <20130523133849.GS32299@pengutronix.de> (raw)
In-Reply-To: <1369302358-9934-1-git-send-email-jlu@pengutronix.de>
On Thu, May 23, 2013 at 11:45:57AM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Applied, thanks
Sascha
> ---
> arch/arm/mach-omap/am33xx_clock.c | 8 ++++++++
> arch/arm/mach-omap/am33xx_mux.c | 11 +++++++++++
> arch/arm/mach-omap/include/mach/am33xx-clock.h | 3 +++
> arch/arm/mach-omap/include/mach/am33xx-mux.h | 1 +
> 4 files changed, 23 insertions(+)
>
> diff --git a/arch/arm/mach-omap/am33xx_clock.c b/arch/arm/mach-omap/am33xx_clock.c
> index a28540c..4451d62 100644
> --- a/arch/arm/mach-omap/am33xx_clock.c
> +++ b/arch/arm/mach-omap/am33xx_clock.c
> @@ -89,6 +89,14 @@ static void per_clocks_enable(void)
> __raw_writel(PRCM_MOD_EN, CM_WKUP_UART0_CLKCTRL);
> while (__raw_readl(CM_WKUP_UART0_CLKCTRL) != PRCM_MOD_EN);
>
> + /* UART1 */
> + __raw_writel(PRCM_MOD_EN, CM_PER_UART1_CLKCTRL);
> + while (__raw_readl(CM_PER_UART1_CLKCTRL) != PRCM_MOD_EN);
> +
> + /* UART2 */
> + __raw_writel(PRCM_MOD_EN, CM_PER_UART2_CLKCTRL);
> + while (__raw_readl(CM_PER_UART2_CLKCTRL) != PRCM_MOD_EN);
> +
> /* UART3 */
> __raw_writel(PRCM_MOD_EN, CM_PER_UART3_CLKCTRL);
> while (__raw_readl(CM_PER_UART3_CLKCTRL) != PRCM_MOD_EN);
> diff --git a/arch/arm/mach-omap/am33xx_mux.c b/arch/arm/mach-omap/am33xx_mux.c
> index 36fe379..61014d9 100644
> --- a/arch/arm/mach-omap/am33xx_mux.c
> +++ b/arch/arm/mach-omap/am33xx_mux.c
> @@ -27,6 +27,12 @@ static const __maybe_unused struct module_pin_mux uart0_pin_mux[] = {
> {-1},
> };
>
> +static const __maybe_unused struct module_pin_mux uart2_pin_mux[] = {
> + {OFFSET(mii1_txclk), (MODE(1) | PULLUDEN | RXACTIVE)}, /* UART2_RXD */
> + {OFFSET(mii1_rxclk), (MODE(1) | PULLUDEN)}, /* UART2_TXD */
> + {-1},
> +};
> +
> static const __maybe_unused struct module_pin_mux uart3_pin_mux[] = {
> {OFFSET(spi0_cs1), (MODE(1) | PULLUDEN | RXACTIVE)}, /* UART3_RXD */
> {OFFSET(ecap0_in_pwm0_out), (MODE(1) | PULLUDEN)}, /* UART3_TXD */
> @@ -275,6 +281,11 @@ void am33xx_enable_uart0_pin_mux(void)
> configure_module_pin_mux(uart0_pin_mux);
> }
>
> +void am33xx_enable_uart2_pin_mux(void)
> +{
> + configure_module_pin_mux(uart2_pin_mux);
> +}
> +
> void am33xx_enable_mmc0_pin_mux(void)
> {
> configure_module_pin_mux(mmc0_pin_mux);
> diff --git a/arch/arm/mach-omap/include/mach/am33xx-clock.h b/arch/arm/mach-omap/include/mach/am33xx-clock.h
> index 2ecfc5f..3d1f074 100644
> --- a/arch/arm/mach-omap/include/mach/am33xx-clock.h
> +++ b/arch/arm/mach-omap/include/mach/am33xx-clock.h
> @@ -136,7 +136,10 @@
> #define CM_PER_GPIO1_CLKCTRL (CM_PER + 0xAC) /* GPIO1 */
> #define CM_PER_GPIO2_CLKCTRL (CM_PER + 0xB0) /* GPIO2 */
> #define CM_PER_GPIO3_CLKCTRL (CM_PER + 0xB4) /* GPIO3 */
> +#define CM_PER_UART1_CLKCTRL (CM_PER + 0x6C) /* UART1 */
> +#define CM_PER_UART2_CLKCTRL (CM_PER + 0x70) /* UART2 */
> #define CM_PER_UART3_CLKCTRL (CM_PER + 0x74) /* UART3 */
> +#define CM_PER_UART4_CLKCTRL (CM_PER + 0x78) /* UART4 */
> #define CM_PER_I2C1_CLKCTRL (CM_PER + 0x48) /* I2C1 */
> #define CM_PER_I2C2_CLKCTRL (CM_PER + 0x44) /* I2C2 */
> #define CM_WKUP_GPIO0_CLKCTRL (CM_WKUP + 0x8) /* GPIO0 */
> diff --git a/arch/arm/mach-omap/include/mach/am33xx-mux.h b/arch/arm/mach-omap/include/mach/am33xx-mux.h
> index 896e958..e0f7077 100644
> --- a/arch/arm/mach-omap/include/mach/am33xx-mux.h
> +++ b/arch/arm/mach-omap/include/mach/am33xx-mux.h
> @@ -252,6 +252,7 @@ extern void am33xx_enable_i2c0_pin_mux(void);
> extern void am33xx_enable_i2c1_pin_mux(void);
> extern void am33xx_enable_i2c2_pin_mux(void);
> extern void am33xx_enable_uart0_pin_mux(void);
> +extern void am33xx_enable_uart2_pin_mux(void);
> extern void am33xx_enable_mmc0_pin_mux(void);
>
> #endif /*__AM33XX_MUX_H__ */
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2013-05-23 13:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-23 9:45 Jan Luebbe
2013-05-23 9:45 ` [PATCH 2/2] arm: am33xx: add pinmux config for RMII2 Jan Luebbe
2013-05-23 13:38 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130523133849.GS32299@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jlu@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox