December 2013 - U-Boot

[U-Boot] [RFC] ARM: Start using fdt_high for relocation
by Tom Rini 07 Dec '13

07 Dec '13

Hey all, I've been thinking. We've had a thread on i.MX platforms about fdt being overwritten and needing to be moved to another address. And I've also had an internal problem about fdt being overwritten. So, how about as a rule of thumb we start setting fdt_high (in configs) to memory-start + 512MiB, as that's the lowmem limit we should always have available. This will fix the problem of BSS overwriting the DT, which is the problem we won't catch in normal bootm/bootz usage. Thoughts? -- Tom

4 8

[U-Boot] [PATCH] ARM: align MVBAR on 32 byte boundary
by Masahiro Yamada 06 Dec '13

06 Dec '13

The lower 5 bit of MVBAR is UNK/SBZP. So, Monitor Vector Base Address must be 32-byte aligned. On the other hand, the secure monitor handler does not need 32-byte alignment. This commit moves ".algin 5" directive to the correct place. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Andre Przywara <andre.przywara(a)linaro.org> --- BTW, I noticed the legacy license block is used in this file. Because arch/arm/cpu/armv7/nonsec_virt.S is a newly added file, SPDX License Identifier should have been used... arch/arm/cpu/armv7/nonsec_virt.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 358348f..ee36760 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -30,6 +30,7 @@ .arch_extension sec .arch_extension virt + .align 5 /* the vector table for secure state and HYP mode */ _monitor_vectors: .word 0 /* reset */ @@ -48,7 +49,6 @@ _monitor_vectors: * to non-secure state. * We use only r0 and r1 here, due to constraints in the caller. */ - .align 5 _secure_monitor: mrc p15, 0, r1, c1, c1, 0 @ read SCR bic r1, r1, #0x4e @ clear IRQ, FIQ, EA, nET bits -- 1.8.1.2

3 4

Re: [U-Boot] I want to a board(tiny4412) for exyno4412, but I can't get any output
by randy 06 Dec '13

06 Dec '13

sorry, I sent attach git format-patch directly, it cause the mistake mail, the patch is below. The SPL(bl2) is still the old one from manufacturer, as I don't know how to build a new one. I don't know much debug method, the how to use JTAG of it. Could anyone teach me some of it? Thanks. [PATCH] board: Fix mmc pins and remove some no use gpio. In my board, the sdcard is in mmc2, and using sd2_cdn to detect. --- board/samsung/tiny4412/tiny4412.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/board/samsung/tiny4412/tiny4412.c b/board/samsung/tiny4412/tiny4412.c index 4f5bfbd..f969866 100644 --- a/board/samsung/tiny4412/tiny4412.c +++ b/board/samsung/tiny4412/tiny4412.c @@ -41,6 +41,8 @@ static void check_hw_revision(void) s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT); /* GPM1[5:2]: HW_REV[3:0] */ + /*In my board, those pins are used for camera*/ + /* GMP0[0:7] and GPM1[0:3] */ for (i = 2; i < 6; i++) { s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT); s5p_gpio_set_pull(&gpio2->m1, i, GPIO_PULL_NONE); @@ -87,9 +89,7 @@ static void board_external_gpio_init(void) * if that pin set as input then that floated */ - s5p_gpio_set_pull(&gpio2->x1, 5, GPIO_PULL_NONE); /* IF_PMIC_IRQ*/ s5p_gpio_set_pull(&gpio2->x3, 5, GPIO_PULL_NONE); /* OK_KEY */ - s5p_gpio_set_pull(&gpio2->x3, 7, GPIO_PULL_NONE); /* HDMI_HPD */ } #ifdef CONFIG_SYS_I2C_INIT_BOARD @@ -114,6 +114,7 @@ static void board_init_i2c(void) int board_early_init_f(void) { + /*pull up led*/ gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE; s5p_gpio_cfg_pin(&gpio2->m4, 1, GPIO_INPUT); s5p_gpio_set_pull(&gpio2->m4, 1, GPIO_PULL_NONE); @@ -206,9 +207,9 @@ int board_mmc_init(bd_t *bis) /* * Check the T-flash detect pin - * GPX3[4] T-flash detect pin + * GPK2[2] T-flash detect pin */ - if (!s5p_gpio_get_value(&gpio2->x3, 4)) { + if (!s5p_gpio_get_value(&gpio2->k2, 2)) { err2 = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); if (err2) debug("SDMMC2 not configured\n"); -- 1.8.4.rc3

1 0

[U-Boot] Stale references in the u-boot-samsung repo
by Albert ARIBAUD 06 Dec '13

06 Dec '13

Hi Minkyu, While fetching u-boot-samsung, I could see the following messages: remote: error: refs/remotes/origin/GPL-Cleanup does not point to a valid object! remote: error: refs/remotes/origin/i.MX31 does not point to a valid object! remote: error: refs/remotes/origin/lwmon5 does not point to a valid object! remote: error: refs/remotes/origin/mkimage does not point to a valid object! It looks like these branches that were pushed on the remote, then later the commit to which they point was cleaned up. Can you fix this? Thanks in advance! Amicalement, -- Albert.

3 3

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 06 Dec '13

06 Dec '13

Dear Albert, The following changes since commit d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2: Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' (2013-11-22 10:19:35 +0100) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to 01322004ec08c207141b08a2e0423b9b4c7b2714: arm: exynos: remove the unused define. (2013-12-05 10:42:04 +0900) ---------------------------------------------------------------- Jaehoon Chung (3): arm: exynos: fix set_mmc_clk for exynos4x12 arm: exynos/goni: fix the return type for s5p_mmc_init arm: exynos: remove the unused define. Luka Perkov (1): config: arm: exynos5250: remove duplicate defines Minkyu Kang (1): arm: exynos: fix the align for exynos4_power structure Piotr Wilczek (7): driver:usb:s3c_udc: add support for Exynos4x12 trats2: enable ums support on Trats2 trats2: enable dfu and thor protocol for Tizen download board: trats2: remove unused defines from config file board: trats2: fix environmental variables board: trats2: fix access to samsung registers board: trats2: update Tizen partition definitions Przemyslaw Marczak (1): trats: usb: Add usb_cable_connected() function Rajeshwari Shinde (1): exynos: spl: Add a custom spi copy function arch/arm/cpu/armv7/exynos/clock.c | 3 +- arch/arm/cpu/armv7/exynos/pinmux.c | 2 +- arch/arm/cpu/armv7/exynos/spl_boot.c | 122 +++++++++++++++++++++++++++++- arch/arm/include/asm/arch-exynos/dwmmc.h | 4 - arch/arm/include/asm/arch-exynos/mmc.h | 2 +- arch/arm/include/asm/arch-exynos/power.h | 2 +- arch/arm/include/asm/arch-exynos/spi.h | 1 + arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- board/samsung/trats/trats.c | 11 +++ board/samsung/trats2/trats2.c | 108 ++++++++++++++++++++++++-- drivers/usb/gadget/regs-otg.h | 5 ++ drivers/usb/gadget/s3c_udc_otg.c | 9 ++- include/configs/exynos5250-dt.h | 25 +----- include/configs/trats.h | 1 + include/configs/trats2.h | 68 ++++++++++++----- 15 files changed, 300 insertions(+), 65 deletions(-) -- Thanks, Minkyu Kang.

2 3

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 06 Dec '13

06 Dec '13

Hey, The following changes since commit 4c54419737ffbfadd605263d97a1357bb03c04e8: socfpga: Adding Freeze Controller driver (2013-12-03 14:38:56 +0100) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to b06f8984959f51f4b99f9c77efa5267623c98957: omap4_panda: Don't use ulpi_reset (2013-12-04 11:41:14 -0500) ---------------------------------------------------------------- Hardik Patel (1): pandaboard: 1/1] ARM:OMAP4+: panda-es: Support Rev B3 Elpida DDR2 RAM Ilya Ledvich (3): cm_t335: add cm_t335 board support cm_t335: add support for status LED cm_t335: add support for pca9555 i2c gpio extender Lars Poeschel (1): pcm051: Support for revision 3 Lokesh Vutla (1): ARM: OMAP5+: Remove unnecessary EFUSE settings Lubomir Popov (1): ARM: OMAP4: Fix bug in omap4470_volts struct Michael Trimarchi (2): arm: omap3: Add uart4 omap3 adddress arm: omap3: Enable clocks for peripherals only if they are used Oleg Kosheliev (2): ARMV7: OMAP4: Add struct for twl603x data ARMV7: OMAP4: Add twl6032 support Roger Quadros (11): ahci: Error out with message on malloc() failure ahci: Fix cache align error messages ARM: OMAP5: Add Pipe3 PHY driver ARM: OMAP5: Add PRCM and Control information for SATA ARM: OMAP5: Add SATA platform glue ARM: omap5_uevm: Add SATA support ARM: DRA7xx: Add PRCM and Control information for SATA ARM: dra7_evm: Add SATA support usb: ehci-omap: Reset the USB Host OMAP module omap3_beagle: Don't use ulpi_reset omap4_panda: Don't use ulpi_reset SRICHARAN R (3): ARM: DRA7: Add is_dra7xx cpu check definition ARM: DRA: EMIF: Change DDR3 settings to use hw leveling ARM: DRA7/OMAP5: EMIF: Add workaround for bug 0039 Stefan Roese (1): arm: am335x: Add DT (FDT) support to Siemens boards Tom Rini (2): am33xx: Stop modifying certain EMIF4D registers am335x_evm: Update nandboot to use partitions and DT Viktar Palstsiuk (1): davinci: fix Master Priority Registers location Vladimir Koutny (1): am335x: cpsw: optimize cpsw_recv to increase network performance Yegor Yefremov (1): am3517_evm: activate Ethernet PHY arch/arm/cpu/armv7/am33xx/ddr.c | 7 - arch/arm/cpu/armv7/omap-common/Makefile | 5 + arch/arm/cpu/armv7/omap-common/emif-common.c | 142 ++++++++++++---- arch/arm/cpu/armv7/omap-common/pipe3-phy.c | 231 ++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap-common/pipe3-phy.h | 36 ++++ arch/arm/cpu/armv7/omap-common/sata.c | 75 +++++++++ arch/arm/cpu/armv7/omap3/clock.c | 2 - arch/arm/cpu/armv7/omap4/hw_data.c | 12 +- arch/arm/cpu/armv7/omap4/sdram_elpida.c | 9 +- arch/arm/cpu/armv7/omap5/hw_data.c | 9 +- arch/arm/cpu/armv7/omap5/hwinit.c | 18 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 7 + arch/arm/cpu/armv7/omap5/sdram.c | 214 +++++++++++++++++------- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 37 ++--- arch/arm/include/asm/arch-davinci/hardware.h | 3 +- arch/arm/include/asm/arch-omap3/clock.h | 2 - arch/arm/include/asm/arch-omap3/omap3.h | 1 + arch/arm/include/asm/arch-omap4/sys_proto.h | 4 + arch/arm/include/asm/arch-omap5/clock.h | 3 + arch/arm/include/asm/arch-omap5/omap.h | 4 + arch/arm/include/asm/arch-omap5/sata.h | 48 ++++++ arch/arm/include/asm/emif.h | 14 +- arch/arm/include/asm/omap_common.h | 10 ++ board/compulab/cm_t335/Makefile | 10 ++ board/compulab/cm_t335/cm_t335.c | 162 ++++++++++++++++++ board/compulab/cm_t335/mux.c | 117 +++++++++++++ board/compulab/cm_t335/spl.c | 106 ++++++++++++ board/compulab/cm_t335/u-boot.lds | 101 +++++++++++ board/isee/igep0033/board.c | 4 - board/logicpd/am3517evm/am3517evm.c | 34 ++++ board/logicpd/am3517evm/am3517evm.h | 2 +- board/phytec/pcm051/board.c | 53 ++++-- board/siemens/dxr2/board.c | 4 - board/siemens/pxm2/board.c | 5 - board/siemens/rut/board.c | 5 - board/ti/am335x/board.c | 17 -- board/ti/dra7xx/evm.c | 7 + board/ti/omap5_uevm/evm.c | 7 + board/ti/panda/panda.c | 60 +++++++ board/ti/ti814x/evm.c | 5 - board/ti/ti816x/evm.c | 17 -- boards.cfg | 4 +- drivers/block/ahci.c | 18 +- drivers/net/cpsw.c | 2 +- drivers/power/twl6030.c | 77 +++++++-- drivers/usb/host/ehci-omap.c | 57 +++++-- include/configs/am335x_evm.h | 9 +- include/configs/cm_t335.h | 182 ++++++++++++++++++++ include/configs/dra7xx_evm.h | 11 ++ include/configs/omap3_beagle.h | 3 - include/configs/omap4_panda.h | 3 - include/configs/omap5_uevm.h | 10 ++ include/configs/siemens-am33x-common.h | 5 + include/twl6030.h | 38 +++++ 54 files changed, 1768 insertions(+), 260 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/pipe3-phy.c create mode 100644 arch/arm/cpu/armv7/omap-common/pipe3-phy.h create mode 100644 arch/arm/cpu/armv7/omap-common/sata.c create mode 100644 arch/arm/include/asm/arch-omap5/sata.h create mode 100644 board/compulab/cm_t335/Makefile create mode 100644 board/compulab/cm_t335/cm_t335.c create mode 100644 board/compulab/cm_t335/mux.c create mode 100644 board/compulab/cm_t335/spl.c create mode 100644 board/compulab/cm_t335/u-boot.lds create mode 100644 include/configs/cm_t335.h Thanks! -- Tom

4 7

[U-Boot] am3517: segmentation fault in Linux after upgrading from arago src to mainline u-boot
by Yegor Yefremov 06 Dec '13

06 Dec '13

I'm having problems with the new u-boot (November 2013) and am3517 SoC. When I start Debian 7.0 armhf I get lots of Segmentation faults, I can't even perform apt-get udpate. With the older u-boot (arago sources from 2010) everything seems to work properly. I've checked ATAG_MEM and both u-boot versions deliver same RAM start address and size. I've compared EMIF4 settings (arch/arm/cpu/armv7/omap3/emif4.c) and PINMUX and everything is the same. Where else can I look for differences? Yegor

4 8

[U-Boot] Please pull u-boot-ti/master, v2
by Tom Rini 06 Dec '13

06 Dec '13

Hey, The following changes since commit 4c54419737ffbfadd605263d97a1357bb03c04e8: socfpga: Adding Freeze Controller driver (2013-12-03 14:38:56 +0100) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 18a02e8050b7af165efa72325753e7880bf5567c: AM3517 EVM: Enable ethernet (2013-12-06 07:04:26 -0500) ---------------------------------------------------------------- Hardik Patel (1): pandaboard: 1/1] ARM:OMAP4+: panda-es: Support Rev B3 Elpida DDR2 RAM Ilya Ledvich (3): cm_t335: add cm_t335 board support cm_t335: add support for status LED cm_t335: add support for pca9555 i2c gpio extender Lars Poeschel (1): pcm051: Support for revision 3 Lokesh Vutla (1): ARM: OMAP5+: Remove unnecessary EFUSE settings Lubomir Popov (1): ARM: OMAP4: Fix bug in omap4470_volts struct Michael Trimarchi (2): arm: omap3: Add uart4 omap3 adddress arm: omap3: Enable clocks for peripherals only if they are used Oleg Kosheliev (2): ARMV7: OMAP4: Add struct for twl603x data ARMV7: OMAP4: Add twl6032 support Roger Quadros (11): ahci: Error out with message on malloc() failure ahci: Fix cache align error messages ARM: OMAP5: Add Pipe3 PHY driver ARM: OMAP5: Add PRCM and Control information for SATA ARM: OMAP5: Add SATA platform glue ARM: omap5_uevm: Add SATA support ARM: DRA7xx: Add PRCM and Control information for SATA ARM: dra7_evm: Add SATA support usb: ehci-omap: Reset the USB Host OMAP module omap3_beagle: Don't use ulpi_reset omap4_panda: Don't use ulpi_reset SRICHARAN R (3): ARM: DRA7: Add is_dra7xx cpu check definition ARM: DRA: EMIF: Change DDR3 settings to use hw leveling ARM: DRA7/OMAP5: EMIF: Add workaround for bug 0039 Stefan Roese (1): arm: am335x: Add DT (FDT) support to Siemens boards Tom Rini (3): am33xx: Stop modifying certain EMIF4D registers am335x_evm: Update nandboot to use partitions and DT AM3517 EVM: Enable ethernet Viktar Palstsiuk (1): davinci: fix Master Priority Registers location Vladimir Koutny (1): am335x: cpsw: optimize cpsw_recv to increase network performance arch/arm/cpu/armv7/am33xx/ddr.c | 7 - arch/arm/cpu/armv7/omap-common/Makefile | 5 + arch/arm/cpu/armv7/omap-common/emif-common.c | 142 ++++++++++++---- arch/arm/cpu/armv7/omap-common/pipe3-phy.c | 231 ++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap-common/pipe3-phy.h | 36 ++++ arch/arm/cpu/armv7/omap-common/sata.c | 75 +++++++++ arch/arm/cpu/armv7/omap3/clock.c | 2 - arch/arm/cpu/armv7/omap4/hw_data.c | 12 +- arch/arm/cpu/armv7/omap4/sdram_elpida.c | 9 +- arch/arm/cpu/armv7/omap5/hw_data.c | 9 +- arch/arm/cpu/armv7/omap5/hwinit.c | 18 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 7 + arch/arm/cpu/armv7/omap5/sdram.c | 214 +++++++++++++++++------- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 37 ++--- arch/arm/include/asm/arch-davinci/hardware.h | 3 +- arch/arm/include/asm/arch-omap3/clock.h | 2 - arch/arm/include/asm/arch-omap3/omap3.h | 1 + arch/arm/include/asm/arch-omap4/sys_proto.h | 4 + arch/arm/include/asm/arch-omap5/clock.h | 3 + arch/arm/include/asm/arch-omap5/omap.h | 4 + arch/arm/include/asm/arch-omap5/sata.h | 48 ++++++ arch/arm/include/asm/emif.h | 14 +- arch/arm/include/asm/omap_common.h | 10 ++ board/compulab/cm_t335/Makefile | 10 ++ board/compulab/cm_t335/cm_t335.c | 162 ++++++++++++++++++ board/compulab/cm_t335/mux.c | 117 +++++++++++++ board/compulab/cm_t335/spl.c | 106 ++++++++++++ board/compulab/cm_t335/u-boot.lds | 101 +++++++++++ board/isee/igep0033/board.c | 4 - board/phytec/pcm051/board.c | 53 ++++-- board/siemens/dxr2/board.c | 4 - board/siemens/pxm2/board.c | 5 - board/siemens/rut/board.c | 5 - board/ti/am335x/board.c | 17 -- board/ti/dra7xx/evm.c | 7 + board/ti/omap5_uevm/evm.c | 7 + board/ti/panda/panda.c | 60 +++++++ board/ti/ti814x/evm.c | 5 - board/ti/ti816x/evm.c | 17 -- boards.cfg | 4 +- drivers/block/ahci.c | 18 +- drivers/net/cpsw.c | 2 +- drivers/power/twl6030.c | 77 +++++++-- drivers/usb/host/ehci-omap.c | 57 +++++-- include/configs/am335x_evm.h | 9 +- include/configs/am3517_evm.h | 14 +- include/configs/cm_t335.h | 182 ++++++++++++++++++++ include/configs/dra7xx_evm.h | 11 ++ include/configs/omap3_beagle.h | 3 - include/configs/omap4_panda.h | 3 - include/configs/omap5_uevm.h | 10 ++ include/configs/siemens-am33x-common.h | 5 + include/twl6030.h | 38 +++++ 53 files changed, 1745 insertions(+), 261 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/pipe3-phy.c create mode 100644 arch/arm/cpu/armv7/omap-common/pipe3-phy.h create mode 100644 arch/arm/cpu/armv7/omap-common/sata.c create mode 100644 arch/arm/include/asm/arch-omap5/sata.h create mode 100644 board/compulab/cm_t335/Makefile create mode 100644 board/compulab/cm_t335/cm_t335.c create mode 100644 board/compulab/cm_t335/mux.c create mode 100644 board/compulab/cm_t335/spl.c create mode 100644 board/compulab/cm_t335/u-boot.lds create mode 100644 include/configs/cm_t335.h -- Tom

