Skip to contentSkip to conversation

mxc: mx51: Add support for efikamx nettop

PATCH Superseded Amit Kucheria 5 participants 17 messages Oct 7, 2010 – Oct 11, 2010

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover mxc: mx51: Add support for efikamx nettop

The following patches add basic support for the Genesi EfikaMX nettop[1]. Serial port and OTG is enabled for now. Ethernet hangs off of OTG.

The new machine name has been agreed with Russell[2].

Regards,
Amit

[1] http://www.genesi-usa.com/
[2] http://www.spinics.net/lists/arm-kernel/msg98960.html

Amit Kucheria (3):
mx51: add support for genesi efikamx nettop
mx51: efikamx: add otg support
mx51: Move OTG initialisation for all boards to a single file

 arch/arm/mach-mx5/Kconfig              |    7 ++
 arch/arm/mach-mx5/Makefile             |    3 +-
 arch/arm/mach-mx5/board-cpuimx51.c     |   25 +--------
 arch/arm/mach-mx5/board-mx51_babbage.c |   25 +--------
 arch/arm/mach-mx5/board-mx51_efikamx.c |  100 ++++++++++++++++++++++++++++++++
 arch/arm/mach-mx5/usb.c                |   40 +++++++++++++
 6 files changed, 151 insertions(+), 49 deletions(-)
 create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c
 create mode 100644 arch/arm/mach-mx5/usb.c
#1 lore raw

PATCH 1/3 mx51: add support for genesi efikamx nettop

Get serial port working for now

---
 arch/arm/mach-mx5/Kconfig              |    7 +++
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_efikamx.c |   91 ++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/Kconfig +7 -0
index 3a4c3b3..fad31cc 100644
@@ -49,4 +49,11 @@ config MACH_EUKREA_MBIMX51_BASEBOARD
 
 endchoice
 
+config MACH_MX51_EFIKAMX
+	bool "Support MX51 Genesi Efika MX nettop"
+	select IMX_HAVE_PLATFORM_IMX_UART
+	help
+	  Include support for Genesi Efika MX nettop. This includes specific
+	  configurations for the board and its peripherals.
+
 endif
arch/arm/mach-mx5/Makefile +1 -0
index 86c66e7..d1aac9c 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
 obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+obj-$(CONFIG_MACH_MX51_EFIKAMX) += board-mx51_efikamx.o
arch/arm/mach-mx5/board-mx51_efikamx.c new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/3 mx51: add support for genesi efikamx nettop

Quoted 42 lines · Amit Kucheria

Get serial port working for now

---
 arch/arm/mach-mx5/Kconfig              |    7 +++
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_efikamx.c |   91 ++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/Kconfig +7 -0
index 3a4c3b3..fad31cc 100644
@@ -49,4 +49,11 @@ config MACH_EUKREA_MBIMX51_BASEBOARD
 
 endchoice
 
+config MACH_MX51_EFIKAMX
+	bool "Support MX51 Genesi Efika MX nettop"
+	select IMX_HAVE_PLATFORM_IMX_UART
+	help
+	  Include support for Genesi Efika MX nettop. This includes specific
+	  configurations for the board and its peripherals.
+
 endif
arch/arm/mach-mx5/Makefile +1 -0
index 86c66e7..d1aac9c 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
 obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+obj-$(CONFIG_MACH_MX51_EFIKAMX) += board-mx51_efikamx.o
arch/arm/mach-mx5/board-mx51_efikamx.c new file +1 -0
new file mode 100644
index 0000000..4c921fc
@@ -0,0 +1,91 @@
+/*

arch/arm/mach-mx5/board-mx51_efikamx.c line 11

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +10 -0
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * based on code from the following
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2010 Pegatron Corporation. All Rights Reserved.
+ * Copyright 2009-2010 Genesi USA, Inc. All Rights Reserved.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:

IMHO it's better to put the "Version 2 or later" stuff in the first sentence. Otherwise it's not entirely clear that GPLv1 should not be allowed. That is what is meant here, isn't it?

Quoted 29 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +29 -0
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/fsl_devices.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-mx51.h>
+#include <mach/i2c.h>
+#include <mach/mxc_ehci.h>
+
+#include <asm/irq.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include "devices-imx51.h"
+#include "devices.h"
+
+static struct pad_desc mx51efikamx_pads[] = {

arch/arm/mach-mx5/board-mx51_efikamx.c line 50

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +10 -0
+	/* UART1 */
+	MX51_PAD_UART1_RXD__UART1_RXD,
+	MX51_PAD_UART1_TXD__UART1_TXD,
+	MX51_PAD_UART1_RTS__UART1_RTS,
+	MX51_PAD_UART1_CTS__UART1_CTS,
+};
+
+/* Serial ports */
+#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
+static const struct imxuart_platform_data uart_pdata = {

__initconst please

Quoted 6 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +6 -0
+	.flags = IMXUART_HAVE_RTSCTS,
+};
+
+static inline void mxc_init_imx_uart(void)
+{
+	imx51_add_imx_uart(0, &uart_pdata);

arch/arm/mach-mx5/board-mx51_efikamx.c line 66

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +10 -0
+	imx51_add_imx_uart(1, &uart_pdata);
+	imx51_add_imx_uart(2, &uart_pdata);
+}
+#else /* !SERIAL_IMX */
+static inline void mxc_init_imx_uart(void)
+{
+}
+#endif /* SERIAL_IMX */
+
+static void __init mxc_board_init(void)

