[PATCH 1/2] arm: mx50_rdp: add fec support

[PATCH 1/2] arm: mx50_rdp: add fec support

[Richard Zhao]

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
 arch/arm/mach-mx5/Kconfig                |    1 +
 arch/arm/mach-mx5/board-mx50_rdp.c       |   22 ++++++++++++++++++++--
 arch/arm/mach-mx5/devices-mx50.h         |    5 +++++
 arch/arm/plat-mxc/devices/platform-fec.c |    5 +++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index f2f0731..64d2bf9 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -142,6 +142,7 @@ config MACH_MX50_RDP
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_SPI_IMX
+	select IMX_HAVE_PLATFORM_FEC
 	help
 	  Include support for MX50 reference design platform (RDP) board. This
 	  includes specific configurations for the board and its peripherals.
diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
index fd32e4c..c174188 100644
--- a/arch/arm/mach-mx5/board-mx50_rdp.c
+++ b/arch/arm/mach-mx5/board-mx50_rdp.c
@@ -37,6 +37,9 @@
 
 #include "devices-mx50.h"
 
+#define FEC_EN		IMX_GPIO_NR(6, 23)
+#define FEC_RESET_B	IMX_GPIO_NR(4, 12)
+
 static iomux_v3_cfg_t mx50_rdp_pads[] __initdata = {
 	/* SD1 */
 	MX50_PAD_ECSPI2_SS0__GPIO_4_19,
@@ -102,7 +105,7 @@ static iomux_v3_cfg_t mx50_rdp_pads[] __initdata = {
 	MX50_PAD_I2C3_SCL__USBOTG_OC,
 
 	MX50_PAD_SSI_RXC__FEC_MDIO,
-	MX50_PAD_SSI_RXC__FEC_MDIO,
+	MX50_PAD_SSI_RXFS__FEC_MDC,
 	MX50_PAD_DISP_D0__FEC_TXCLK,
 	MX50_PAD_DISP_D1__FEC_RX_ER,
 	MX50_PAD_DISP_D2__FEC_RX_DV,
@@ -111,7 +114,6 @@ static iomux_v3_cfg_t mx50_rdp_pads[] __initdata = {
 	MX50_PAD_DISP_D5__FEC_TX_EN,
 	MX50_PAD_DISP_D6__FEC_TXD1,
 	MX50_PAD_DISP_D7__FEC_TXD0,
-	MX50_PAD_SSI_RXFS__FEC_MDC,
 	MX50_PAD_I2C3_SDA__GPIO_6_23,
 	MX50_PAD_ECSPI1_SCLK__GPIO_4_12,
 
@@ -168,6 +170,20 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
 	.flags = IMXUART_HAVE_RTSCTS,
 };
 
+static const struct fec_platform_data fec_data = {
+	.phy = PHY_INTERFACE_MODE_RMII,
+};
+
+static inline void mx50_rdp_fec_reset(void)
+{
+	gpio_request(FEC_EN, "fec-en");
+	gpio_direction_output(FEC_EN, 0);
+	gpio_request(FEC_RESET_B, "fec-reset_b");
+	gpio_direction_output(FEC_RESET_B, 0);
+	msleep(1);
+	gpio_set_value(FEC_RESET_B, 1);
+}
+
 /*
  * Board specific initialization.
  */
@@ -178,6 +194,8 @@ static void __init mx50_rdp_board_init(void)
 
 	imx50_add_imx_uart(0, &uart_pdata);
 	imx50_add_imx_uart(1, &uart_pdata);
+	mx50_rdp_fec_reset();
+	imx50_add_fec(&fec_data);
 }
 
 static void __init mx50_rdp_timer_init(void)
diff --git a/arch/arm/mach-mx5/devices-mx50.h b/arch/arm/mach-mx5/devices-mx50.h
index 98ab074..e1093db 100644
--- a/arch/arm/mach-mx5/devices-mx50.h
+++ b/arch/arm/mach-mx5/devices-mx50.h
@@ -24,3 +24,8 @@
 extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[] __initconst;
 #define imx50_add_imx_uart(id, pdata)	\
 	imx_add_imx_uart_1irq(&imx50_imx_uart_data[id], pdata)
+
+extern const struct imx_fec_data imx50_fec_data __initconst;
+#define imx50_add_fec(pdata)	\
+	imx_add_fec(&imx50_fec_data, pdata)
+
diff --git a/arch/arm/plat-mxc/devices/platform-fec.c b/arch/arm/plat-mxc/devices/platform-fec.c
index b50c351..4f52996 100644
--- a/arch/arm/plat-mxc/devices/platform-fec.c
+++ b/arch/arm/plat-mxc/devices/platform-fec.c
@@ -31,6 +31,11 @@ const struct imx_fec_data imx35_fec_data __initconst =
 	imx_fec_data_entry_single(MX35);
 #endif
 
+#ifdef CONFIG_SOC_IMX50
+const struct imx_fec_data imx50_fec_data __initconst =
+	imx_fec_data_entry_single(MX50);
+#endif
+
 #ifdef CONFIG_SOC_IMX51
 const struct imx_fec_data imx51_fec_data __initconst =
 	imx_fec_data_entry_single(MX51);
-- 
1.6.3.3

[PATCH 2/2] arm: mx50_rdp: add i2c bus support

[Richard Zhao]

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
 arch/arm/mach-mx5/board-mx50_rdp.c           |    7 +++++++
 arch/arm/mach-mx5/devices-mx50.h             |    3 +++
 arch/arm/plat-mxc/devices/platform-imx-i2c.c |   10 ++++++++++
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
index c174188..a7c53e6 100644
--- a/arch/arm/mach-mx5/board-mx50_rdp.c
+++ b/arch/arm/mach-mx5/board-mx50_rdp.c
@@ -184,6 +184,10 @@ static inline void mx50_rdp_fec_reset(void)
 	gpio_set_value(FEC_RESET_B, 1);
 }
 