2 1

[U-Boot] Please pull u-boot-mpc85xx/master
by York Sun 06 Dec '13

06 Dec '13

Tom, The following changes since commit f44483b57c49282299da0e5c10073b909cdad979: Merge branch 'serial' of git://git.denx.de/u-boot-microblaze (2013-12-02 08:48:02 -0500) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to 1df99080cb6dea9216ee1925f03bd7cc35dc34c7: powerpc/mpc8349: Use generic mpc85xx DDR driver (2013-12-04 14:55:05 -0800) ---------------------------------------------------------------- Dave Liu (1): powerpc/corenet: CPC1 speculation disable Po Liu (1): powerpc/c29xpcie: Getting DDR SPD image from 16-bit sub-address EEPROM Priyanka Jain (1): powerpc: spiflash:Add corenet devices support in eSPI SPL Shengzhou Liu (1): powerpc/t2080qds: undef CONFIG_FSL_DDR_INTERACTIVE York Sun (1): powerpc/mpc8349: Use generic mpc85xx DDR driver Zang Roy-R61911 (1): T4240: Address T4240/T4160 Rev2.0 DDR clock change Zhao Qiang (1): powerpc/p1010rdb:modify the mtest start_address arch/powerpc/cpu/mpc83xx/Makefile | 4 +--- arch/powerpc/cpu/mpc85xx/speed.c | 8 ++++++++ arch/powerpc/cpu/mpc85xx/start.S | 4 ++++ board/freescale/c29xpcie/ddr.c | 13 +++++++++++++ drivers/mtd/spi/fsl_espi_spl.c | 5 +++++ include/configs/MPC8349EMDS.h | 1 + include/configs/P1010RDB.h | 2 +- include/configs/T2080QDS.h | 2 +- 8 files changed, 34 insertions(+), 5 deletions(-) Thanks, York

2 1

[U-Boot] [PATCH v3] am3517_evm: activate Ethernet PHY
by yegorslists＠googlemail.com 06 Dec '13

06 Dec '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- Changes: v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese) v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected board/logicpd/am3517evm/am3517evm.c | 34 ++++++++++++++++++++++++++++++++++ board/logicpd/am3517evm/am3517evm.h | 2 +- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 1569905..3b1dfd1 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -22,6 +22,7 @@ #include <asm/arch/musb.h> #include <asm/mach-types.h> #include <asm/errno.h> +#include <asm/gpio.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/musb.h> @@ -31,6 +32,9 @@ DECLARE_GLOBAL_DATA_PTR; +#define AM3517_IP_SW_RESET 0x48002598 +#define CPGMACSS_SW_RST (1 << 1) + /* * Routine: board_init * Description: Early hardware init. @@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void) */ int misc_init_r(void) { + __maybe_unused volatile unsigned int ctr; + __maybe_unused u32 reset; + #ifdef CONFIG_SYS_I2C_OMAP34XX i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif @@ -106,6 +113,33 @@ int misc_init_r(void) am3517_evm_musb_init(); +#if defined(CONFIG_DRIVER_TI_EMAC) + /* activate PHY reset */ + gpio_direction_output(30, 0); + gpio_set_value(30, 0); + + ctr = 0; + do { + udelay(1000); + ctr++; + } while (ctr < 300); + + /* deactivate PHY reset */ + gpio_set_value(30, 1); + + /* allow the PHY to stabilize and settle down */ + ctr = 0; + do { + udelay(1000); + ctr++; + } while (ctr < 300); + + /* ensure that the module is out of reset */ + reset = readl(AM3517_IP_SW_RESET); + reset &= (~CPGMACSS_SW_RST); + writel(reset,AM3517_IP_SW_RESET); +#endif + return 0; } diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h index 704af84..d407d66 100644 --- a/board/logicpd/am3517evm/am3517evm.h +++ b/board/logicpd/am3517evm/am3517evm.h @@ -315,7 +315,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_CLKREQ), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(SYS_NIRQ), (IEN | PTU | EN | M0)) \ /*SYS_nRESWARM */\ - MUX_VAL(CP(SYS_NRESWARM), (IDIS | PTU | DIS | M4)) \ + MUX_VAL(CP(SYS_NRESWARM), (IDIS | PTU | EN | M4)) \ /* - GPIO30 */\ MUX_VAL(CP(SYS_BOOT0), (IEN | PTD | DIS | M4)) /*GPIO_2*/\ /* - PEN_IRQ */\ -- 1.7.7

4 5