There are currently 13 functions with this name. While it is no problem for the toolchain as all of them are static, it's bad for people searching for it's definition and having to figure out which is the right one. I admit it's not hard, but still I'd prefer if you'd name it (say) mx51_efikamx_board_init.

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +10 -0
+{
+	mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
+					ARRAY_SIZE(mx51efikamx_pads));
+	mxc_init_imx_uart();
+}
+
+static void __init mx51_efikamx_timer_init(void)
+{
+	mx51_clocks_init(32768, 24000000, 22579200, 24576000);
+}

arch/arm/mach-mx5/board-mx51_efikamx.c line 86

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +10 -0
+
+static struct sys_timer mxc_timer = {
+	.init	= mx51_efikamx_timer_init,
+};
+
+MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
+	/* Maintainer: Amit Kucheria <[email protected]> */
+	.phys_io = MX51_AIPS1_BASE_ADDR,
+	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
+	.boot_params = MX51_PHYS_OFFSET + 0x100,

Do you need this? AFAIK it is only needed if the machine comes with an old (or broken) bootloader that fails to pass the address to the atag list in r2.

arch/arm/mach-mx5/board-mx51_efikamx.c line 89

Quoted 3 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +3 -0
+	.map_io = mx51_map_io,
+	.init_irq = mx51_init_irq,
+	.init_machine =  mxc_board_init,

s/ / /

arch/arm/mach-mx5/board-mx51_efikamx.c line 91

Quoted 2 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +2 -0
+	.timer = &mxc_timer,
+MACHINE_END

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/3 mx51: add support for genesi efikamx nettop

Quoted 48 lines · Uwe Kleine-K?nig
Quoted 47 lines · Amit Kucheria

Get serial port working for now

---
 arch/arm/mach-mx5/Kconfig              |    7 +++
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_efikamx.c |   91 ++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/Kconfig +7 -0
index 3a4c3b3..fad31cc 100644
@@ -49,4 +49,11 @@ config MACH_EUKREA_MBIMX51_BASEBOARD
 
 endchoice
 
+config MACH_MX51_EFIKAMX
+	bool "Support MX51 Genesi Efika MX nettop"
+	select IMX_HAVE_PLATFORM_IMX_UART
+	help
+	  Include support for Genesi Efika MX nettop. This includes specific
+	  configurations for the board and its peripherals.
+
 endif
arch/arm/mach-mx5/Makefile +1 -0
index 86c66e7..d1aac9c 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
 obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+obj-$(CONFIG_MACH_MX51_EFIKAMX) += board-mx51_efikamx.o
arch/arm/mach-mx5/board-mx51_efikamx.c new file +6 -0
new file mode 100644
index 0000000..4c921fc
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * based on code from the following
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2010 Pegatron Corporation. All Rights Reserved.
Quoted 8 lines

arch/arm/mach-mx5/board-mx51_efikamx.c line 11

Quoted 5 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +5 -0
+ * Copyright 2009-2010 Genesi USA, Inc. All Rights Reserved.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:

IMHO it's better to put the "Version 2 or later" stuff in the first sentence. Otherwise it's not entirely clear that GPLv1 should not be allowed. That is what is meant here, isn't it?

OK

Quoted 32 lines
Quoted 32 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +32 -0
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/fsl_devices.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-mx51.h>
+#include <mach/i2c.h>
+#include <mach/mxc_ehci.h>
+
+#include <asm/irq.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include "devices-imx51.h"
+#include "devices.h"
+
+static struct pad_desc mx51efikamx_pads[] = {
+	/* UART1 */
+	MX51_PAD_UART1_RXD__UART1_RXD,
+	MX51_PAD_UART1_TXD__UART1_TXD,
Quoted 8 lines

arch/arm/mach-mx5/board-mx51_efikamx.c line 50

Quoted 7 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +7 -0
+	MX51_PAD_UART1_RTS__UART1_RTS,
+	MX51_PAD_UART1_CTS__UART1_CTS,
+};
+
+/* Serial ports */
+#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
+static const struct imxuart_platform_data uart_pdata = {

__initconst please

OK.

Quoted 13 lines
Quoted 13 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +13 -0
+	.flags = IMXUART_HAVE_RTSCTS,
+};
+
+static inline void mxc_init_imx_uart(void)
+{
+	imx51_add_imx_uart(0, &uart_pdata);
+	imx51_add_imx_uart(1, &uart_pdata);
+	imx51_add_imx_uart(2, &uart_pdata);
+}
+#else /* !SERIAL_IMX */
+static inline void mxc_init_imx_uart(void)
+{
+}
Quoted 8 lines

arch/arm/mach-mx5/board-mx51_efikamx.c line 66

Quoted 3 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +3 -0
+#endif /* SERIAL_IMX */
+
+static void __init mxc_board_init(void)

There are currently 13 functions with this name. While it is no problem for the toolchain as all of them are static, it's bad for people searching for it's definition and having to figure out which is the right one. I admit it's not hard, but still I'd prefer if you'd name it (say) mx51_efikamx_board_init.

OK.

Quoted 15 lines
Quoted 15 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +15 -0
+{
+	mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
+					ARRAY_SIZE(mx51efikamx_pads));
+	mxc_init_imx_uart();
+}
+
+static void __init mx51_efikamx_timer_init(void)
+{
+	mx51_clocks_init(32768, 24000000, 22579200, 24576000);
+}
+
+static struct sys_timer mxc_timer = {
+	.init	= mx51_efikamx_timer_init,
+};
+
Quoted 8 lines

arch/arm/mach-mx5/board-mx51_efikamx.c line 86

Quoted 5 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +5 -0
+MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
+	/* Maintainer: Amit Kucheria <[email protected]> */
+	.phys_io = MX51_AIPS1_BASE_ADDR,
+	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
+	.boot_params = MX51_PHYS_OFFSET + 0x100,

Do you need this? AFAIK it is only needed if the machine comes with an old (or broken) bootloader that fails to pass the address to the atag list in r2.

TBH, it is boilerplate code that I cut 'n' pasted. Removed now.

Quoted 14 lines

arch/arm/mach-mx5/board-mx51_efikamx.c line 89

Quoted 3 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +3 -0
+	.map_io = mx51_map_io,
+	.init_irq = mx51_init_irq,
+	.init_machine =  mxc_board_init,

s/ / /

arch/arm/mach-mx5/board-mx51_efikamx.c line 91

Quoted 2 lines
arch/arm/mach-mx5/board-mx51_efikamx.c new file +2 -0
+	.timer = &mxc_timer,
+MACHINE_END

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#4 lore raw

PATCH 2/3 mx51: efikamx: add otg support

In reply to Amit Kucheria

Ethernet hangs off OTG

---
 arch/arm/mach-mx5/board-mx51_efikamx.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/board-mx51_efikamx.c +30 -0
index 4c921fc..b00502a 100644
@@ -37,6 +37,8 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
 	MX51_PAD_UART1_RXD__UART1_RXD,
@@ -63,10 +65,38 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
+/* This function is board specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+static int initialize_otg_port(struct platform_device *pdev)
+{
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
+
+	/* Set the PHY clock to 19.2MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
+	v |= MX51_USB_PLL_DIV_24_MHZ;
+	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	iounmap(usb_base);
+	return 0;
+}
+
+static struct mxc_usbh_platform_data dr_utmi_config = {
+	.init   = initialize_otg_port,
+	.portsc = MXC_EHCI_UTMI_16BIT,
+	.flags  = MXC_EHCI_INTERNAL_PHY,
+};
+
 static void __init mxc_board_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
 					ARRAY_SIZE(mx51efikamx_pads));
+	mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
 	mxc_init_imx_uart();
 }
 
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 2/3 mx51: efikamx: add otg support

Hi Amit,

Quoted 21 lines · Amit Kucheria

Ethernet hangs off OTG

---
 arch/arm/mach-mx5/board-mx51_efikamx.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/board-mx51_efikamx.c +2 -0
index 4c921fc..b00502a 100644
@@ -37,6 +37,8 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
 	MX51_PAD_UART1_RXD__UART1_RXD,

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 70

Quoted 6 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +3 -0
@@ -63,10 +65,38 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
+/* This function is board specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.

But maybe a function that removes the boilerplate. Such that is just becomes (say):

	imxXX_initialize_otg_port(MX51_USB_PLL_DIV_24_MHZ, maybe, some, more, parameters);

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 77

Quoted 7 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +7 -0
+ */
+static int initialize_otg_port(struct platform_device *pdev)
+{
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);

ioremap can fail.

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 78

Quoted 1 line
arch/arm/mach-mx5/board-mx51_efikamx.c +1 -0
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);

do you need this cast?

Quoted 14 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +14 -0
+
+	/* Set the PHY clock to 19.2MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
+	v |= MX51_USB_PLL_DIV_24_MHZ;
+	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	iounmap(usb_base);
+	return 0;
+}
+
+static struct mxc_usbh_platform_data dr_utmi_config = {
+	.init   = initialize_otg_port,
+	.portsc = MXC_EHCI_UTMI_16BIT,
+	.flags  = MXC_EHCI_INTERNAL_PHY,

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 102

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +3 -0
+};
+
 static void __init mxc_board_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
 					ARRAY_SIZE(mx51efikamx_pads));
+	mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
 	mxc_init_imx_uart();
 }
 

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#6 lore raw

PATCH 2/3 mx51: efikamx: add otg support

In reply to Amit Kucheria

Hello.

Quoted 1 line · Amit Kucheria

Ethernet hangs off OTG

Hm, what?

Quoted 1 line

[...]

Quoted 16 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +2 -0
index 4c921fc..b00502a 100644
@@ -37,6 +37,8 @@
  #include "devices-imx51.h"
  #include "devices.h"
 
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
  static struct pad_desc mx51efikamx_pads[] = {
  	/* UART1 */
  	MX51_PAD_UART1_RXD__UART1_RXD,
@@ -63,10 +65,38 @@ static inline void mxc_init_imx_uart(void)
  }
  #endif /* SERIAL_IMX */

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 76

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +9 -0
 
+/* This function is board specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+static int initialize_otg_port(struct platform_device *pdev)
+{
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;

Insert an empty line here please.

arch/arm/mach-mx5/board-mx51_efikamx.c static inline void mxc_init_imx_uart(void) · line 78

Quoted 2 lines
arch/arm/mach-mx5/board-mx51_efikamx.c +2 -0
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);

WBR, Sergei

#7 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

In reply to Amit Kucheria

The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.

---
 arch/arm/mach-mx5/Makefile             |    2 +-
 arch/arm/mach-mx5/board-cpuimx51.c     |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_babbage.c |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_efikamx.c |   23 +-----------------
 arch/arm/mach-mx5/usb.c                |   40 ++++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 71 deletions(-)
 create mode 100644 arch/arm/mach-mx5/usb.c
arch/arm/mach-mx5/Makefile +1 -1
index d1aac9c..1daba15 100644
@@ -3,7 +3,7 @@
 #
 
 # Object file lists.
-obj-y   := cpu.o mm.o clock-mx51.o devices.o
+obj-y   := cpu.o mm.o clock-mx51.o devices.o usb.o
 
 obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
arch/arm/mach-mx5/board-cpuimx51.c +1 -24
index a6c09c7..c54d26e 100644
@@ -56,9 +56,7 @@
 #define MX51_USB_CTRL_1_OFFSET		0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN	(1 << 25)
 
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ		0x02
+extern int initialize_otg_port(struct platform_device *pdev);
 
 #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
 static struct plat_serial8250_port serial_platform_data[] = {
@@ -162,27 +160,6 @@ static struct i2c_board_info eukrea_cpuimx51_i2c_devices[] = {
 	},
 };
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_babbage.c +1 -24
index 7c0b661..cdbbec8 100644
@@ -42,9 +42,7 @@
 #define MX51_USB_CTRL_1_OFFSET			0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN		(1 << 25)
 
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ	0x02
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct platform_device *devices[] __initdata = {
 	&mxc_fec_device,
@@ -210,27 +208,6 @@ static inline void babbage_fec_reset(void)
 	gpio_set_value(BABBAGE_FEC_PHY_RESET, 1);
 }
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_efikamx.c +1 -22
index b00502a..93734ae 100644
@@ -37,7 +37,7 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
-#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
@@ -65,27 +65,6 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
-/* This function is board specific as the bit mask for the plldiv will also
- * be different for other Freescale SoCs, thus a common bitmask is not
- * possible and cannot get place in /plat-mxc/ehci.c.
- */
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_24_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static struct mxc_usbh_platform_data dr_utmi_config = {
 	.init   = initialize_otg_port,
 	.portsc = MXC_EHCI_UTMI_16BIT,
arch/arm/mach-mx5/usb.c new file +40 -0
new file mode 100644
index 0000000..277f957
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later@the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <mach/hardware.h>
+#include <mach/mxc_ehci.h>
+
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
+/* This function is SoC specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+int initialize_otg_port(struct platform_device *pdev)
+{
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;
+
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
+
+	/* Set the PHY clock to 24 MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
+	v |= MX51_USB_PLL_DIV_24_MHZ;
+	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	iounmap(usb_base);
+	return 0;
+}
Signature · 1 line
1.7.0.4
#8 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Quoted 31 lines · Amit Kucheria

The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.

---
 arch/arm/mach-mx5/Makefile             |    2 +-
 arch/arm/mach-mx5/board-cpuimx51.c     |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_babbage.c |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_efikamx.c |   23 +-----------------
 arch/arm/mach-mx5/usb.c                |   40 ++++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 71 deletions(-)
 create mode 100644 arch/arm/mach-mx5/usb.c
arch/arm/mach-mx5/Makefile +1 -1
index d1aac9c..1daba15 100644
@@ -3,7 +3,7 @@
 #
 
 # Object file lists.
-obj-y   := cpu.o mm.o clock-mx51.o devices.o
+obj-y   := cpu.o mm.o clock-mx51.o devices.o usb.o
 
 obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
arch/arm/mach-mx5/board-cpuimx51.c +0 -0
index a6c09c7..c54d26e 100644

arch/arm/mach-mx5/board-cpuimx51.c line 59

Quoted 7 lines
arch/arm/mach-mx5/board-cpuimx51.c +1 -3
@@ -56,9 +56,7 @@
 #define MX51_USB_CTRL_1_OFFSET		0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN	(1 << 25)
 
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ		0x02
+extern int initialize_otg_port(struct platform_device *pdev);

I suggest to put this in a header file.

Quoted 146 lines
arch/arm/mach-mx5/board-cpuimx51.c +0 -21
 #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
 static struct plat_serial8250_port serial_platform_data[] = {
@@ -162,27 +160,6 @@ static struct i2c_board_info eukrea_cpuimx51_i2c_devices[] = {
 	},
 };
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_babbage.c +1 -24
index 7c0b661..cdbbec8 100644
@@ -42,9 +42,7 @@
 #define MX51_USB_CTRL_1_OFFSET			0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN		(1 << 25)
 
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ	0x02
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct platform_device *devices[] __initdata = {
 	&mxc_fec_device,
@@ -210,27 +208,6 @@ static inline void babbage_fec_reset(void)
 	gpio_set_value(BABBAGE_FEC_PHY_RESET, 1);
 }
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_efikamx.c +1 -22
index b00502a..93734ae 100644
@@ -37,7 +37,7 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
-#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
@@ -65,27 +65,6 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
-/* This function is board specific as the bit mask for the plldiv will also
- * be different for other Freescale SoCs, thus a common bitmask is not
- * possible and cannot get place in /plat-mxc/ehci.c.
- */
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_24_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static struct mxc_usbh_platform_data dr_utmi_config = {
 	.init   = initialize_otg_port,
 	.portsc = MXC_EHCI_UTMI_16BIT,
arch/arm/mach-mx5/usb.c new file +25 -0
new file mode 100644
index 0000000..277f957
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <mach/hardware.h>
+#include <mach/mxc_ehci.h>
+
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
+/* This function is SoC specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+int initialize_otg_port(struct platform_device *pdev)
+{

arch/arm/mach-mx5/usb.c line 35

Quoted 10 lines
arch/arm/mach-mx5/usb.c new file +10 -0
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;
+
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
+
+	/* Set the PHY clock to 24 MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;

I wonder why a field in a register called MXC_USB_PHY_CTR_FUNC2 is named MX5_USB_UTMI_PHYCTRL1_PLLDIV. Usually the register name is a prefix for the field name?!

arch/arm/mach-mx5/usb.c line 36

Quoted 1 line
arch/arm/mach-mx5/usb.c new file +1 -0
+	v |= MX51_USB_PLL_DIV_24_MHZ;

hmm, babbage used

	> -     v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
	> -     v |= MX51_USB_PLL_DIV_19_2_MHZ;

?

Maybe you want to reorder your patches such that your patch 2 comes after this one, as currently this patch removes ~80% of the code patch 2 introduces.

Otherwise the same comments apply here that I made on patch 2.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#9 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Quoted 35 lines · Uwe Kleine-K?nig
Quoted 34 lines · Amit Kucheria

The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.

---
 arch/arm/mach-mx5/Makefile             |    2 +-
 arch/arm/mach-mx5/board-cpuimx51.c     |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_babbage.c |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_efikamx.c |   23 +-----------------
 arch/arm/mach-mx5/usb.c                |   40 ++++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 71 deletions(-)
 create mode 100644 arch/arm/mach-mx5/usb.c
arch/arm/mach-mx5/Makefile +1 -1
index d1aac9c..1daba15 100644
@@ -3,7 +3,7 @@
 #
 
 # Object file lists.
-obj-y   := cpu.o mm.o clock-mx51.o devices.o
+obj-y   := cpu.o mm.o clock-mx51.o devices.o usb.o
 
 obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
arch/arm/mach-mx5/board-cpuimx51.c +0 -0
index a6c09c7..c54d26e 100644
@@ -56,9 +56,7 @@
 #define MX51_USB_CTRL_1_OFFSET		0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN	(1 << 25)
 
Quoted 5 lines

arch/arm/mach-mx5/board-cpuimx51.c line 59

Quoted 4 lines
arch/arm/mach-mx5/board-cpuimx51.c +1 -3
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ		0x02
+extern int initialize_otg_port(struct platform_device *pdev);

I suggest to put this in a header file.

OK.

Quoted 151 lines
Quoted 151 lines
arch/arm/mach-mx5/board-cpuimx51.c +0 -21
 #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
 static struct plat_serial8250_port serial_platform_data[] = {
@@ -162,27 +160,6 @@ static struct i2c_board_info eukrea_cpuimx51_i2c_devices[] = {
 	},
 };
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_babbage.c +1 -24
index 7c0b661..cdbbec8 100644
@@ -42,9 +42,7 @@
 #define MX51_USB_CTRL_1_OFFSET			0x10
 #define MX51_USB_CTRL_UH1_EXT_CLK_EN		(1 << 25)
 
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ	0x02
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct platform_device *devices[] __initdata = {
 	&mxc_fec_device,
@@ -210,27 +208,6 @@ static inline void babbage_fec_reset(void)
 	gpio_set_value(BABBAGE_FEC_PHY_RESET, 1);
 }
 
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static int initialize_usbh1_port(struct platform_device *pdev)
 {
 	u32 v;
arch/arm/mach-mx5/board-mx51_efikamx.c +1 -22
index b00502a..93734ae 100644
@@ -37,7 +37,7 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
-#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
@@ -65,27 +65,6 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
-/* This function is board specific as the bit mask for the plldiv will also
- * be different for other Freescale SoCs, thus a common bitmask is not
- * possible and cannot get place in /plat-mxc/ehci.c.
- */
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_24_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static struct mxc_usbh_platform_data dr_utmi_config = {
 	.init   = initialize_otg_port,
 	.portsc = MXC_EHCI_UTMI_16BIT,
arch/arm/mach-mx5/usb.c new file +30 -0
new file mode 100644
index 0000000..277f957
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <mach/hardware.h>
+#include <mach/mxc_ehci.h>
+
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
+/* This function is SoC specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+int initialize_otg_port(struct platform_device *pdev)
+{
+	u32 v;
+	void __iomem *usb_base;
+	void __iomem *usbother_base;
+
+	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
Quoted 8 lines

arch/arm/mach-mx5/usb.c line 35

Quoted 5 lines
arch/arm/mach-mx5/usb.c new file +5 -0
+	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
+
+	/* Set the PHY clock to 24 MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;

I wonder why a field in a register called MXC_USB_PHY_CTR_FUNC2 is named MX5_USB_UTMI_PHYCTRL1_PLLDIV. Usually the register name is a prefix for the field name?!

I have a patch renaming the various bit-fields and registers to conform to the reference manual. I'll post it soon.

Quoted 7 lines

arch/arm/mach-mx5/usb.c line 36

Quoted 1 line
arch/arm/mach-mx5/usb.c new file +1 -0
+	v |= MX51_USB_PLL_DIV_24_MHZ;

hmm, babbage used

	> -     v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
	> -     v |= MX51_USB_PLL_DIV_19_2_MHZ;

?

Good catch :)

But if you look at the reference manual, table 60-6, 19.2 MHz would use a value of 0x0, but the actual code uses a value of 0x1 that corresponds to 24MHz. 19.2MHz (0x0) doesn't even work for me.

Quoted 3 lines

Maybe you want to reorder your patches such that your patch 2 comes after this one, as currently this patch removes ~80% of the code patch 2 introduces.

I did it to make bisection easier. I didn't want to add a new board feature and do consolidation in a single patch.

Quoted 1 line

Otherwise the same comments apply here that I made on patch 2.

Thanks for the review.

Will send out updates.

#10 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Hi Amit,

Quoted 11 lines · Amit Kucheria
Quoted 7 lines · Uwe Kleine-K?nig

arch/arm/mach-mx5/usb.c line 35

Quoted 3 lines · Amit Kucheria
arch/arm/mach-mx5/usb.c new file +3 -0
+	/* Set the PHY clock to 24 MHz */
+	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;

I wonder why a field in a register called MXC_USB_PHY_CTR_FUNC2 is named MX5_USB_UTMI_PHYCTRL1_PLLDIV. Usually the register name is a prefix for the field name?!

I have a patch renaming the various bit-fields and registers to conform to the reference manual. I'll post it soon.

great

Quoted 6 lines
Quoted 6 lines

arch/arm/mach-mx5/usb.c line 36

Quoted 1 line
arch/arm/mach-mx5/usb.c new file +1 -0
+	v |= MX51_USB_PLL_DIV_24_MHZ;

hmm, babbage used

	> -     v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
	> -     v |= MX51_USB_PLL_DIV_19_2_MHZ;
Quoted 7 lines
Quoted 1 line

?

Good catch :)

But if you look at the reference manual, table 60-6, 19.2 MHz would use a value of 0x0, but the actual code uses a value of 0x1 that corresponds to 24MHz. 19.2MHz (0x0) doesn't even work for me.

Then maybe note it in the commit log?!

Quoted 6 lines
Quoted 3 lines

Maybe you want to reorder your patches such that your patch 2 comes after this one, as currently this patch removes ~80% of the code patch 2 introduces.

I did it to make bisection easier. I didn't want to add a new board feature and do consolidation in a single patch.

Yep, that is ok. Currently you have:

1/3: add board support for iforgotthename
2/3: add usb support for iforgotthename
3/3: consolidate usb support

I suggested to do 1, 3, 2 instead. Thinking again 3, 1+2 might even be better.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
maintainer
#11 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

In reply to Amit Kucheria

Added Daniel to Cc as he might say something here aswell.

Quoted 20 lines · Amit Kucheria

The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.

---
 arch/arm/mach-mx5/Makefile             |    2 +-
 arch/arm/mach-mx5/board-cpuimx51.c     |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_babbage.c |   25 +-------------------
 arch/arm/mach-mx5/board-mx51_efikamx.c |   23 +-----------------
 arch/arm/mach-mx5/usb.c                |   40 ++++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 71 deletions(-)
 create mode 100644 arch/arm/mach-mx5/usb.c
arch/arm/mach-mx5/Makefile +0 -0
index d1aac9c..1daba15 100644
@@ -3,7 +3,7 @@
 #
 

[snip]

Quoted 64 lines

{

arch/arm/mach-mx5/Makefile +0 -0
 	u32 v;
arch/arm/mach-mx5/board-mx51_efikamx.c +1 -22
index b00502a..93734ae 100644
@@ -37,7 +37,7 @@
 #include "devices-imx51.h"
 #include "devices.h"
 
-#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+extern int initialize_otg_port(struct platform_device *pdev);
 
 static struct pad_desc mx51efikamx_pads[] = {
 	/* UART1 */
@@ -65,27 +65,6 @@ static inline void mxc_init_imx_uart(void)
 }
 #endif /* SERIAL_IMX */
 
-/* This function is board specific as the bit mask for the plldiv will also
- * be different for other Freescale SoCs, thus a common bitmask is not
- * possible and cannot get place in /plat-mxc/ehci.c.
- */
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
-	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_24_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-	return 0;
-}
-
 static struct mxc_usbh_platform_data dr_utmi_config = {
 	.init   = initialize_otg_port,
 	.portsc = MXC_EHCI_UTMI_16BIT,
arch/arm/mach-mx5/usb.c new file +15 -0
new file mode 100644
index 0000000..277f957
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <mach/hardware.h>

arch/arm/mach-mx5/usb.c line 25

Quoted 10 lines
arch/arm/mach-mx5/usb.c new file +10 -0
+#include <mach/mxc_ehci.h>
+
+#define	MX51_USB_PLL_DIV_24_MHZ	0x01
+
+/* This function is SoC specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+int initialize_otg_port(struct platform_device *pdev)
+{

First of all please do not introduce global functions without the correct prefix, mx51_ in this case.

I have recently looked at the way the USB phy settings are handled on i.MX and it's coming to its limits. Currently the phy settings are coded into generic flags, passed to the usb driver which then calls mxc_initialize_usb_hw() which dispatches the different SoCs and translates the generic flags back into SoC specific ones. While this was doable until now it fails badly on i.MX51 as we see here.
The phy settings are totally static to a given board, so we could simply let the board call a mx51_init_usb_phy() which gets a pointer to a struct with all relevant register settings. And we could pass this function SoC specific register settings without having to encode them into generic flags and decode them again later.

Sascha

Signature · 4 lines
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 |
#12 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Hi Amit,

Quoted 2 lines

+?? void __iomem *usbother_base;
+??? usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);

Shouldn't you check whether ioremap failed?

Regards,

Fabio Estevam

#13 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

In reply to Sascha Hauer
Quoted 104 lines · Sascha Hauer

Added Daniel to Cc as he might say something here aswell.

Quoted 20 lines · Amit Kucheria

The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.

---

?arch/arm/mach-mx5/Makefile ? ? ? ? ? ? | ? ?2 +-
?arch/arm/mach-mx5/board-cpuimx51.c ? ? | ? 25 +-------------------
?arch/arm/mach-mx5/board-mx51_babbage.c | ? 25 +-------------------
?arch/arm/mach-mx5/board-mx51_efikamx.c | ? 23 +-----------------
?arch/arm/mach-mx5/usb.c ? ? ? ? ? ? ? ?| ? 40 ++++++++++++++++++++++++++++++++

?5 files changed, 44 insertions(+), 71 deletions(-) ?create mode 100644 arch/arm/mach-mx5/usb.c

arch/arm/mach-mx5/Makefile +0 -0
index d1aac9c..1daba15 100644
@@ -3,7 +3,7 @@

?#

[snip]

Quoted 64 lines

?{
? ? ? u32 v;

arch/arm/mach-mx5/board-mx51_efikamx.c +0 -0
index b00502a..93734ae 100644
@@ -37,7 +37,7 @@

?#include "devices-imx51.h"
?#include "devices.h"

arch/arm/mach-mx5/board-mx51_efikamx.c +1 -1
-#define ? ? ?MX51_USB_PLL_DIV_24_MHZ 0x01
+extern int initialize_otg_port(struct platform_device *pdev);

?static struct pad_desc mx51efikamx_pads[] = {
? ? ? /* UART1 */

arch/arm/mach-mx5/board-mx51_efikamx.c +0 -0
@@ -65,27 +65,6 @@ static inline void mxc_init_imx_uart(void)
 ?}

?#endif /* SERIAL_IMX */

arch/arm/mach-mx5/board-mx51_efikamx.c +0 -21
-/* This function is board specific as the bit mask for the plldiv will also
- * be different for other Freescale SoCs, thus a common bitmask is not
- * possible and cannot get place in /plat-mxc/ehci.c.
- */
-static int initialize_otg_port(struct platform_device *pdev)
-{
- ? ? u32 v;
- ? ? void __iomem *usb_base;
- ? ? void __iomem *usbother_base;
- ? ? usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
- ? ? usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
-
- ? ? /* Set the PHY clock to 19.2MHz */
- ? ? v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
- ? ? v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
- ? ? v |= MX51_USB_PLL_DIV_24_MHZ;
- ? ? __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
- ? ? iounmap(usb_base);
- ? ? return 0;
-}
-

?static struct mxc_usbh_platform_data dr_utmi_config = { ? ? ? .init ? = initialize_otg_port,
? ? ? .portsc = MXC_EHCI_UTMI_16BIT,

arch/arm/mach-mx5/usb.c new file +15 -0
new file mode 100644
index 0000000..277f957
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Linaro Limited
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <mach/hardware.h>

arch/arm/mach-mx5/usb.c line 25

Quoted 10 lines
arch/arm/mach-mx5/usb.c new file +10 -0
+#include <mach/mxc_ehci.h>
+
+#define ? ? ?MX51_USB_PLL_DIV_24_MHZ 0x01
+
+/* This function is SoC specific as the bit mask for the plldiv will also
+ * be different for other Freescale SoCs, thus a common bitmask is not
+ * possible and cannot get place in /plat-mxc/ehci.c.
+ */
+int initialize_otg_port(struct platform_device *pdev)
+{

First of all please do not introduce global functions without the correct prefix, mx51_ in this case.

Quoted 11 lines

I have recently looked at the way the USB phy settings are handled on i.MX and it's coming to its limits. Currently the phy settings are coded into generic flags, passed to the usb driver which then calls mxc_initialize_usb_hw() which dispatches the different SoCs and translates the generic flags back into SoC specific ones. ?While this was doable until now it fails badly on i.MX51 as we see here.
The phy settings are totally static to a given board, so we could simply let the board call a mx51_init_usb_phy() which gets a pointer to a struct with all relevant register settings. And we could pass this function SoC specific register settings without having to encode them into generic flags and decode them again later.

OK, working on a patch for mx51 now. It it looks ok, I can convert the rest.

/Amit

#14 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

In reply to Sascha Hauer
Quoted 1 line · Sascha Hauer

Added Daniel to Cc as he might say something here aswell.

<snip>

Quoted 12 lines

I have recently looked at the way the USB phy settings are handled on i.MX and it's coming to its limits. Currently the phy settings are coded into generic flags, passed to the usb driver which then calls mxc_initialize_usb_hw() which dispatches the different SoCs and translates the generic flags back into SoC specific ones. ?While this was doable until now it fails badly on i.MX51 as we see here.
The phy settings are totally static to a given board, so we could simply let the board call a mx51_init_usb_phy() which gets a pointer to a struct with all relevant register settings. And we could pass this function SoC specific register settings without having to encode them into generic flags and decode them again later.

Quoted 1 line

Sascha

Sascha,

Do you think something like this will be better? It looks even more scattered to me, the usb configuration information is scattered across platform_data and phy_data.

Or did you want to get rid of platform_data->init too from the driver?

Regards,
Amit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-mxc-Stop-passing-usb-phy-configuration-to-the-ehci-d.patch
Type: text/x-patch
Size: 9144 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101011/0d8b79a1/attachment.bin>

maintainer
#15 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Hi Amit,

Quoted 17 lines · Amit Kucheria
Quoted 1 line · Sascha Hauer

Added Daniel to Cc as he might say something here aswell.

<snip>

Quoted 12 lines

I have recently looked at the way the USB phy settings are handled on i.MX and it's coming to its limits. Currently the phy settings are coded into generic flags, passed to the usb driver which then calls mxc_initialize_usb_hw() which dispatches the different SoCs and translates the generic flags back into SoC specific ones. ?While this was doable until now it fails badly on i.MX51 as we see here.
The phy settings are totally static to a given board, so we could simply let the board call a mx51_init_usb_phy() which gets a pointer to a struct with all relevant register settings. And we could pass this function SoC specific register settings without having to encode them into generic flags and decode them again later.

Quoted 7 lines
Quoted 1 line

Sascha

Sascha,

Do you think something like this will be better? It looks even more scattered to me, the usb configuration information is scattered across platform_data and phy_data.

My problem is not that it's scattered around platform_data and phy_data, but that it's not possible to add proper i.MX51 support without introducing a initialize_otg_port which wont' be flexible enough for future boards.

Quoted 2 lines

Or did you want to get rid of platform_data->init too from the driver?

No, I think we can't do this without breaking at least some boards. I found out that on some boards we have to configure the iomux pins and the rest of the USB hardware in a short time frame, otherwise we get ULPI errors.

Sascha

Signature · 4 lines
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 |
#16 lore raw

PATCH 3/3 mx51: Move OTG initialisation for all boards to a single file

Quoted 11 lines · Sascha Hauer
Quoted 4 lines

Do you think something like this will be better? It looks even more scattered to me, the usb configuration information is scattered across platform_data and phy_data.

My problem is not that it's scattered around platform_data and phy_data, but that it's not possible to add proper i.MX51 support without introducing a initialize_otg_port which wont' be flexible enough for future boards.

Quoted 1 line
Quoted 8 lines
Quoted 1 line

Or did you want to get rid of platform_data->init too from the driver?

No, I think we can't do this without breaking at least some boards. I found out that on some boards we have to configure the iomux pins and the rest of the USB hardware in a short time frame, otherwise we get ULPI errors.

Sascha

So are the original patches(v2) to consolidate initialize_otg_port() and introduce efikamx board support acceptable?

(I want to ensure I don't miss the next merge window, because Debian wants to use these machines as their build machines)