Skip to contentSkip to conversation

colibri-pxa300: add uart support

PATCH New pieterg 3 participants 6 messages Jul 8, 2010 – Jul 9, 2010

lore
Share & tools
lore
#1 lore raw

PATCH 3/5 colibri-pxa300: add uart support

Dne ?t 8. ?ervence 2010 19:04:08 pieterg napsal(a):

Quoted 46 lines
Signed-off-by pieter <[email protected]>
---
 arch/arm/mach-pxa/colibri-pxa300.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/colibri-pxa300.c +27 -0
index e7762ae..381857d 100644
@@ -170,6 +170,33 @@ static inline void __init colibri_pxa310_init_ac97
 (void)
 static inline void colibri_pxa310_init_ac97(void) {}
 #endif
 
+static mfp_cfg_t colibri_pxa300_uart_pin_config[] __initdata = {
+	/* FFUART */
+	GPIO99_UART1_RXD,
+	GPIO100_UART1_TXD,
+	GPIO101_UART1_CTS,
+	GPIO102_UART1_DCD,
+	GPIO103_UART1_DTR,
+	GPIO104_UART1_RI,
+	GPIO105_UART1_DSR,
+	GPIO106_UART1_RTS,
+
+	/* BTUART */
+	GPIO111_UART2_CTS,
+	GPIO112_UART2_RXD,
+	GPIO113_UART2_TXD,
+	GPIO114_UART2_RTS,
+
+	/* STUART */
+	GPIO8_UART3_TXD,
+	GPIO110_UART3_RXD,
+};
+
+static void __init colibri_pxa300_init_uart(void)
+{
+	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_uart_pin_config));
+}
+
 void __init colibri_pxa300_init(void)
 {
arch/arm/mach-pxa/colibri-pxa300.c +0 -0
 	pxa_set_ffuart_info(NULL);

arch/arm/mach-pxa/colibri-pxa300.c void __init colibri_pxa300_init(void) · line 217

Quoted 7 lines
arch/arm/mach-pxa/colibri-pxa300.c +1 -0
@@ -184,6 +211,7 @@ void __init colibri_pxa300_init(void)
 	colibri_pxa310_init_ac97();
 	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),
 				mfp_to_gpio(MFP_PIN_GPIO13));
+	colibri_pxa300_init_uart();
 }
 
 MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")

Can't you put this into the board MFP config array ? Or the other way -- register UARTs into that new function you introduced ?

author
#2 lore raw

PATCH 3/5 colibri-pxa300: add uart support

Quoted 49 lines · On Thursday 08 July 2010 22:01:22 Marek Vasut wrote:

Dne ?t 8. ?ervence 2010 19:04:08 pieterg napsal(a):

Quoted 48 lines
Signed-off-by pieter <[email protected]>
---
 arch/arm/mach-pxa/colibri-pxa300.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/colibri-pxa300.c +27 -0
index e7762ae..381857d 100644
@@ -170,6 +170,33 @@ static inline void __init colibri_pxa310_init_ac97
 (void)
 static inline void colibri_pxa310_init_ac97(void) {}
 #endif
 
+static mfp_cfg_t colibri_pxa300_uart_pin_config[] __initdata = {
+	/* FFUART */
+	GPIO99_UART1_RXD,
+	GPIO100_UART1_TXD,
+	GPIO101_UART1_CTS,
+	GPIO102_UART1_DCD,
+	GPIO103_UART1_DTR,
+	GPIO104_UART1_RI,
+	GPIO105_UART1_DSR,
+	GPIO106_UART1_RTS,
+
+	/* BTUART */
+	GPIO111_UART2_CTS,
+	GPIO112_UART2_RXD,
+	GPIO113_UART2_TXD,
+	GPIO114_UART2_RTS,
+
+	/* STUART */
+	GPIO8_UART3_TXD,
+	GPIO110_UART3_RXD,
+};
+
+static void __init colibri_pxa300_init_uart(void)
+{
+	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_uart_pin_config));
+}
+
 void __init colibri_pxa300_init(void)
 {
arch/arm/mach-pxa/colibri-pxa300.c +0 -0
 	pxa_set_ffuart_info(NULL);

@@ -184,6 +211,7 @@ void __init colibri_pxa300_init(void)
 	colibri_pxa310_init_ac97();
Quoted 8 lines
Quoted 6 lines
arch/arm/mach-pxa/colibri-pxa300.c +1 -0
 	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),
 mfp_to_gpio(MFP_PIN_GPIO13));
+	colibri_pxa300_init_uart();
 }

MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")

Can't you put this into the board MFP config array ?

As far as I see, the colibri's don't have a global MFP array anymore. Everything is split into function groups.
(which I think is nice btw, compared to -say- zylonite, where the MFP's do not obey CONFIG)

Quoted 2 lines

Or the other way --
register UARTs into that new function you introduced ?

You mean somehow make it easier for users to select which uarts they want, and which they don't?
Indeed this construction makes it impossible to use those gpio's for anything else, but this is exactly how the uart gpio's are configured in colibri-pxa320.c as well. So if there's a nicer way, we'd have to the same there as well.

(a nice way in general might perhaps be to enable/disable all 3 uarts from the config. Though people might object to an increase in the number of necessary config variables)

Or do you just mean moving the pxa_set_xxuart_info calls into colibri_pxa300_init_uart, so we keep all uart stuff together?

Rgds, Pieter

#3 lore raw

PATCH 3/5 colibri-pxa300: add uart support

Dne ?t 8. ?ervence 2010 22:42:25 pieterg napsal(a):

Quoted 82 lines · On Thursday 08 July 2010 22:01:22 Marek Vasut wrote:
Quoted 57 lines

Dne ?t 8. ?ervence 2010 19:04:08 pieterg napsal(a):

Quoted 56 lines
Signed-off-by pieter <[email protected]>

---

 arch/arm/mach-pxa/colibri-pxa300.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/colibri-pxa300.c +27 -0
index e7762ae..381857d 100644
@@ -170,6 +170,33 @@ static inline void __init colibri_pxa310_init_ac97
 (void)
 
 static inline void colibri_pxa310_init_ac97(void) {}
 #endif
 
+static mfp_cfg_t colibri_pxa300_uart_pin_config[] __initdata = {
+	/* FFUART */
+	GPIO99_UART1_RXD,
+	GPIO100_UART1_TXD,
+	GPIO101_UART1_CTS,
+	GPIO102_UART1_DCD,
+	GPIO103_UART1_DTR,
+	GPIO104_UART1_RI,
+	GPIO105_UART1_DSR,
+	GPIO106_UART1_RTS,
+
+	/* BTUART */
+	GPIO111_UART2_CTS,
+	GPIO112_UART2_RXD,
+	GPIO113_UART2_TXD,
+	GPIO114_UART2_RTS,
+
+	/* STUART */
+	GPIO8_UART3_TXD,
+	GPIO110_UART3_RXD,
+};
+
+static void __init colibri_pxa300_init_uart(void)
+{
+	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_uart_pin_config));
+}
+

void __init colibri_pxa300_init(void)
{

arch/arm/mach-pxa/colibri-pxa300.c +0 -0
 	pxa_set_ffuart_info(NULL);

@@ -184,6 +211,7 @@ void __init colibri_pxa300_init(void)
 
 	colibri_pxa310_init_ac97();
 
 	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),
Quoted 8 lines
Quoted 6 lines
arch/arm/mach-pxa/colibri-pxa300.c +1 -0
 mfp_to_gpio(MFP_PIN_GPIO13));
+	colibri_pxa300_init_uart();

}

MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")

Can't you put this into the board MFP config array ?

As far as I see, the colibri's don't have a global MFP array anymore. Everything is split into function groups.
(which I think is nice btw, compared to -say- zylonite, where the MFP's do not obey CONFIG)

Quoted 2 lines

Or the other way --
register UARTs into that new function you introduced ?

You mean somehow make it easier for users to select which uarts they want, and which they don't?
Indeed this construction makes it impossible to use those gpio's for anything else, but this is exactly how the uart gpio's are configured in colibri-pxa320.c as well. So if there's a nicer way, we'd have to the same there as well.

Quoted 6 lines

(a nice way in general might perhaps be to enable/disable all 3 uarts from the config. Though people might object to an increase in the number of necessary config variables)

Or do you just mean moving the pxa_set_xxuart_info calls into colibri_pxa300_init_uart, so we keep all uart stuff together?

This is what I mean, sorry, lack of sleep.

Quoted 2 lines

Rgds, Pieter

#4 lore raw

PATCH 3/5 colibri-pxa300: add uart support

In reply to pieterg

Hi pieterg,

thanks for your patches :)

Quoted 26 lines · pieterg
Signed-off-by pieter <[email protected]>
---
 arch/arm/mach-pxa/colibri-pxa300.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/colibri-pxa300.c +11 -0
index e7762ae..381857d 100644
@@ -170,6 +170,33 @@ static inline void __init colibri_pxa310_init_ac97
 (void)
 static inline void colibri_pxa310_init_ac97(void) {}
 #endif
 
+static mfp_cfg_t colibri_pxa300_uart_pin_config[] __initdata = {
+	/* FFUART */
+	GPIO99_UART1_RXD,
+	GPIO100_UART1_TXD,
+	GPIO101_UART1_CTS,
+	GPIO102_UART1_DCD,
+	GPIO103_UART1_DTR,
+	GPIO104_UART1_RI,
+	GPIO105_UART1_DSR,
+	GPIO106_UART1_RTS,
+

arch/arm/mach-pxa/colibri-pxa300.c static inline void __init colibri_pxa310_init_ac97 · line 194

Quoted 10 lines
arch/arm/mach-pxa/colibri-pxa300.c +10 -0
+	/* BTUART */
+	GPIO111_UART2_CTS,
+	GPIO112_UART2_RXD,
+	GPIO113_UART2_TXD,
+	GPIO114_UART2_RTS,
+
+	/* STUART */
+	GPIO8_UART3_TXD,
+	GPIO110_UART3_RXD,
+};

Hmm, no. These lines are GPIOs and might be used differently by other base boards, depending on their pin allocation. So I'd really like to keep the board support code clean from such assumptions.

Have a look at Eric's devel branch at

git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

and find the patches for the recently done refactoring of the pxa270 colibri module. The idea is to keep everything that is module specific in one file, and everything which assumes the module is connected to a certain baseboard somewhere else.

In this tree, you can also see support for the "income" boards, which are based on the pxa270 module but use the pins differently, have different hardware connected etc. It's a good example for why the split made sense.

So I'd suggest you do something similar for the pxa3xx modules and create a colibri-pxa3xx-evalboard.c or anything and put all baseboard specific code there. That would also imply moving code that already exists.

The same counts for the I2C patch. Users of the module might not have I2C in use, and want to use the pins for other stuff.

Thanks,
Daniel

author
#5 lore raw

PATCH 3/5 colibri-pxa300: add uart support

Quoted 4 lines · On Friday 09 July 2010 09:16:04 Daniel Mack wrote:

So I'd suggest you do something similar for the pxa3xx modules and create a colibri-pxa3xx-evalboard.c or anything and put all baseboard specific code there. That would also imply moving code that already exists.

OK, I'll make the same split for the 3xx, I'll try to send a new patch series next week.

Quoted 2 lines

The same counts for the I2C patch. Users of the module might not have I2C in use, and want to use the pins for other stuff.

The I2C init obeys kernelconfig, but indeed, it belongs to the (eval)board, in the new setup.

Rgds, Pieter