* [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-10-17 11:20 ` Albert ARIBAUD
2013-09-30 11:26 ` [U-Boot] [PATCH v2 02/10] arm: vf610: clean-up " Marcel Ziswiler
` (8 subsequent siblings)
9 siblings, 1 reply; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
The anadig_reg structure started at the wrong offset (fixed by adding
resvA[4]), was missing some reserved field required for alignment
purpose (resvB[3] between pll4_denom and pll6_ctrl) and further
contained too short a reserved field causing further miss-alignment
(resv10[7]).
Discovered and tested by temporarily putting the following debug
instrumentation into board_init():
struct anadig_reg *anadig = (struct anadig_reg *)ANADIG_BASE_ADDR;
printf("&anadig->pll3_ctrl=0x%p\n", &anadig->pll3_ctrl);
printf("&anadig->pll5_ctrl=0x%p\n", &anadig->pll5_ctrl);
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/crm_regs.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
index 85f1fda..57a0242 100644
--- a/arch/arm/include/asm/arch-vf610/crm_regs.h
+++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
@@ -55,6 +55,7 @@ struct ccm_reg {
/* Analog components control digital interface (ANADIG) */
struct anadig_reg {
+ u32 resvA[4];
u32 pll3_ctrl;
u32 resv0[3];
u32 pll7_ctrl;
@@ -72,12 +73,13 @@ struct anadig_reg {
u32 pll4_num;
u32 resv7[3];
u32 pll4_denom;
+ u32 resvB[3];
u32 pll6_ctrl;
u32 resv8[3];
u32 pll6_num;
u32 resv9[3];
u32 pll6_denom;
- u32 resv10[3];
+ u32 resv10[7];
u32 pll5_ctrl;
u32 resv11[3];
u32 pll3_pfd;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct
2013-09-30 11:26 ` [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct Marcel Ziswiler
@ 2013-10-17 11:20 ` Albert ARIBAUD
2013-10-17 11:21 ` Albert ARIBAUD
0 siblings, 1 reply; 14+ messages in thread
From: Albert ARIBAUD @ 2013-10-17 11:20 UTC (permalink / raw)
To: u-boot
Hi Marcel,
On Mon, 30 Sep 2013 13:26:06 +0200, Marcel Ziswiler
<marcel@ziswiler.com> wrote:
> The anadig_reg structure started at the wrong offset (fixed by adding
> resvA[4]), was missing some reserved field required for alignment
> purpose (resvB[3] between pll4_denom and pll6_ctrl) and further
> contained too short a reserved field causing further miss-alignment
> (resv10[7]).
>
> Discovered and tested by temporarily putting the following debug
> instrumentation into board_init():
> struct anadig_reg *anadig = (struct anadig_reg *)ANADIG_BASE_ADDR;
> printf("&anadig->pll3_ctrl=0x%p\n", &anadig->pll3_ctrl);
> printf("&anadig->pll5_ctrl=0x%p\n", &anadig->pll5_ctrl);
>
> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
> ---
> arch/arm/include/asm/arch-vf610/crm_regs.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
> index 85f1fda..57a0242 100644
> --- a/arch/arm/include/asm/arch-vf610/crm_regs.h
> +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
> @@ -55,6 +55,7 @@ struct ccm_reg {
>
> /* Analog components control digital interface (ANADIG) */
> struct anadig_reg {
> + u32 resvA[4];
Can you name reserved fields based on their byte or register
index offset?
> u32 pll3_ctrl;
> u32 resv0[3];
> u32 pll7_ctrl;
> @@ -72,12 +73,13 @@ struct anadig_reg {
> u32 pll4_num;
> u32 resv7[3];
> u32 pll4_denom;
> + u32 resvB[3];
> u32 pll6_ctrl;
> u32 resv8[3];
> u32 pll6_num;
> u32 resv9[3];
> u32 pll6_denom;
> - u32 resv10[3];
> + u32 resv10[7];
> u32 pll5_ctrl;
> u32 resv11[3];
> u32 pll3_pfd;
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct
2013-10-17 11:20 ` Albert ARIBAUD
@ 2013-10-17 11:21 ` Albert ARIBAUD
0 siblings, 0 replies; 14+ messages in thread
From: Albert ARIBAUD @ 2013-10-17 11:21 UTC (permalink / raw)
To: u-boot
On Thu, 17 Oct 2013 13:20:09 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:
> Hi Marcel,
>
> On Mon, 30 Sep 2013 13:26:06 +0200, Marcel Ziswiler
> <marcel@ziswiler.com> wrote:
>
> > The anadig_reg structure started at the wrong offset (fixed by adding
> > resvA[4]), was missing some reserved field required for alignment
> > purpose (resvB[3] between pll4_denom and pll6_ctrl) and further
> > contained too short a reserved field causing further miss-alignment
> > (resv10[7]).
> >
> > Discovered and tested by temporarily putting the following debug
> > instrumentation into board_init():
> > struct anadig_reg *anadig = (struct anadig_reg *)ANADIG_BASE_ADDR;
> > printf("&anadig->pll3_ctrl=0x%p\n", &anadig->pll3_ctrl);
> > printf("&anadig->pll5_ctrl=0x%p\n", &anadig->pll5_ctrl);
> >
> > Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
> > ---
> > arch/arm/include/asm/arch-vf610/crm_regs.h | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
> > index 85f1fda..57a0242 100644
> > --- a/arch/arm/include/asm/arch-vf610/crm_regs.h
> > +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
> > @@ -55,6 +55,7 @@ struct ccm_reg {
> >
> > /* Analog components control digital interface (ANADIG) */
> > struct anadig_reg {
> > + u32 resvA[4];
>
> Can you name reserved fields based on their byte or register
> index offset?
Scratch that. :) Instead, just merge 01 and 02 together.
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2 02/10] arm: vf610: clean-up anadig register struct
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 03/10] arm: vf610: add uart0 clock definition Marcel Ziswiler
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Rename all the reserved fields using a memory offset based scheme.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/crm_regs.h | 54 ++++++++++++++--------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
index 57a0242..2d7a32d 100644
--- a/arch/arm/include/asm/arch-vf610/crm_regs.h
+++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
@@ -55,59 +55,59 @@ struct ccm_reg {
/* Analog components control digital interface (ANADIG) */
struct anadig_reg {
- u32 resvA[4];
+ u32 reserved_0x000[4];
u32 pll3_ctrl;
- u32 resv0[3];
+ u32 reserved_0x014[3];
u32 pll7_ctrl;
- u32 resv1[3];
+ u32 reserved_0x024[3];
u32 pll2_ctrl;
- u32 resv2[3];
+ u32 reserved_0x034[3];
u32 pll2_ss;
- u32 resv3[3];
+ u32 reserved_0x044[3];
u32 pll2_num;
- u32 resv4[3];
+ u32 reserved_0x054[3];
u32 pll2_denom;
- u32 resv5[3];
+ u32 reserved_0x064[3];
u32 pll4_ctrl;
- u32 resv6[3];
+ u32 reserved_0x074[3];
u32 pll4_num;
- u32 resv7[3];
+ u32 reserved_0x084[3];
u32 pll4_denom;
- u32 resvB[3];
+ u32 reserved_0x094[3];
u32 pll6_ctrl;
- u32 resv8[3];
+ u32 reserved_0x0A4[3];
u32 pll6_num;
- u32 resv9[3];
+ u32 reserved_0x0B4[3];
u32 pll6_denom;
- u32 resv10[7];
+ u32 reserved_0x0C4[7];
u32 pll5_ctrl;
- u32 resv11[3];
+ u32 reserved_0x0E4[3];
u32 pll3_pfd;
- u32 resv12[3];
+ u32 reserved_0x0F4[3];
u32 pll2_pfd;
- u32 resv13[3];
+ u32 reserved_0x104[3];
u32 reg_1p1;
- u32 resv14[3];
+ u32 reserved_0x114[3];
u32 reg_3p0;
- u32 resv15[3];
+ u32 reserved_0x124[3];
u32 reg_2p5;
- u32 resv16[7];
+ u32 reserved_0x134[7];
u32 ana_misc0;
- u32 resv17[3];
+ u32 reserved_0x154[3];
u32 ana_misc1;
- u32 resv18[63];
+ u32 reserved_0x164[63];
u32 anadig_digprog;
- u32 resv19[3];
+ u32 reserved_0x264[3];
u32 pll1_ctrl;
- u32 resv20[3];
+ u32 reserved_0x274[3];
u32 pll1_ss;
- u32 resv21[3];
+ u32 reserved_0x284[3];
u32 pll1_num;
- u32 resv22[3];
+ u32 reserved_0x294[3];
u32 pll1_denom;
- u32 resv23[3];
+ u32 reserved_0x2A4[3];
u32 pll1_pdf;
- u32 resv24[3];
+ u32 reserved_0x2B4[3];
u32 pll_lock;
};
#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 03/10] arm: vf610: add uart0 clock definition
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 01/10] arm: vf610: fix anadig register struct Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 02/10] arm: vf610: clean-up " Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 04/10] arm: vf610: add anadig pll5 definitions Marcel Ziswiler
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Add CCM_CCGR0_UART0_CTRL_MASK clock definition for UART0 aka SCI0.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/crm_regs.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
index 2d7a32d..04cc5bc 100644
--- a/arch/arm/include/asm/arch-vf610/crm_regs.h
+++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
@@ -166,6 +166,7 @@ struct anadig_reg {
#define CCM_CSCMR2_RMII_CLK_SEL(v) (((v) & 0x3) << 4)
#define CCM_REG_CTRL_MASK 0xffffffff
+#define CCM_CCGR0_UART0_CTRL_MASK (0x3 << 14)
#define CCM_CCGR0_UART1_CTRL_MASK (0x3 << 16)
#define CCM_CCGR1_PIT_CTRL_MASK (0x3 << 14)
#define CCM_CCGR1_WDOGA5_CTRL_MASK (0x3 << 28)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 04/10] arm: vf610: add anadig pll5 definitions
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (2 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 03/10] arm: vf610: add uart0 clock definition Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-10-17 12:38 ` Albert ARIBAUD
2013-09-30 11:26 ` [U-Boot] [PATCH v2 05/10] arm: vf610: add enet1 base address definition Marcel Ziswiler
` (5 subsequent siblings)
9 siblings, 1 reply; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Add ANADIG PLL5 control definitions required for Ethernet RMII clock
configuration.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/crm_regs.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
index 04cc5bc..e17c7d1 100644
--- a/arch/arm/include/asm/arch-vf610/crm_regs.h
+++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
@@ -187,6 +187,10 @@ struct anadig_reg {
#define CCM_CCGR9_FEC0_CTRL_MASK 0x3
#define CCM_CCGR9_FEC1_CTRL_MASK (0x3 << 2)
+#define ANADIG_PLL5_CTRL_BYPASS (1 << 16)
+#define ANADIG_PLL5_CTRL_ENABLE (1 << 13)
+#define ANADIG_PLL5_CTRL_POWERDOWN (1 << 12)
+#define ANADIG_PLL5_CTRL_DIV_SELECT 1
#define ANADIG_PLL2_CTRL_ENABLE (1 << 13)
#define ANADIG_PLL2_CTRL_POWERDOWN (1 << 12)
#define ANADIG_PLL2_CTRL_DIV_SELECT 1
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 04/10] arm: vf610: add anadig pll5 definitions
2013-09-30 11:26 ` [U-Boot] [PATCH v2 04/10] arm: vf610: add anadig pll5 definitions Marcel Ziswiler
@ 2013-10-17 12:38 ` Albert ARIBAUD
0 siblings, 0 replies; 14+ messages in thread
From: Albert ARIBAUD @ 2013-10-17 12:38 UTC (permalink / raw)
To: u-boot
Hi Marcel,
On Mon, 30 Sep 2013 13:26:09 +0200, Marcel Ziswiler
<marcel@ziswiler.com> wrote:
> Add ANADIG PLL5 control definitions required for Ethernet RMII clock
> configuration.
>
> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
> ---
> arch/arm/include/asm/arch-vf610/crm_regs.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h
> index 04cc5bc..e17c7d1 100644
> --- a/arch/arm/include/asm/arch-vf610/crm_regs.h
> +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h
> @@ -187,6 +187,10 @@ struct anadig_reg {
> #define CCM_CCGR9_FEC0_CTRL_MASK 0x3
> #define CCM_CCGR9_FEC1_CTRL_MASK (0x3 << 2)
>
> +#define ANADIG_PLL5_CTRL_BYPASS (1 << 16)
> +#define ANADIG_PLL5_CTRL_ENABLE (1 << 13)
> +#define ANADIG_PLL5_CTRL_POWERDOWN (1 << 12)
> +#define ANADIG_PLL5_CTRL_DIV_SELECT 1
> #define ANADIG_PLL2_CTRL_ENABLE (1 << 13)
> #define ANADIG_PLL2_CTRL_POWERDOWN (1 << 12)
> #define ANADIG_PLL2_CTRL_DIV_SELECT 1
This and 3/10 could be merged as they touch the same file and do the
same thing, adding definitions.
Ditto for 06, 07 and 08/10 which all touch the same file.
I'd even say all addition patches (3/10 to 8/10) could be grouped
together in one logical change, like "add all definitions needed for
vf610".
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2 05/10] arm: vf610: add enet1 base address definition
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (3 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 04/10] arm: vf610: add anadig pll5 definitions Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 06/10] arm: vf610: add rmii clkout iomux definition Marcel Ziswiler
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Add secondary Ethernet MAC RMII1 base address definition in preparation
of potential secondary only board configurations.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/imx-regs.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h
index b8c877f..c2f9761 100644
--- a/arch/arm/include/asm/arch-vf610/imx-regs.h
+++ b/arch/arm/include/asm/arch-vf610/imx-regs.h
@@ -85,6 +85,7 @@
#define ESDHC0_BASE_ADDR (AIPS1_BASE_ADDR + 0x00031000)
#define ESDHC1_BASE_ADDR (AIPS1_BASE_ADDR + 0x00032000)
#define ENET_BASE_ADDR (AIPS1_BASE_ADDR + 0x00050000)
+#define ENET1_BASE_ADDR (AIPS1_BASE_ADDR + 0x00051000)
/* MUX mode and PAD ctrl are in one register */
#define CONFIG_IOMUX_SHARE_CONF_REG
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 06/10] arm: vf610: add rmii clkout iomux definition
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (4 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 05/10] arm: vf610: add enet1 base address definition Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 07/10] arm: vf610: add uart0 tx/rx iomux definitions Marcel Ziswiler
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Add VF610_PAD_PTA6__RMII0_CLKOUT iomux definition eventually required
for internal (e.g. crystal-less) Ethernet clocking.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/iomux-vf610.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
index 4a39eb0..e315fe4 100644
--- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
@@ -22,6 +22,7 @@
enum {
VF610_PAD_PTA6__RMII0_CLKIN = IOMUX_PAD(0x0000, 0x0000, 2, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTA6__RMII0_CLKOUT = IOMUX_PAD(0x0000, 0x0000, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTB4__UART1_TX = IOMUX_PAD(0x0068, 0x0068, 2, 0x0380, 0, VF610_UART_PAD_CTRL),
VF610_PAD_PTB5__UART1_RX = IOMUX_PAD(0x006c, 0x006c, 2, 0x037c, 0, VF610_UART_PAD_CTRL),
VF610_PAD_PTC1__RMII0_MDIO = IOMUX_PAD(0x00b8, 0x00b8, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 07/10] arm: vf610: add uart0 tx/rx iomux definitions
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (5 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 06/10] arm: vf610: add rmii clkout iomux definition Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 08/10] arm: vf610: add rmii1 " Marcel Ziswiler
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Add UART0 aka SCI0 TX/RX iomux definitions.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/iomux-vf610.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
index e315fe4..a6f7132 100644
--- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
@@ -25,6 +25,8 @@ enum {
VF610_PAD_PTA6__RMII0_CLKOUT = IOMUX_PAD(0x0000, 0x0000, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTB4__UART1_TX = IOMUX_PAD(0x0068, 0x0068, 2, 0x0380, 0, VF610_UART_PAD_CTRL),
VF610_PAD_PTB5__UART1_RX = IOMUX_PAD(0x006c, 0x006c, 2, 0x037c, 0, VF610_UART_PAD_CTRL),
+ VF610_PAD_PTB10__UART0_TX = IOMUX_PAD(0x0080, 0x0080, 1, __NA_, 0, VF610_UART_PAD_CTRL),
+ VF610_PAD_PTB11__UART0_RX = IOMUX_PAD(0x0084, 0x0084, 1, __NA_, 0, VF610_UART_PAD_CTRL),
VF610_PAD_PTC1__RMII0_MDIO = IOMUX_PAD(0x00b8, 0x00b8, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTC0__RMII0_MDC = IOMUX_PAD(0x00b4, 0x00b4, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTC2__RMII0_CRS_DV = IOMUX_PAD(0x00bc, 0x00bc, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 08/10] arm: vf610: add rmii1 iomux definitions
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (6 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 07/10] arm: vf610: add uart0 tx/rx iomux definitions Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 09/10] arm: vf610: fix double iomux configuration for vf610twr board Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 10/10] arm: vf610: remove obsolete uart port configuration Marcel Ziswiler
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Add secondary RMII1 iomux definitions now with correct mux_ctrl_ofs as
well.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
arch/arm/include/asm/arch-vf610/iomux-vf610.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
index a6f7132..88807d8 100644
--- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
@@ -36,6 +36,15 @@ enum {
VF610_PAD_PTC6__RMII0_TD1 = IOMUX_PAD(0x00cc, 0x00cc, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTC7__RMII0_TD0 = IOMUX_PAD(0x00D0, 0x00D0, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTC8__RMII0_TXEN = IOMUX_PAD(0x00D4, 0x00D4, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC10__RMII1_MDIO = IOMUX_PAD(0x00dc, 0x00dc, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC9__RMII1_MDC = IOMUX_PAD(0x00d8, 0x00d8, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC11__RMII1_CRS_DV = IOMUX_PAD(0x00e0, 0x00e0, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC12__RMII1_RD1 = IOMUX_PAD(0x00e4, 0x00e4, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC13__RMII1_RD0 = IOMUX_PAD(0x00e8, 0x00e8, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC14__RMII1_RXER = IOMUX_PAD(0x00ec, 0x00ec, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC15__RMII1_TD1 = IOMUX_PAD(0x00f0, 0x00f0, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC16__RMII1_TD0 = IOMUX_PAD(0x00f4, 0x00f4, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
+ VF610_PAD_PTC17__RMII1_TXEN = IOMUX_PAD(0x00f8, 0x00f8, 1, __NA_, 0, VF610_ENET_PAD_CTRL),
VF610_PAD_PTA24__ESDHC1_CLK = IOMUX_PAD(0x0038, 0x0038, 5, __NA_, 0, VF610_SDHC_PAD_CTRL),
VF610_PAD_PTA25__ESDHC1_CMD = IOMUX_PAD(0x003c, 0x003c, 5, __NA_, 0, VF610_SDHC_PAD_CTRL),
VF610_PAD_PTA26__ESDHC1_DAT0 = IOMUX_PAD(0x0040, 0x0040, 5, __NA_, 0, VF610_SDHC_PAD_CTRL),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 09/10] arm: vf610: fix double iomux configuration for vf610twr board
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (7 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 08/10] arm: vf610: add rmii1 " Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
2013-09-30 11:26 ` [U-Boot] [PATCH v2 10/10] arm: vf610: remove obsolete uart port configuration Marcel Ziswiler
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Get rid of double VF610_PAD_DDR_A15__DDR_A_15 iomux configuration.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
board/freescale/vf610twr/vf610twr.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 699ea7f..4ee74c0 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -31,7 +31,6 @@ void setup_iomux_ddr(void)
{
static const iomux_v3_cfg_t ddr_pads[] = {
VF610_PAD_DDR_A15__DDR_A_15,
- VF610_PAD_DDR_A15__DDR_A_15,
VF610_PAD_DDR_A14__DDR_A_14,
VF610_PAD_DDR_A13__DDR_A_13,
VF610_PAD_DDR_A12__DDR_A_12,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [PATCH v2 10/10] arm: vf610: remove obsolete uart port configuration
2013-09-30 11:26 [U-Boot] [PATCH v2 00/10] arm: vf610/vf610twr: vybrid tower fixes and enhancements Marcel Ziswiler
` (8 preceding siblings ...)
2013-09-30 11:26 ` [U-Boot] [PATCH v2 09/10] arm: vf610: fix double iomux configuration for vf610twr board Marcel Ziswiler
@ 2013-09-30 11:26 ` Marcel Ziswiler
9 siblings, 0 replies; 14+ messages in thread
From: Marcel Ziswiler @ 2013-09-30 11:26 UTC (permalink / raw)
To: u-boot
Get rid of obsolete CONFIG_SYS_UART_PORT configuration option.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
include/configs/vf610twr.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 5a7a066..432a69d 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -39,7 +39,6 @@
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_UART_PORT (1)
#define CONFIG_BAUDRATE 115200
#undef CONFIG_CMD_IMLS
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread