Patchwork [U-Boot,1/4] arm, omap3: Add support for TechNexion modules

login
register
mail settings
Submitter Tapani Utriainen
Date Nov. 21, 2011, 8:40 a.m.
Message ID <20111121164002.2e3a6212@myhost>
Download mbox | patch
Permalink /patch/126717/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Tapani Utriainen - Nov. 21, 2011, 8:40 a.m.
Move duplicate Sitara MUX definitions to arch-omap3/mux.h

Signed-off-by: Tapani Utriainen <tapani@technexion.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
---
 arch/arm/include/asm/arch-omap3/mux.h |   51 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h   |   40 --------------------------
 board/ti/am3517crane/am3517crane.h    |   39 --------------------------
 3 files changed, 51 insertions(+), 79 deletions(-)


--
1.7.6
Wolfgang Denk - Nov. 21, 2011, 9:07 a.m.
Dear Tapani Utriainen,

In message <20111121164002.2e3a6212@myhost> you wrote:
> 
> Move duplicate Sitara MUX definitions to arch-omap3/mux.h

Thanks.

> Signed-off-by: Tapani Utriainen <tapani@technexion.com>
> CC: Sandeep Paulraj <s-paulraj@ti.com>
> ---
>  arch/arm/include/asm/arch-omap3/mux.h |   51 ++++++++++++++++++++++++++++++++++
>  board/logicpd/am3517evm/am3517evm.h   |   40 --------------------------
>  board/ti/am3517crane/am3517crane.h    |   39 --------------------------
>  3 files changed, 51 insertions(+), 79 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
> index 0c01c73..d796d6c 100644
> --- a/arch/arm/include/asm/arch-omap3/mux.h
> +++ b/arch/arm/include/asm/arch-omap3/mux.h
> @@ -404,6 +404,57 @@
>  #define CONTROL_PADCONF_SDRC_CKE0	0x0262
>  #define CONTROL_PADCONF_SDRC_CKE1	0x0264
>  
> +/**********************************************
> + AM35xx specific definitions
> +
> + The AM3517 and the AM3508 are formally branded
> + as Sitara processors, but in practice they are
> + compatible with OMAP3 and are treated as OMAP3
> + by software like u-boot and the Linux kernel.
> +
> +***********************************************/

Incorrect multiline comment style. Please fix.

Best regards,

Wolfgang Denk
Wolfgang Denk - Nov. 21, 2011, 9:08 a.m.
Dear Tapani Utriainen,

In message <20111121164002.2e3a6212@myhost> you wrote:
> 
> Move duplicate Sitara MUX definitions to arch-omap3/mux.h

Also, please chose a better  Subject.  This modification may be a
preparation for your other patches, but it is actually in no way
related to TechNexion modules.  Thanks.

Best regards,

Wolfgang Denk
Stefano Babic - Nov. 21, 2011, 9:12 a.m.
On 21/11/2011 09:40, Tapani Utriainen wrote:
> 
> Move duplicate Sitara MUX definitions to arch-omap3/mux.h
> 
> Signed-off-by: Tapani Utriainen <tapani@technexion.com>
> CC: Sandeep Paulraj <s-paulraj@ti.com>
> ---
>  arch/arm/include/asm/arch-omap3/mux.h |   51 ++++++++++++++++++++++++++++++++++
>  board/logicpd/am3517evm/am3517evm.h   |   40 --------------------------
>  board/ti/am3517crane/am3517crane.h    |   39 --------------------------
>  3 files changed, 51 insertions(+), 79 deletions(-)
> 

Thanks, but....

> diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
> index 0c01c73..d796d6c 100644
> --- a/arch/arm/include/asm/arch-omap3/mux.h
> +++ b/arch/arm/include/asm/arch-omap3/mux.h


...these changes were already submitted by a previous patch by Ilya
Yanok (AM3517: move AM3517 specific mux defines to generic header)

Best regards,
Stefano Babic
Igor Grinberg - Nov. 21, 2011, 9:25 a.m.
Hi Wolfgang, Tapani,