+static const struct imxi2c_platform_data i2c_data __initconst = {
+	.bitrate = 100000,
+};
+
 /*
  * Board specific initialization.
  */
@@ -196,6 +200,9 @@ static void __init mx50_rdp_board_init(void)
 	imx50_add_imx_uart(1, &uart_pdata);
 	mx50_rdp_fec_reset();
 	imx50_add_fec(&fec_data);
+	imx50_add_imx_i2c(0, &i2c_data);
+	imx50_add_imx_i2c(1, &i2c_data);
+	imx50_add_imx_i2c(2, &i2c_data);
 }
 
 static void __init mx50_rdp_timer_init(void)
diff --git a/arch/arm/mach-mx5/devices-mx50.h b/arch/arm/mach-mx5/devices-mx50.h
index e1093db..c9e4282 100644
--- a/arch/arm/mach-mx5/devices-mx50.h
+++ b/arch/arm/mach-mx5/devices-mx50.h
@@ -29,3 +29,6 @@ extern const struct imx_fec_data imx50_fec_data __initconst;
 #define imx50_add_fec(pdata)	\
 	imx_add_fec(&imx50_fec_data, pdata)
 
+extern const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst;
+#define imx50_add_imx_i2c(id, pdata)	\
+	imx_add_imx_i2c(&imx50_imx_i2c_data[id], pdata)
diff --git a/arch/arm/plat-mxc/devices/platform-imx-i2c.c b/arch/arm/plat-mxc/devices/platform-imx-i2c.c
index 7ba94e1..2ab74f0 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-i2c.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-i2c.c
@@ -69,6 +69,16 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
+#ifdef CONFIG_SOC_IMX50
+const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst = {
+#define imx50_imx_i2c_data_entry(_id, _hwid)				\
+	imx_imx_i2c_data_entry(MX50, _id, _hwid, SZ_4K)
+	imx50_imx_i2c_data_entry(0, 1),
+	imx50_imx_i2c_data_entry(1, 2),
+	imx50_imx_i2c_data_entry(2, 3),
+};
+#endif /* ifdef CONFIG_SOC_IMX51 */
+
 #ifdef CONFIG_SOC_IMX51
 const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {
 #define imx51_imx_i2c_data_entry(_id, _hwid)				\
-- 
1.6.3.3

[PATCH 1/2] arm: mx50_rdp: add fec support

[Uwe Kleine-König]

Hello Richard,

On Fri, Jan 14, 2011 at 02:55:36PM +0800, Richard Zhao wrote:
> +static const struct fec_platform_data fec_data = {
This can be __initconst.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 1/2] arm: mx50_rdp: add fec support

[Richard Zhao]

On Fri, Jan 14, 2011 at 08:50:24AM +0100, Uwe Kleine-K?nig wrote:
> Hello Richard,
> 
> On Fri, Jan 14, 2011 at 02:55:36PM +0800, Richard Zhao wrote:
> > +static const struct fec_platform_data fec_data = {
> This can be __initconst.
Right, Thanks.
> 
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-K?nig            |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> 

[PATCH 2/2] arm: mx50_rdp: add i2c bus support

[Jason Liu]

Hi, Richard,

2011/1/14 Richard Zhao <richard.zhao@freescale.com>:
> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> ---
> ?arch/arm/mach-mx5/board-mx50_rdp.c ? ? ? ? ? | ? ?7 +++++++
> ?arch/arm/mach-mx5/devices-mx50.h ? ? ? ? ? ? | ? ?3 +++

We need align the naming convention with i.mx53/i.mx50 fordevices-mx50.h ,
I have send out one patch for it.It seems not good when using devices-mx50.h
while using devices-imx53 and devices-imx51.h in the same directory.

I think we need use imx as much as possible since i.mx is FSL chip brand name.

Sascha, please help merge the following patch if you don't have some
comments about it.
http://lists.arm.linux.org.uk/lurker/message/20110110.223149.e2d1fe51.en.html

BR,
Jason

> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

[PATCH 2/2] arm: mx50_rdp: add i2c bus support

[Richard Zhao]

On Fri, Jan 14, 2011 at 10:27 PM, Jason Liu <liu.h.jason@gmail.com> wrote:
> Hi, Richard,
>
> 2011/1/14 Richard Zhao <richard.zhao@freescale.com>:
>> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
>> ---
>> ?arch/arm/mach-mx5/board-mx50_rdp.c ? ? ? ? ? | ? ?7 +++++++
>> ?arch/arm/mach-mx5/devices-mx50.h ? ? ? ? ? ? | ? ?3 +++
>
> We need align the naming convention with i.mx53/i.mx50 fordevices-mx50.h ,
> I have send out one patch for it.It seems not good when using devices-mx50.h
> while using devices-imx53 and devices-imx51.h in the same directory.
>
> I think we need use imx as much as possible since i.mx is FSL chip brand name.
>
> Sascha, please help merge the following patch if you don't have some
> comments about it.
> http://lists.arm.linux.org.uk/lurker/message/20110110.223149.e2d1fe51.en.html
I have comments on that thread too. I past here:
I noticed that too. Sometimes we use imx as part of file name or macro
name, but other times we use mx . We'd better make some rule that when
and where we suppose to use what.
I suggest we move all to mx for short. Reasons:
- For freescale internal, starting from mx5, we all use mx.
- macros in soc header files all use mx.
- soc header file name all use mx too.
- mach-types all use mx. (count in freescale board only)

Thanks
Richard
>
> BR,
> Jason
>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>

[PATCH 2/2] arm: mx50_rdp: add i2c bus support

[Jason Liu]

Hi, Richard,

2011/1/14 Richard Zhao <linuxzsc@gmail.com>:
> On Fri, Jan 14, 2011 at 10:27 PM, Jason Liu <liu.h.jason@gmail.com> wrote:
>> Hi, Richard,
>>
>> 2011/1/14 Richard Zhao <richard.zhao@freescale.com>:
>>> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
>>> ---
>>> ?arch/arm/mach-mx5/board-mx50_rdp.c ? ? ? ? ? | ? ?7 +++++++
>>> ?arch/arm/mach-mx5/devices-mx50.h ? ? ? ? ? ? | ? ?3 +++
>>
>> We need align the naming convention with i.mx53/i.mx50 fordevices-mx50.h ,
>> I have send out one patch for it.It seems not good when using devices-mx50.h
>> while using devices-imx53 and devices-imx51.h in the same directory.
>>
>> I think we need use imx as much as possible since i.mx is FSL chip brand name.
>>
>> Sascha, please help merge the following patch if you don't have some
>> comments about it.
>> http://lists.arm.linux.org.uk/lurker/message/20110110.223149.e2d1fe51.en.html
> I have comments on that thread too. I past here:
> I noticed that too. Sometimes we use imx as part of file name or macro
> name, but other times we use mx . We'd better make some rule that when
> and where we suppose to use what.
> I suggest we move all to mx for short. Reasons:
> - For freescale internal, starting from mx5, we all use mx.
> - macros in soc header files all use mx.
> - soc header file name all use mx too.
> - mach-types all use mx. (count in freescale board only)

No, I prefer to use imx since imx is the chip brand and FSL IC doc
stat it clearly it's i.mx.
And the most important is to keep compatible, we had better keep the
same naming convention.
Otherwise, it will make the directory a little mess.

>
> Thanks
> Richard
>>
>> BR,
>> Jason
>>
>>> _______________________________________________
>>> linux-arm-kernel mailing list
>>> linux-arm-kernel at lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>>
>>
>

[PATCH 2/2] arm: mx50_rdp: add i2c bus support

[Richard Zhao]

Hi Jason,

On Sat, Jan 15, 2011 at 12:10:34AM +0800, Jason Liu wrote:
> Hi, Richard,
> 
> 2011/1/14 Richard Zhao <linuxzsc@gmail.com>:
> > On Fri, Jan 14, 2011 at 10:27 PM, Jason Liu <liu.h.jason@gmail.com> wrote:
> >> Hi, Richard,
> >>
> >> 2011/1/14 Richard Zhao <richard.zhao@freescale.com>:
> >>> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> >>> ---
> >>> ?arch/arm/mach-mx5/board-mx50_rdp.c ? ? ? ? ? | ? ?7 +++++++
> >>> ?arch/arm/mach-mx5/devices-mx50.h ? ? ? ? ? ? | ? ?3 +++
> >>
> >> We need align the naming convention with i.mx53/i.mx50 fordevices-mx50.h ,
> >> I have send out one patch for it.It seems not good when using devices-mx50.h
> >> while using devices-imx53 and devices-imx51.h in the same directory.
> >>
> >> I think we need use imx as much as possible since i.mx is FSL chip brand name.
> >>
> >> Sascha, please help merge the following patch if you don't have some
> >> comments about it.
> >> http://lists.arm.linux.org.uk/lurker/message/20110110.223149.e2d1fe51.en.html
> > I have comments on that thread too. I past here:
> > I noticed that too. Sometimes we use imx as part of file name or macro
> > name, but other times we use mx . We'd better make some rule that when
> > and where we suppose to use what.
> > I suggest we move all to mx for short. Reasons:
> > - For freescale internal, starting from mx5, we all use mx.
> > - macros in soc header files all use mx.
> > - soc header file name all use mx too.
> > - mach-types all use mx. (count in freescale board only)
> 
> No, I prefer to use imx since imx is the chip brand and FSL IC doc
> stat it clearly it's i.mx.
> And the most important is to keep compatible, we had better keep the
> same naming convention.
> Otherwise, it will make the directory a little mess.
I don't care much what we use. I just think we'd better have a rule to tell
when which should be used.
Anyway, it's out of this patch.

Sascha/Uwe,

Is this patch series ok?

Thanks
Richard
> 
> >
> > Thanks
> > Richard
> >>
> >> BR,
> >> Jason
> >>
> >>> _______________________________________________
> >>> linux-arm-kernel mailing list
> >>> linux-arm-kernel at lists.infradead.org
> >>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >>>
> >>
> >

[PATCH 1/2] arm: mx50_rdp: add fec support

[Richard Zhao]

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>

diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
index dedf7f2..505513c 100644
--- a/arch/arm/mach-mx5/board-mx50_rdp.c
+++ b/arch/arm/mach-mx5/board-mx50_rdp.c
@@ -40,6 +40,9 @@
 #define FEC_EN		IMX_GPIO_NR(6, 23)
 #define FEC_RESET_B	IMX_GPIO_NR(4, 12)
 
+#define FEC_EN		IMX_GPIO_NR(6, 23)
+#define FEC_RESET_B	IMX_GPIO_NR(4, 12)
+
 static iomux_v3_cfg_t mx50_rdp_pads[] __initdata = {
 	/* SD1 */
 	MX50_PAD_ECSPI2_SS0__GPIO_4_19,
-- 
1.7.1

[PATCH 1/2] arm: mx50_rdp: add fec support

[Uwe Kleine-König]

On Fri, Feb 11, 2011 at 06:22:10PM +0800, Richard Zhao wrote:
> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> 
> diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
> index dedf7f2..505513c 100644
> --- a/arch/arm/mach-mx5/board-mx50_rdp.c
> +++ b/arch/arm/mach-mx5/board-mx50_rdp.c
> @@ -40,6 +40,9 @@
>  #define FEC_EN		IMX_GPIO_NR(6, 23)
>  #define FEC_RESET_B	IMX_GPIO_NR(4, 12)
>  
> +#define FEC_EN		IMX_GPIO_NR(6, 23)
> +#define FEC_RESET_B	IMX_GPIO_NR(4, 12)
> +
I think this is a left-over of a rebase.  The #defines are already
present and they alone don't justify saying "add fec support".

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 1/2] arm: mx50_rdp: add fec support

[Richard Zhao]

On Fri, Feb 11, 2011 at 11:24:59AM +0100, Uwe Kleine-K?nig wrote:
> On Fri, Feb 11, 2011 at 06:22:10PM +0800, Richard Zhao wrote:
> > Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> > 
> > diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
> > index dedf7f2..505513c 100644
> > --- a/arch/arm/mach-mx5/board-mx50_rdp.c
> > +++ b/arch/arm/mach-mx5/board-mx50_rdp.c
> > @@ -40,6 +40,9 @@
> >  #define FEC_EN		IMX_GPIO_NR(6, 23)
> >  #define FEC_RESET_B	IMX_GPIO_NR(4, 12)
> >  
> > +#define FEC_EN		IMX_GPIO_NR(6, 23)
> > +#define FEC_RESET_B	IMX_GPIO_NR(4, 12)
> > +
> I think this is a left-over of a rebase.  The #defines are already
> present and they alone don't justify saying "add fec support".
Yes, Sorry for that. Please review the second patch.

Thanks
Richard
> 
> Best regards
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-K?nig            |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |