mxc: mx51: Add support for efikamx nettop
Subsystems (3)
v2 cover mxc: mx51: Add support for efikamx nettop
The following patches add basic support for the Genesi EfikaMX nettop[1]. Serial port, USB OTG and Ethernet works.
The new machine name has been agreed with Russell[2].
Kernel tested on babbage 3.0 and efikamx boards.
Patches apply to the imx git tree.
Regards,
Amit
[1] http://www.genesi-usa.com/
[2] http://www.spinics.net/lists/arm-kernel/msg98960.html
Amit Kucheria (2):
mx51: Move OTG initialisation for all boards to a single file
mx51: add support for genesi efikamx nettop
arch/arm/mach-mx5/Kconfig | 8 +++ arch/arm/mach-mx5/Makefile | 3 +- arch/arm/mach-mx5/board-cpuimx51.c | 30 +--------- arch/arm/mach-mx5/board-mx51_babbage.c | 30 +--------- arch/arm/mach-mx5/board-mx51_efikamx.c | 95 ++++++++++++++++++++++++++++++++ arch/arm/mach-mx5/usb.c | 42 ++++++++++++++ arch/arm/mach-mx5/usb.h | 1 + 7 files changed, 154 insertions(+), 55 deletions(-) create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c create mode 100644 arch/arm/mach-mx5/usb.c create mode 100644 arch/arm/mach-mx5/usb.h
PATCH v2 1/2 mx51: Move OTG initialisation for all boards to a single file
The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.
Fix the pll divider name while at it: MX51_USB_PLL_DIV_24_MHZ corresponds to 0x1, not MX51_USB_PLL_DIV_19_2_MHZ
--- arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 30 ++-------------------- arch/arm/mach-mx5/board-mx51_babbage.c | 30 ++-------------------- arch/arm/mach-mx5/usb.c | 42 ++++++++++++++++++++++++++++++++ arch/arm/mach-mx5/usb.h | 1 + 5 files changed, 50 insertions(+), 55 deletions(-) create mode 100644 arch/arm/mach-mx5/usb.c create mode 100644 arch/arm/mach-mx5/usb.h
arch/arm/mach-mx5/Makefile +1 -1
@@ -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 +3 -27
@@ -39,6 +39,7 @@#include "devices-imx51.h" #include "devices.h" +#include "usb.h" #define CPUIMX51_USBH1_STP (0*32 + 27)#define CPUIMX51_QUARTA_GPIO (2*32 + 28)
@@ -56,10 +57,6 @@#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 - #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) static struct plat_serial8250_port serial_platform_data[] = { {
@@ -162,27 +159,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;
@@ -200,7 +176,7 @@ static int initialize_usbh1_port(struct platform_device *pdev) }static struct mxc_usbh_platform_data dr_utmi_config = { - .init = initialize_otg_port, + .init = mx51_initialize_otg_port, .portsc =MXC_EHCI_UTMI_16BIT , .flags =MXC_EHCI_INTERNAL_PHY , };
@@ -262,7 +238,7 @@ static void __init eukrea_cpuimx51_init(void)if (otg_mode_host)mxc_register_device (&mxc_usbdr_host_device, &dr_utmi_config);else { -initialize_otg_port (NULL ); +mx51_initialize_otg_port (NULL );mxc_register_device (&mxc_usbdr_udc_device, &usb_pdata); }mxc_register_device (&mxc_usbh1_device, &usbh1_config);
arch/arm/mach-mx5/board-mx51_babbage.c +3 -27
@@ -32,6 +32,7 @@#include "devices-imx51.h" #include "devices.h" +#include "usb.h" #define BABBAGE_USB_HUB_RESET (0*32 + 7)/* GPIO_1_7 */ #define BABBAGE_USBH1_STP (0*32 + 27)/* GPIO_1_27 */
@@ -42,10 +43,6 @@#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 -static struct platform_device *devices[]__initdata = { &mxc_fec_device, };
@@ -210,27 +207,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;
@@ -248,7 +224,7 @@ static int initialize_usbh1_port(struct platform_device *pdev) }static struct mxc_usbh_platform_data dr_utmi_config = { - .init = initialize_otg_port, + .init = mx51_initialize_otg_port, .portsc =MXC_EHCI_UTMI_16BIT , .flags =MXC_EHCI_INTERNAL_PHY , };
@@ -299,7 +275,7 @@ static void __init mxc_board_init(void)if (otg_mode_host)mxc_register_device (&mxc_usbdr_host_device, &dr_utmi_config);else { -initialize_otg_port (NULL ); +mx51_initialize_otg_port (NULL );mxc_register_device (&mxc_usbdr_udc_device, &usb_pdata); }
arch/arm/mach-mx5/usb.c new file +42 -0
42 lines not on this page · raw message
arch/arm/mach-mx5/usb.h new file +1 -0
@@ -0,0 +1 @@ +extern int mx51_initialize_otg_port (struct platform_device *pdev);
Signature · 1 line
1.7.0.4
Sascha Hauer
maintainerPATCH v2 1/2 mx51: Move OTG initialisation for all boards to a single file
Quoted 206 lines · Amit Kucheria
The OTG initialisation is the same for all MX51 boards currently known. Move to a common file.
Fix the pll divider name while at it:
MX51_USB_PLL_DIV_24_MHZcorresponds to0x1, notMX51_USB_PLL_DIV_19_2_MHZSigned-off-by Amit Kucheria <[email protected]>--- arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 30 ++-------------------- arch/arm/mach-mx5/board-mx51_babbage.c | 30 ++-------------------- arch/arm/mach-mx5/usb.c | 42 ++++++++++++++++++++++++++++++++ arch/arm/mach-mx5/usb.h | 1 + 5 files changed, 50 insertions(+), 55 deletions(-) create mode 100644 arch/arm/mach-mx5/usb.c create mode 100644 arch/arm/mach-mx5/usb.harch/arm/mach-mx5/Makefile +1
-1@@ -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.oarch/arm/mach-mx5/board-cpuimx51.c +3
-27@@ -39,6 +39,7 @@#include "devices-imx51.h" #include "devices.h" +#include "usb.h" #define CPUIMX51_USBH1_STP (0*32 + 27)#define CPUIMX51_QUARTA_GPIO (2*32 + 28)@@ -56,10 +57,6 @@#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 - #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) static struct plat_serial8250_port serial_platform_data[] = { {@@ -162,27 +159,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;@@ -200,7 +176,7 @@ static int initialize_usbh1_port(struct platform_device *pdev) }static struct mxc_usbh_platform_data dr_utmi_config = { - .init = initialize_otg_port, + .init = mx51_initialize_otg_port, .portsc =MXC_EHCI_UTMI_16BIT , .flags =MXC_EHCI_INTERNAL_PHY , };@@ -262,7 +238,7 @@ static void __init eukrea_cpuimx51_init(void)if (otg_mode_host)mxc_register_device (&mxc_usbdr_host_device, &dr_utmi_config);else { -initialize_otg_port (NULL ); +mx51_initialize_otg_port (NULL );mxc_register_device (&mxc_usbdr_udc_device, &usb_pdata); }mxc_register_device (&mxc_usbh1_device, &usbh1_config);arch/arm/mach-mx5/board-mx51_babbage.c +3
-27@@ -32,6 +32,7 @@#include "devices-imx51.h" #include "devices.h" +#include "usb.h" #define BABBAGE_USB_HUB_RESET (0*32 + 7)/* GPIO_1_7 */ #define BABBAGE_USBH1_STP (0*32 + 27)/* GPIO_1_27 */ @@ -42,10 +43,6 @@#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 -static struct platform_device *devices[]__initdata = { &mxc_fec_device, };@@ -210,27 +207,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;@@ -248,7 +224,7 @@ static int initialize_usbh1_port(struct platform_device *pdev) }static struct mxc_usbh_platform_data dr_utmi_config = { - .init = initialize_otg_port, + .init = mx51_initialize_otg_port, .portsc =MXC_EHCI_UTMI_16BIT , .flags =MXC_EHCI_INTERNAL_PHY , };@@ -299,7 +275,7 @@ static void __init mxc_board_init(void)if (otg_mode_host)mxc_register_device (&mxc_usbdr_host_device, &dr_utmi_config);else { -initialize_otg_port (NULL ); +mx51_initialize_otg_port (NULL );mxc_register_device (&mxc_usbdr_udc_device, &usb_pdata); }arch/arm/mach-mx5/usb.c new file +32
-0@@ -0,0 +1,42 @@ +/* +* Copyright (C) 2010 Linaro Limited +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#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 mx51_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 ); +if (!usb_base) { +dev_err (&pdev->dev,"OTG ioremap failed\n" ); +return -ENOMEM ; + } + usbother_base = usb_base +MX5_USBOTHER_REGS_OFFSET ;
arch/arm/mach-mx5/usb.c line 42
Quoted 10 lines
arch/arm/mach-mx5/usb.c new file +10
-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 ; + v |=MX51_USB_PLL_DIV_24_MHZ ; +__raw_writel (v, usbother_base +MXC_USB_PHY_CTR_FUNC2_OFFSET ); +iounmap (usb_base); + +return 0 ; +}
Hm, can't we have a function which gets a pointer to a struct containing all relevant register settings like described in my other mail this day? We could even start doing so by only changing the i.MX51 code.
BTW this function only works because the i.MX51 clock layer forgets to turn of unused clocks. I tried to turn off the clocks to get the CPU a bit cooler and this one place where it failed.
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 |
PATCH v2 2/2 mx51: add support for genesi efikamx nettop
In reply to Amit KucheriaGet serial port and OTG USB working for now. There is an ethernet device (asix) attached to OTG, so we should get ethernet too.
--- arch/arm/mach-mx5/Kconfig | 8 +++ arch/arm/mach-mx5/Makefile | 1 + arch/arm/mach-mx5/board-mx51_efikamx.c | 95 ++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/Kconfig +8 -0
@@ -18,6 +18,14 @@ config MACH_MX51_BABBAGE u-boot. This includes specific configurations for the board and its peripherals. +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. + + config MACH_MX51_3DS bool "Support MX51PDK (3DS)" select IMX_HAVE_PLATFORM_IMX_UART
arch/arm/mach-mx5/Makefile +1 -0
@@ -6,6 +6,7 @@ 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_EFIKAMX) += board-mx51_efikamx.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
arch/arm/mach-mx5/board-mx51_efikamx.c new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
1.7.0.4