mx23/mxs pending patches
Subsystems (4)
v4 cover mx23/mxs pending patches
This patchset includes the pending patches we have in our tree. It fixes issues for mx23evk and mx23_olinuxino boards.
The DRAM control register change has been kept specific to mx23evk as it breaks mx23_olinuxino (as it than reads only 16MB)
Changes in v4:
- Rework soc_ehci_hcd_{enable,disable}_clock to mxs_ehci_hcd_clock (Fabio / Marek)
Changes in v3:
- Extend code comment to be more verbose (Marek)
- Improve commit log
- Move code to enable/disable clock to soc_ehci_hcd_{enable,disable}_clock
- Proper use mx23 clock registers
Changes in v2:
- Extend code comment to explicit say it needs to be there.
- Use MUX pin name - Requested by Marek
- Avoid wrong clock setting in MX23
- Add changes for allow use of the USB hub
- Remove extra newline
Otavio Salvador (10):
mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to
CONFIG_SPL_MXS_PSWITCH_WAIT
mx23: Document the tRAS lockout setting in memory initialization
mx23evk: Adjust DRAM control register to use full 128MB of RAM
led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
mxs: Fix iomux.h to not break build during assembly stage
mx23_olinuxino: Add support for status LED
usb: mxs: Adapt code for i.MX23 support
mx23evk: Enable USB support
mx23_olinuxino: Enable USB support
mx23_olinuxino: Add ethernet support
arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 4 ++ arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/include/asm/arch-mxs/iomux.h | 5 +++ board/freescale/mx23evk/spl_boot.c | 10 +++++ board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 ++++++ board/olimex/mx23_olinuxino/spl_boot.c | 8 ++++ common/cmd_led.c | 6 ++- drivers/usb/host/ehci-mxs.c | 58 +++++++++++++++---------- include/configs/mx23_olinuxino.h | 63 ++++++++++++++++++++++++++-- include/configs/mx23evk.h | 10 +++++ 11 files changed, 151 insertions(+), 30 deletions(-)
Signature · 1 line
1.8.1
PATCH v4 1/10 mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT
The power switch option is compatible with i.MX23 and i.MX28 so the configration option needs to reflect it. We choose 'CONFIG_SPL_MXS_PSWITCH_WAIT' for the option name.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/mxs/mxs_init.h +1 -1
@@ -30,7 +30,7 @@ void early_delay(int delay);void mxs_power_init (void ); -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch (void );#else static inline void mxs_power_wait_pswitch (void ) { }
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +1 -1
@@ -921,7 +921,7 @@ void mxs_power_init(void)early_delay (1000 ); } -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch (void ) { struct mxs_power_regs *power_regs =
Signature · 1 line
1.8.1
PATCH v4 2/10 mx23: Document the tRAS lockout setting in memory initialization
In reply to Otavio SalvadorAdd a comment about the tRAS lockout setting of HW_DRAM_CTL08 to enable the 'Fast Auto Pre-Charge' found in the memory chip. The setting is applied after memory initialization and it is worth document it.
---
Changes in v4: None
Changes in v3:
- Extend code comment to be more verbose (Marek)
Changes in v2:
- Extend code comment to explicit say it needs to be there.
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +4 -0
@@ -119,6 +119,10 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* +* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last +* element to be set +*/ writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 ));#endif }
Signature · 1 line
1.8.1
PATCH v4 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
In reply to Otavio SalvadorAdjust HW_DRAM_CTL14 to enable the chip selects to allow usage of full 128MB of RAM.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/freescale/mx23evk/spl_boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
board/freescale/mx23evk/spl_boot.c +10 -0
@@ -98,6 +98,16 @@ const iomux_cfg_t iomux_setup[] = { (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL), }; +#define HW_DRAM_CTL14 (0x38 >> 2) +#define CS_MAP 0x3 +#define INTAREF 0x2 +#define HW_DRAM_CTL14_CONFIG (INTAREF << 8 | CS_MAP) + +void mxs_adjust_memory_params (uint32_t *dram_vals) +{ + dram_vals[HW_DRAM_CTL14 ] =HW_DRAM_CTL14_CONFIG ; +} +void board_init_ll (void ) {mxs_common_spl_init (iomux_setup,ARRAY_SIZE (iomux_setup));
Signature · 1 line
1.8.1
PATCH v4 4/10 led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
In reply to Otavio SalvadorThis fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
common/cmd_led.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
common/cmd_led.c +4 -2
@@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (led_commands[i].on) led_commands[i].on ();else -__led_set (led_commands[i].mask,1 ); +__led_set (led_commands[i].mask, +STATUS_LED_ON );break ;case LED_OFF :if (led_commands[i].off) led_commands[i].off ();else -__led_set (led_commands[i].mask,0 ); +__led_set (led_commands[i].mask, +STATUS_LED_OFF );break ;case LED_TOGGLE :if (led_commands[i].toggle)
Signature · 1 line
1.8.1
PATCH v4 5/10 mxs: Fix iomux.h to not break build during assembly stage
In reply to Otavio SalvadorThis fixes the build failure when included in mx23_olinuxino.h board config; the addition of "asm/types.h" is due "u32" being otherwise undefined.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/include/asm/arch-mxs/iomux.h +5 -0
@@ -21,6 +21,10 @@#ifndef __MACH_MXS_IOMUX_H__#define __MACH_MXS_IOMUX_H__ +#ifndef __ASSEMBLY__ + +#include <asm/types.h> +/* * IOMUX/PAD Bit field definitions *
@@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);*/ int mxs_iomux_setup_multiple_pads (const iomux_cfg_t *pad_list,unsigned count); +#endif /* __ASSEMBLY__ */ #endif /* __MACH_MXS_IOMUX_H__*/
Signature · 1 line
1.8.1
PATCH v4 6/10 mx23_olinuxino: Add support for status LED
In reply to Otavio SalvadorThis allow user to know if the bootloader is running, even without a serial console.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Use MUX pin name - Requested by Marek
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 7 +++++++ board/olimex/mx23_olinuxino/spl_boot.c | 4 ++++ include/configs/mx23_olinuxino.h | 14 ++++++++++++++ 3 files changed, 25 insertions(+)
board/olimex/mx23_olinuxino/mx23_olinuxino.c +7 -0
@@ -28,6 +28,9 @@#include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> +#ifdef CONFIG_STATUS_LED +#include <status_led.h> +#endif DECLARE_GLOBAL_DATA_PTR ;
@@ -67,5 +70,9 @@ int board_init(void)/* Adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; +#if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT ) +status_led_set (STATUS_LED_BOOT ,STATUS_LED_STATE ); +#endif +return 0 ; }
board/olimex/mx23_olinuxino/spl_boot.c +4 -0
@@ -84,6 +84,10 @@ const iomux_cfg_t iomux_setup[] = {MX23_PAD_EMI_RASN__EMI_RASN |MUX_CONFIG_EMI ,MX23_PAD_EMI_WEN__EMI_WEN |MUX_CONFIG_EMI , +/* Green LED */ +MX23_PAD_SSP1_DETECT__GPIO_2_1 | + (MXS_PAD_3V3 |MXS_PAD_4MA |MXS_PAD_NOPULL ), +/* MMC 0 */ MX23_PAD_SSP1_CMD__SSP1_CMD |MUX_CONFIG_SSP , MX23_PAD_SSP1_DATA0__SSP1_DATA0 | MUX_CONFIG_SSP,
include/configs/mx23_olinuxino.h +14 -0
@@ -19,6 +19,8 @@#ifndef __MX23_OLINUXINO_CONFIG_H__#define __MX23_OLINUXINO_CONFIG_H__ +#include <asm/arch/iomux-mx23.h> +/* * SoC configurations */
@@ -56,6 +58,7 @@#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO +#define CONFIG_CMD_LED #define CONFIG_CMD_MMC /*
@@ -112,6 +115,17 @@#define CONFIG_BAUDRATE 115200/* Default baud rate */ /* +* Status LED +*/ +#define CONFIG_STATUS_LED +#define CONFIG_GPIO_LED +#define CONFIG_BOARD_SPECIFIC_LED +#define STATUS_LED_BOOT 0 +#define STATUS_LED_BIT MX23_PAD_SSP1_DETECT__GPIO_2_1 +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) + +/* * MMC Driver */ #ifdef CONFIG_CMD_MMC
Signature · 1 line
1.8.1
PATCH v4 7/10 usb: mxs: Adapt code for i.MX23 support
In reply to Otavio SalvadorThe i.MX23 just one USB port so we shouldn't mess up with PLL1CTRL and USB1 port when building for i.MX23.
---
Changes in v4:
- Rework soc_ehci_hcd_{enable,disable}_clock to mxs_ehci_hcd_clock (Fabio / Marek)
Changes in v3:
- Improve commit log
- Move code to enable/disable clock to soc_ehci_hcd_{enable,disable}_clock
- Proper use mx23 clock registers
Changes in v2:
- Avoid wrong clock setting in MX23
drivers/usb/host/ehci-mxs.c | 58 +++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 23 deletions(-)
drivers/usb/host/ehci-mxs.c +35 -23
@@ -23,7 +23,11 @@#include <asm/io.h> #include <asm/arch/regs-common.h> #include <asm/arch/regs-base.h> +#if defined(CONFIG_MX23 ) +#include <asm/arch/regs-clkctrl-mx23.h> +#elif defined(CONFIG_MX28 )#include <asm/arch/regs-clkctrl-mx28.h> +#endif #include <asm/arch/regs-usb.h> #include <asm/arch/regs-usbphy.h>
@@ -50,10 +54,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base =MXS_USBCTRL0_BASE ; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;
@@ -67,17 +73,40 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif -int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) +static void mxs_ehci_hcd_clock (bool enable) { - -int ret; -uint32_t usb_base, cap_base;struct mxs_register_32 *digctl_ctrl = (struct mxs_register_32 *)HW_DIGCTL_CTRL ;struct mxs_clkctrl_regs *clkctrl_regs = (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ; +uint32_t reg =HW_DIGCTL_CTRL_USB0_CLKGATE ; + +writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS |CLKCTRL_PLL0CTRL0_POWER , + (enable ? &clkctrl_regs->hw_clkctrl_pll0ctrl0_set : \ + &clkctrl_regs->hw_clkctrl_pll0ctrl0_clr)); + +#ifdef CONFIG_MX28 +/* i.MX28 has two USB controllers */ + reg |=HW_DIGCTL_CTRL_USB1_CLKGATE ; + +writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER , + (enable ? &clkctrl_regs->hw_clkctrl_pll1ctrl0_set : \ + &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr)); +#endif + +/* Gate/gateoff the USB clock */ +writel (reg, (enable ? &digctl_ctrl->reg_clr : \ + &digctl_ctrl->reg_set)); +} + +int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) +{ +int ret; +uint32_t usb_base, cap_base; ret =mxs_ehci_get_port (&ehci_mxs,CONFIG_EHCI_MXS_PORT );if (ret)
@@ -90,13 +119,7 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) &ehci_mxs.phy_regs->hw_usbphy_ctrl_clr);/* Enable USB clock */ -writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS |CLKCTRL_PLL0CTRL0_POWER , - &clkctrl_regs->hw_clkctrl_pll0ctrl0_set); -writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER , - &clkctrl_regs->hw_clkctrl_pll1ctrl0_set); - -writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , - &digctl_ctrl->reg_clr); +mxs_ehci_hcd_clock (true);/* Start USB PHY */ writel (0 , &ehci_mxs.phy_regs->hw_usbphy_pwd);
@@ -118,10 +141,6 @@ int ehci_hcd_stop(int index) {int ret;uint32_t usb_base, cap_base, tmp; -struct mxs_register_32 *digctl_ctrl = - (struct mxs_register_32 *)HW_DIGCTL_CTRL ; -struct mxs_clkctrl_regs *clkctrl_regs = - (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ;struct ehci_hccr *hccr;struct ehci_hcor *hcor;
@@ -147,14 +166,7 @@ int ehci_hcd_stop(int index)writel (tmp, &ehci_mxs.phy_regs->hw_usbphy_pwd);/* Disable USB clock */ -writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS , - &clkctrl_regs->hw_clkctrl_pll0ctrl0_clr); -writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS , - &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr); - -/* Gate off the USB clock */ -writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , - &digctl_ctrl->reg_set); +mxs_ehci_hcd_clock (false);return 0 ; }
Signature · 1 line
1.8.1
PATCH v4 7/10 usb: mxs: Adapt code for i.MX23 support
Dear Otavio Salvador,
Quoted 26 lines
The i.MX23 just one USB port so we shouldn't mess up with PLL1CTRL and USB1 port when building for i.MX23.
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v4:
- Rework soc_ehci_hcd_{enable,disable}_clock tomxs_ehci_hcd_clock(Fabio / Marek)Changes in v3:
- Improve commit log
- Move code to enable/disable clock to soc_ehci_hcd_{enable,disable}_clock
- Proper use mx23 clock registersChanges in v2:
- Avoid wrong clock setting in MX23drivers/usb/host/ehci-mxs.c | 58+++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 23 deletions(-)
drivers/usb/host/ehci-mxs.c +0
-0
drivers/usb/host/ehci-mxs.c line 30
Quoted 8 lines
drivers/usb/host/ehci-mxs.c +4
-0@@ -23,7 +23,11 @@#include <asm/io.h> #include <asm/arch/regs-common.h> #include <asm/arch/regs-base.h> +#if defined(CONFIG_MX23 ) +#include <asm/arch/regs-clkctrl-mx23.h> +#elif defined(CONFIG_MX28 )#include <asm/arch/regs-clkctrl-mx28.h> +#endif
This should be handled automatically in imx-regs.h no ? I believe all this regs- xxx.h crap should just be part of imx-regs.h and none of that should be here at all.
Quoted 25 lines
drivers/usb/host/ehci-mxs.c +2
-0#include <asm/arch/regs-usb.h> #include <asm/arch/regs-usbphy.h> @@ -50,10 +54,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;@@ -67,17 +73,40 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, intport) /* This DIGCTL register ungates clock to USB */
#defineHW_DIGCTL_CTRL0x8001c000
#defineHW_DIGCTL_CTRL_USB0_CLKGATE(1 << 2)drivers/usb/host/ehci-mxs.c +2
-1+#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif -int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor
Quoted 1 line
**hcor) +static void
mxs_ehci_hcd_clock(bool enable)
I wonder if this shall not go to arch/arm.../mxs/clock.c ?
I'd say, pass also "int index" argument and call it twice for mx28 and once for mx23. That'd align well with the multi-controller stuff.
Quoted 16 lines
{
drivers/usb/host/ehci-mxs.c +8
-3- -int ret; -uint32_t usb_base, cap_base;struct mxs_register_32 *digctl_ctrl = (struct mxs_register_32 *)HW_DIGCTL_CTRL ;struct mxs_clkctrl_regs *clkctrl_regs = (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ; +uint32_t reg =HW_DIGCTL_CTRL_USB0_CLKGATE ; + +writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS |CLKCTRL_PLL0CTRL0_POWER , + (enable ? &clkctrl_regs->hw_clkctrl_pll0ctrl0_set : \ + &clkctrl_regs->hw_clkctrl_pll0ctrl0_clr)); + +#ifdef CONFIG_MX28 +/* i.MX28 has two USB controllers */
drivers/usb/host/ehci-mxs.c int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) · line 103
Quoted 10 lines
drivers/usb/host/ehci-mxs.c +10
-0+ reg |=HW_DIGCTL_CTRL_USB1_CLKGATE ; + +writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER , + (enable ? &clkctrl_regs->hw_clkctrl_pll1ctrl0_set : \ + &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr)); +#endif + +/* Gate/gateoff the USB clock */ +writel (reg, (enable ? &digctl_ctrl->reg_clr : \ + &digctl_ctrl->reg_set));
Uh ... uh ... uh ...
No, kill the ternary operators. Good old if (enable) .... else .... please.
Something like (imprecise code warning):
if (enable)
reg_offset = offsetof(mxs_register32, set);
else
reg_offset = offsetof(mxs_register32, clk);
do_all_the_stuff here, all writel(val, mxs_register32 + offset); like this example.
Quoted 41 lines
drivers/usb/host/ehci-mxs.c +3
-0+} + +int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor**hcor) +{
drivers/usb/host/ehci-mxs.c +3
-13+int ret; +uint32_t usb_base, cap_base; ret =mxs_ehci_get_port (&ehci_mxs,CONFIG_EHCI_MXS_PORT );if (ret)@@ -90,13 +119,7 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) &ehci_mxs.phy_regs->hw_usbphy_ctrl_clr);/* Enable USB clock */ -writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS |CLKCTRL_PLL0CTRL0_POWER , - &clkctrl_regs->hw_clkctrl_pll0ctrl0_set); -writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER , - &clkctrl_regs->hw_clkctrl_pll1ctrl0_set); - -writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , - &digctl_ctrl->reg_clr); +mxs_ehci_hcd_clock (true);/* Start USB PHY */ writel (0 , &ehci_mxs.phy_regs->hw_usbphy_pwd);@@ -118,10 +141,6 @@ int ehci_hcd_stop(int index) {int ret;uint32_t usb_base, cap_base, tmp; -struct mxs_register_32 *digctl_ctrl = - (struct mxs_register_32 *)HW_DIGCTL_CTRL ; -struct mxs_clkctrl_regs *clkctrl_regs = - (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE ;struct ehci_hccr *hccr;struct ehci_hcor *hcor;@@ -147,14 +166,7 @@ int ehci_hcd_stop(int index)writel (tmp, &ehci_mxs.phy_regs->hw_usbphy_pwd);/* Disable USB clock */ -writel (CLKCTRL_PLL0CTRL0_EN_USB_CLKS , - &clkctrl_regs->hw_clkctrl_pll0ctrl0_clr);
drivers/usb/host/ehci-mxs.c int ehci_hcd_stop(int index) · line 172
Quoted 10 lines
drivers/usb/host/ehci-mxs.c +1
-6-writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS , - &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr); - -/* Gate off the USB clock */ -writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , - &digctl_ctrl->reg_set); +mxs_ehci_hcd_clock (false);return 0 ; }
You might want to separate out the USB patches, they might need some work.
Best regards,
Marek Vasut
PATCH v4 8/10 mx23evk: Enable USB support
In reply to Otavio SalvadorThis enabled USB support for the mx23evk board.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
include/configs/mx23evk.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/configs/mx23evk.h +10 -0
@@ -58,6 +58,7 @@#define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC +#define CONFIG_CMD_USB #define CONFIG_CMD_BOOTZ /* Memory configurations */
@@ -122,6 +123,15 @@#define CONFIG_MXS_MMC #endif +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MXS +#define CONFIG_EHCI_MXS_PORT 0 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE +#endif +/* Boot Linux */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS
Signature · 1 line
1.8.1
PATCH v4 9/10 mx23_olinuxino: Enable USB support
In reply to Otavio SalvadorThis enabled USB support for the mx23_olinuxino board.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Add changes for allow use of the USB hub
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 6 ++++++ board/olimex/mx23_olinuxino/spl_boot.c | 4 ++++ include/configs/mx23_olinuxino.h | 10 ++++++++++ 3 files changed, 20 insertions(+)
board/olimex/mx23_olinuxino/mx23_olinuxino.c +6 -0
@@ -23,6 +23,7 @@*/ #include <common.h> +#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/iomux-mx23.h> #include <asm/arch/imx-regs.h>
@@ -45,6 +46,11 @@ int board_early_init_f(void)/* SSP0 clock at 96MHz */ mxs_set_sspclk (MXC_SSPCLK0 ,96000 ,0 ); +#ifdef CONFIG_CMD_USB +/* Enable LAN9512 */ +gpio_direction_output (MX23_PAD_GPMI_ALE__GPIO_0_17 ,1 ); +#endif +return 0 ; }
board/olimex/mx23_olinuxino/spl_boot.c +4 -0
@@ -95,6 +95,10 @@ const iomux_cfg_t iomux_setup[] = {MX23_PAD_SSP1_DATA2__SSP1_DATA2 |MUX_CONFIG_SSP ,MX23_PAD_SSP1_DATA3__SSP1_DATA3 |MUX_CONFIG_SSP ,MX23_PAD_SSP1_SCK__SSP1_SCK |MUX_CONFIG_SSP , + +/* Ethernet */ +MX23_PAD_GPMI_ALE__GPIO_0_17 | + (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL), };void board_init_ll (void )
include/configs/mx23_olinuxino.h +10 -0
@@ -60,6 +60,7 @@#define CONFIG_CMD_GPIO #define CONFIG_CMD_LED #define CONFIG_CMD_MMC +#define CONFIG_CMD_USB /* * Memory configurations
@@ -140,6 +141,15 @@*/ #define CONFIG_APBH_DMA +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MXS +#define CONFIG_EHCI_MXS_PORT 0 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE +#endif +/* * Boot Linux */
Signature · 1 line
1.8.1
PATCH v4 10/10 mx23_olinuxino: Add ethernet support
In reply to Otavio SalvadorThis adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Remove extra newline
include/configs/mx23_olinuxino.h | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-)
include/configs/mx23_olinuxino.h +36 -3
@@ -55,11 +55,13 @@#define CONFIG_DOS_PARTITION #define CONFIG_CMD_CACHE +#define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO #define CONFIG_CMD_LED #define CONFIG_CMD_MMC +#define CONFIG_CMD_NET #define CONFIG_CMD_USB /*
@@ -150,6 +152,12 @@#define CONFIG_USB_STORAGE #endif +/* Ethernet */ +#ifdef CONFIG_CMD_NET +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#endif +/* * Boot Linux */
@@ -191,6 +199,7 @@"fdt_file=imx23-olinuxino.dtb\0" \"fdt_addr=0x41000000\0" \"boot_fdt=try\0" \ +"ip_dyn=yes\0" \"mmcdev=0\0" \"mmcpart=2\0" \"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
@@ -216,6 +225,31 @@"fi; " \"else " \"bootm; " \ +"fi;\0" \ +"netargs=setenv bootargs console=${console_mainline},${baudrate} " \ +"root=/dev/nfs " \ +"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ +"netboot=echo Booting from net ...; " \ +"usb start; " \ +"run netargs; " \ +"if test ${ip_dyn} = yes; then " \ +"setenv get_cmd dhcp; " \ +"else " \ +"setenv get_cmd tftp; " \ +"fi; " \ +"${get_cmd} ${uimage}; " \ +"if test ${boot_fdt} = yes; then " \ +"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ +"bootm ${loadaddr} - ${fdt_addr}; " \ +"else " \ +"if test ${boot_fdt} = try; then " \ +"bootm; " \ +"else " \ +"echo WARN: Cannot load the DT; " \ +"fi;" \ +"fi; " \ +"else " \ +"bootm; " \"fi;\0" #define CONFIG_BOOTCOMMAND \
@@ -225,10 +259,9 @@"else " \"if run loaduimage; then " \"run mmcboot; " \ -"else " \ -"echo ERR: Fail to boot from MMC; " \ +"else run netboot; " \"fi; " \"fi; " \ - "else exit; fi" + "else run netboot; fi"#endif /* __MX23_OLINUXINO_CONFIG_H__ */
Signature · 1 line
1.8.1