On 11/21/11 11:07, Wolfgang Denk wrote:
> Dear Tapani Utriainen,
> 
> In message <20111121164002.2e3a6212@myhost> you wrote:
>>
>> Move duplicate Sitara MUX definitions to arch-omap3/mux.h
> 
> Thanks.

This has been already done by Ilya and waits for someone to merge,
check here:
http://patchwork.ozlabs.org/patch/125030/

> 
>> Signed-off-by: Tapani Utriainen <tapani@technexion.com>
>> CC: Sandeep Paulraj <s-paulraj@ti.com>
>> ---
>>  arch/arm/include/asm/arch-omap3/mux.h |   51 ++++++++++++++++++++++++++++++++++
>>  board/logicpd/am3517evm/am3517evm.h   |   40 --------------------------
>>  board/ti/am3517crane/am3517crane.h    |   39 --------------------------
>>  3 files changed, 51 insertions(+), 79 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
>> index 0c01c73..d796d6c 100644
>> --- a/arch/arm/include/asm/arch-omap3/mux.h
>> +++ b/arch/arm/include/asm/arch-omap3/mux.h
>> @@ -404,6 +404,57 @@
>>  #define CONTROL_PADCONF_SDRC_CKE0	0x0262
>>  #define CONTROL_PADCONF_SDRC_CKE1	0x0264
>>  
>> +/**********************************************
>> + AM35xx specific definitions
>> +
>> + The AM3517 and the AM3508 are formally branded
>> + as Sitara processors, but in practice they are
>> + compatible with OMAP3 and are treated as OMAP3
>> + by software like u-boot and the Linux kernel.
>> +
>> +***********************************************/
> 
> Incorrect multiline comment style. Please fix.
> 
> Best regards,
> 
> Wolfgang Denk
>
Tapani Utriainen - Nov. 23, 2011, 3:55 a.m.
Wolfgang, Stefan, Igor, Tomi,

thank you for reviewing the patches for TechNexion modules.

Some of the comments are constructive and helpful and will be taken on-board once we get an opportunity to re-submit.

It also seems that there are other patches lined-up that will influence our patches, so also for that reason it is probably better to wait a few weeks.

A concrete suggestion back: clarify the coding standard for multi-line comments in the u-boot documentation. The kernel standard only says one form is "preferred" over another, and nowhere states that other forms are "incorrect". (And come on, it's just comments! Better to have badly formatted ones than none at all).

//Tapani

Patch

diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
index 0c01c73..d796d6c 100644
--- a/arch/arm/include/asm/arch-omap3/mux.h
+++ b/arch/arm/include/asm/arch-omap3/mux.h
@@ -404,6 +404,57 @@ 
 #define CONTROL_PADCONF_SDRC_CKE0	0x0262
 #define CONTROL_PADCONF_SDRC_CKE1	0x0264
 
+
+/**********************************************
+ AM35xx specific definitions
+
+ The AM3517 and the AM3508 are formally branded
+ as Sitara processors, but in practice they are
+ compatible with OMAP3 and are treated as OMAP3
+ by software like u-boot and the Linux kernel.
+
+***********************************************/
+
+#define CONTROL_PADCONF_SYS_NRESWARM	0x0A08
+/* CCDC */
+#define CONTROL_PADCONF_CCDC_PCLK	0x01E4
+#define CONTROL_PADCONF_CCDC_FIELD	0x01E6
+#define CONTROL_PADCONF_CCDC_HD		0x01E8
+#define CONTROL_PADCONF_CCDC_VD		0x01EA
+#define CONTROL_PADCONF_CCDC_WEN	0x01EC
+#define CONTROL_PADCONF_CCDC_DATA0	0x01EE
+#define CONTROL_PADCONF_CCDC_DATA1	0x01F0
+#define CONTROL_PADCONF_CCDC_DATA2	0x01F2
+#define CONTROL_PADCONF_CCDC_DATA3	0x01F4
+#define CONTROL_PADCONF_CCDC_DATA4	0x01F6
+#define CONTROL_PADCONF_CCDC_DATA5	0x01F8
+#define CONTROL_PADCONF_CCDC_DATA6	0x01FA
+#define CONTROL_PADCONF_CCDC_DATA7	0x01FC
+/* RMII */
+#define CONTROL_PADCONF_RMII_MDIO_DATA	0x01FE
+#define CONTROL_PADCONF_RMII_MDIO_CLK	0x0200
+#define CONTROL_PADCONF_RMII_RXD0	0x0202
+#define CONTROL_PADCONF_RMII_RXD1	0x0204
+#define CONTROL_PADCONF_RMII_CRS_DV	0x0206
+#define CONTROL_PADCONF_RMII_RXER	0x0208
+#define CONTROL_PADCONF_RMII_TXD0	0x020A
+#define CONTROL_PADCONF_RMII_TXD1	0x020C
+#define CONTROL_PADCONF_RMII_TXEN	0x020E
+#define CONTROL_PADCONF_RMII_50MHZ_CLK	0x0210
+#define CONTROL_PADCONF_USB0_DRVBUS	0x0212
+/* CAN */
+#define CONTROL_PADCONF_HECC1_TXD	0x0214
+#define CONTROL_PADCONF_HECC1_RXD	0x0216
+
+#define CONTROL_PADCONF_SYS_BOOT7	0x0218
+#define CONTROL_PADCONF_SDRC_DQS0N	0x021A
+#define CONTROL_PADCONF_SDRC_DQS1N	0x021C
+#define CONTROL_PADCONF_SDRC_DQS2N	0x021E
+#define CONTROL_PADCONF_SDRC_DQS3N	0x0220
+#define CONTROL_PADCONF_STRBEN_DLY0	0x0222
+#define CONTROL_PADCONF_STRBEN_DLY1	0x0224
+#define CONTROL_PADCONF_SYS_BOOT8	0x0226
+
 #define MUX_VAL(OFFSET,VALUE)\
 	writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET));
 
diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h
index 3d74ef1..68d746c 100644
--- a/board/logicpd/am3517evm/am3517evm.h
+++ b/board/logicpd/am3517evm/am3517evm.h
@@ -31,46 +31,6 @@  const omap3_sysinfo sysinfo = {
 	"AM3517EVM Board",
 	"NAND",
 };
-/* AM3517 specific mux configuration */
-#define CONTROL_PADCONF_SYS_NRESWARM	0x0A08
-/* CCDC */
-#define CONTROL_PADCONF_CCDC_PCLK	0x01E4
-#define CONTROL_PADCONF_CCDC_FIELD	0x01E6
-#define CONTROL_PADCONF_CCDC_HD		0x01E8
-#define CONTROL_PADCONF_CCDC_VD		0x01EA
-#define CONTROL_PADCONF_CCDC_WEN	0x01EC
-#define CONTROL_PADCONF_CCDC_DATA0	0x01EE
-#define CONTROL_PADCONF_CCDC_DATA1	0x01F0
-#define CONTROL_PADCONF_CCDC_DATA2	0x01F2
-#define CONTROL_PADCONF_CCDC_DATA3	0x01F4
-#define CONTROL_PADCONF_CCDC_DATA4	0x01F6
-#define CONTROL_PADCONF_CCDC_DATA5	0x01F8
-#define CONTROL_PADCONF_CCDC_DATA6	0x01FA
-#define CONTROL_PADCONF_CCDC_DATA7	0x01FC
-/* RMII */
-#define CONTROL_PADCONF_RMII_MDIO_DATA	0x01FE
-#define CONTROL_PADCONF_RMII_MDIO_CLK	0x0200
-#define CONTROL_PADCONF_RMII_RXD0	0x0202
-#define CONTROL_PADCONF_RMII_RXD1	0x0204
-#define CONTROL_PADCONF_RMII_CRS_DV	0x0206
-#define CONTROL_PADCONF_RMII_RXER	0x0208
-#define CONTROL_PADCONF_RMII_TXD0	0x020A
-#define CONTROL_PADCONF_RMII_TXD1	0x020C
-#define CONTROL_PADCONF_RMII_TXEN	0x020E
-#define CONTROL_PADCONF_RMII_50MHZ_CLK	0x0210
-#define CONTROL_PADCONF_USB0_DRVBUS	0x0212
-/* CAN */
-#define CONTROL_PADCONF_HECC1_TXD	0x0214
-#define CONTROL_PADCONF_HECC1_RXD	0x0216
-
-#define CONTROL_PADCONF_SYS_BOOT7	0x0218
-#define CONTROL_PADCONF_SDRC_DQS0N	0x021A
-#define CONTROL_PADCONF_SDRC_DQS1N	0x021C
-#define CONTROL_PADCONF_SDRC_DQS2N	0x021E
-#define CONTROL_PADCONF_SDRC_DQS3N	0x0220
-#define CONTROL_PADCONF_STRBEN_DLY0	0x0222
-#define CONTROL_PADCONF_STRBEN_DLY1	0x0224
-#define CONTROL_PADCONF_SYS_BOOT8	0x0226
 
 /*
  * IEN  - Input Enable
diff --git a/board/ti/am3517crane/am3517crane.h b/board/ti/am3517crane/am3517crane.h
index 41db972..71335a3 100644
--- a/board/ti/am3517crane/am3517crane.h
+++ b/board/ti/am3517crane/am3517crane.h
@@ -30,45 +30,6 @@  const omap3_sysinfo sysinfo = {
 	"CraneBoard",
 	"NAND",
 };
-/* AM3517 specific mux configuration */
-#define CONTROL_PADCONF_SYS_NRESWARM	0x0A08
-/* CCDC */
-#define CONTROL_PADCONF_CCDC_PCLK	0x01E4
-#define CONTROL_PADCONF_CCDC_FIELD	0x01E6
-#define CONTROL_PADCONF_CCDC_HD		0x01E8
-#define CONTROL_PADCONF_CCDC_VD		0x01EA
-#define CONTROL_PADCONF_CCDC_WEN	0x01EC
-#define CONTROL_PADCONF_CCDC_DATA0	0x01EE
-#define CONTROL_PADCONF_CCDC_DATA1	0x01F0
-#define CONTROL_PADCONF_CCDC_DATA2	0x01F2
-#define CONTROL_PADCONF_CCDC_DATA3	0x01F4
-#define CONTROL_PADCONF_CCDC_DATA4	0x01F6
-#define CONTROL_PADCONF_CCDC_DATA5	0x01F8
-#define CONTROL_PADCONF_CCDC_DATA6	0x01FA
-#define CONTROL_PADCONF_CCDC_DATA7	0x01FC
-/* RMII */
-#define CONTROL_PADCONF_RMII_MDIO_DATA	0x01FE
-#define CONTROL_PADCONF_RMII_MDIO_CLK	0x0200
-#define CONTROL_PADCONF_RMII_RXD0	0x0202
-#define CONTROL_PADCONF_RMII_RXD1	0x0204
-#define CONTROL_PADCONF_RMII_CRS_DV	0x0206
-#define CONTROL_PADCONF_RMII_RXER	0x0208
-#define CONTROL_PADCONF_RMII_TXD0	0x020A
-#define CONTROL_PADCONF_RMII_TXD1	0x020C
-#define CONTROL_PADCONF_RMII_TXEN	0x020E
-#define CONTROL_PADCONF_RMII_50MHZ_CLK	0x0210
-#define CONTROL_PADCONF_USB0_DRVBUS	0x0212
-/* CAN */
-#define CONTROL_PADCONF_HECC1_TXD	0x0214
-#define CONTROL_PADCONF_HECC1_RXD	0x0216
-#define CONTROL_PADCONF_SYS_BOOT7	0x0218
-#define CONTROL_PADCONF_SDRC_DQS0N	0x021A
-#define CONTROL_PADCONF_SDRC_DQS1N	0x021C
-#define CONTROL_PADCONF_SDRC_DQS2N	0x021E
-#define CONTROL_PADCONF_SDRC_DQS3N	0x0220
-#define CONTROL_PADCONF_STRBEN_DLY0	0x0222
-#define CONTROL_PADCONF_STRBEN_DLY1	0x0224
-#define CONTROL_PADCONF_SYS_BOOT8	0x0226
 
 /*
  * IEN  - Input Enable