March 2013 - U-Boot

[U-Boot] dm9000 patch tftp, nfs fixes.
by Chris Ruehl 29 Mar '13

29 Mar '13

Hi, I start a project on a freescale imx27 using the dm9000a for network. I learned that the tftp , nfs and other network related working more less very unstable. I start compare the dm9000.c code with the upstream kernel v3.8.4 and fix some issues. issues tftp with many bad checksums and timeouts nfs with not working at all when upload a 38Mbyte rootfs.jffs2 After the patch its works much better for me. please find my patch attached and consider to merge it the the head branch. cheers Chris -- GTSYS Limited RFID Technology Unit 958 , KITEC - 1 Trademart Drive - Kowloon Bay - Hong Kong Fax (852) 8167 4060 - Tel (852) 3598 9488 Disclaimer: http://www.gtsys.com.hk/email/classified.html

2 2

[U-Boot] Support of Beagleboard-xm
by Dashi Cao 29 Mar '13

29 Mar '13

Hi all, I have got a Beagleboard-xm, and I'm feeling that saving environment variable is an issue because this board has no NAND. U-Boot supports environment variable file located in a FAT file system. So I set out and made a new board omap3_beagle-xm, copied from omap3_beagle, but with environment file on the FAT of the microSD. I'm not sure if I'm just reinventing the wheel! Regards, Thomas

3 3

[U-Boot] [PATCH] spl:falcon:trats: Fix SPL image size computing.
by Przemyslaw Marczak 29 Mar '13

29 Mar '13

"spl_imgsize" was set as decimal variable by "setexpr" and this causes wrong image size written by "ext4write". Preset this val with "0x" prefix allow to fix this issue. Signed-off-by: Przemyslaw Marczak <p.marczak(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> --- include/configs/trats.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/trats.h b/include/configs/trats.h index 63745ac..1fd7943 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -199,6 +199,7 @@ "splfile=falcon.bin\0" \ "spl_export=" \ "setexpr spl_imgsize ${splsize} + 8 ;" \ + "setenv spl_imgsize 0x${spl_imgsize};" \ "setexpr spl_imgaddr ${spladdr} - 8 ;" \ "setexpr spl_addr_tmp ${spladdr} - 4 ;" \ "mw.b ${spl_imgaddr} 0x00 ${spl_imgsize};run loaduimage;" \ -- 1.7.9.5

2 1

[U-Boot] [PATCH 1/2] SMDK5250: Fix compiler warning for non-dt systems
by Vivek Gautam 29 Mar '13

29 Mar '13

Compiling for non-dt systems gives folowing warning: smdk5250.c: In function 'board_eth_init': smdk5250.c:152:6: warning: unused variable 'node' [-Wunused-variable] Declare variable 'node' only for dt enabled systems to remove this warning. Signed-off-by: Vivek Gautam <gautam.vivek(a)samsung.com> --- board/samsung/smdk5250/smdk5250.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 7a5f132..2fa771e 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -149,9 +149,10 @@ int board_eth_init(bd_t *bis) u32 smc_bw_conf, smc_bc_conf; struct fdt_sromc config; fdt_addr_t base_addr; - int node; #ifdef CONFIG_OF_CONTROL + int node; + node = decode_sromc(gd->fdt_blob, &config); if (node < 0) { debug("%s: Could not find sromc configuration\n", __func__); -- 1.7.6.5

3 5

[U-Boot] [PATCH 00/11 v3] Fix and Re-organise PWM Timer
by Akshay Saraswat 29 Mar '13

29 Mar '13

This patch set tries to fix few bugs in timer and re-organises PWM clock code. Changes since v2: - Patch-1: New patch. - Patch-2: None. - Patch-3: None. - Patch-4: None. - Patch-5: Fixed typo paremters in commit message. - Patch-6: None. - Patch-7: Added "Acked-by: Simon Glass". - Patch-8: Fixed typo peripherial to peripheral. - Made exynos5_get_periph_rate static. - Added an empty line. - Replaced "enum periph_id" with "int" in function arguments. - Removed "#include <asm/arch/periph.h>" from clk.h. - Added "Acked-by: Simon Glass". - Patch-9: None. - Patch-10: - Replaced "exynos5_get_pwm_clk" with "clock_get_periph_rate" in get_pwm_clk instead of replacing everywhere. - Added "Acked-by: Simon Glass". - Patch-11: New patch. Changes since v1: - Patch-1: Added "Acked-by: Simon Glass". - Patch-2: Added "Acked-by: Simon Glass". - Patch-3: Added "Acked-by: Simon Glass". - Patch-4: Added "Acked-by: Simon Glass". - Patch-5: Added "Acked-by: Simon Glass". - Patch-6: None. - Patch-7: Fixed few nits. - Patch-8: Added "Acked-by: Simon Glass". - Patch-9: Restored get_pwm_clk call in case of non-exynos5 cpu. Akshay Saraswat (11): Exynos5: config: enable time command Exynos: Change get_timer() to work correctly Exynos: Add timer_get_us function Exynos: pwm: Fix two bugs in the exynos pwm configuration code Exynos: Avoid a divide by zero by specifying a non-zero period for pwm 4 Exynos: Tidy up the pwm_config function in the exynos pwm driver Exynos: Add peripherial id for pwm Exynos: clock: Add generic api to get the clk freq Exynos: clock: Correct pwm source clk selection Exynos: pwm: Use generic api to get pwm clk freq Exynos: pwm: Remove dead code of function exynos5_get_pwm_clk arch/arm/cpu/armv7/exynos/clock.c | 167 ++++++++++++++++++++++++++---- arch/arm/cpu/armv7/s5p-common/pwm.c | 42 ++++---- arch/arm/cpu/armv7/s5p-common/timer.c | 117 ++++++++++----------- arch/arm/include/asm/arch-exynos/clk.h | 15 +++ arch/arm/include/asm/arch-exynos/periph.h | 5 + board/samsung/smdk5250/setup.h | 2 +- include/configs/exynos5250-dt.h | 3 + 7 files changed, 244 insertions(+), 107 deletions(-) -- 1.8.0

2 11

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 29 Mar '13

29 Mar '13

Hello Tom, Here is a pull request for u-boot-arm/master -- note it should appear trivial and result in a fast-forward as ARM ToT is actually a merge of mainline ToT so as to resolve minor manual merge issues. The following changes since commit 417c55803118eb8e350d5ab8ba6583fb39f4e2e3: apx4devkit: change maintainer (2013-03-27 15:30:11 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 009d75ccc11d27b9a083375a88bb93cb746b4800: Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100) ---------------------------------------------------------------- Akshay Saraswat (8): Exynos5: TMU: Add driver for Thermal Management Unit Exynos5: FDT: Add TMU device node values Exynos5: TMU: Add TMU init and status check Exynos5: Config: Enable support for Exynos TMU driver TMU: Add TMU support in dtt command Exynos5: Config: Enable dtt command for TMU Exynos5: TMU: Add hardware tripping Exynos5: FDT: Add a H/W-trip member to TMU node Albert ARIBAUD (4): Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' into 'u-boot-arm/master' Allen Martin (13): tegra: remove support for UART SPI switch tegra: spi: rename tegra SPI drivers tegra: spi: remove non fdt support tegra: spi: pull register structs out of headers tegra20: spi: move fdt probe to spi_init spi: add common fdt SPI driver interface sf: winbond: add W25Q32DW tegra114: fdt: add compatible string for tegra114 SPI ctrl tegra114: fdt: add apbdma block tegra114: fdt: add SPI blocks tegra114: dalmore: fdt: enable dalmore SPI controller tegra114: add SPI driver tegra114: dalmore: config: enable SPI Enric Balletbo i Serra (2): ARM: AM33XX: Fix typo that causes an AM duplication in CPU name. igep00x0: Enable CONFIG_CMD_BOOTZ Koen Kooi (3): am335x_evm: add support for BeagleBone Black DT name am335x_evm: Enable CMD_EXT4 and CMD_FS_GENERIC, add bootpart to env am335x_evm: Add more variables and switch to DT booting. Mark Jackson (2): Allow AM335x MPU core clock speed to be specified in the board config file Initialise correct GPMC WAITx irq for AM33xx Matt Porter (9): am33xx: convert defines from am33xx-specific to generic names am33xx: refactor emif4/ddr to support multiple EMIF instances am33xx: refactor am33xx clocks and add ti814x support am33xx: refactor am33xx mux support and add ti814x support am33xx: add ti814x specific register definitions am33xx: add dmm support to emif4 library am33xx: support ti814x mmc reference clock ns16550: enable quirks for ti814x ti814x_evm: add ti814x evm board support Nikita Kiryanov (1): cm-t35: add support for loading splash image from NAND Peter Korsgaard (2): mmc: mmc_getcd/getwp: use sensible defaults mmc: omap_hsmmc.c: only register getcd/getwp callbacks if gpio could be used R Sricharan (2): ARM: mmu: Introduce weak dram_bank_setup function ARM: mmu: Set domain permissions to client access Rajeshwari Shinde (11): EXYNOS5: Add function to setup set ps hold SMDK5250: Add PMIC voltage settings EXYNOS5: Add function to enable XXTI clock source Sound: MAX98095: Add the driver for codec Sound: Support for MAX98095 codec in driver EXYNOS5: GPIO to enable MAX98095 EXYNOS5: FDT: Add compatible strings for MAX98095 config: Snow: Enable MAX98095 codec SMDK5250: FDT: Retrieve board model via DT EXYNOS5: Add initial DTS file for Snow. EXYNOS5: Snow: Add a configuration file Simon Glass (1): EXYNOS: Correct ordering of SPL machine_params Stephen Warren (9): ARM: bcm2835: add mailbox driver ARM: rpi_b: use bcm2835 mbox driver to get memory size lcd: calculate line_length after lcd_ctrl_init() ARM: rpi_b: disable rpi_b dcache explicitly video: add a driver for the bcm2835 mmc: add bcm2835 driver ARM: rpi_b: enable SD controller, add related env/cmds ARM: implement erratum 716044 workaround ARM: tegra: enable workaround for ARM erratum 716044 Steve Kipisz (1): am33xx:ddr:Fix config_sdram to work for all DDR Tom Rini (3): am33xx: Add required includes to some omap/am33xx code am335x_evm: Add better timings for the new BeagleBoard DDR3 part arm: Correct CONFIG_STANDALONE_LOAD_ADDR for AM33XX/OMAP* platforms Tom Warren (4): Tegra114: fdt: Add SDMMC (sdhci) nodes for T114 boards (Dalmore for now) Tegra114: Dalmore: Add SDIO3 pad config to pinctrl_config table Tegra114: MMC: Add SD bus power-rail init routine Tegra114: MMC: Enable DT MMC driver support for Tegra114 Dalmore boards Vaibhav Hiremath (1): am335x: Enable DDR PHY dynamic power down bit for DDR3 boards Vincent Stehlé (2): ARM: cache: declare set_section_dcache armv7: do not relocate _start twice Łukasz Majewski (1): mmc:sdhci:fix: Change default interrupts enabled at SDHCI initialization MAINTAINERS | 8 + Makefile | 2 +- README | 5 + arch/arm/config.mk | 2 +- arch/arm/cpu/arm1176/bcm2835/Makefile | 2 +- arch/arm/cpu/arm1176/bcm2835/mbox.c | 164 ++++++ arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 3 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- .../cpu/armv7/am33xx/{clock.c => clock_am33xx.c} | 33 +- arch/arm/cpu/armv7/am33xx/clock_ti814x.c | 406 +++++++++++++++ arch/arm/cpu/armv7/am33xx/ddr.c | 104 ++-- arch/arm/cpu/armv7/am33xx/emif4.c | 57 +- arch/arm/cpu/armv7/am33xx/mem.c | 2 +- arch/arm/cpu/armv7/am33xx/sys_info.c | 5 +- arch/arm/cpu/armv7/cache_v7.c | 3 + arch/arm/cpu/armv7/exynos/power.c | 45 ++ arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 35 ++ arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 1 + arch/arm/cpu/armv7/omap-common/timer.c | 1 + arch/arm/cpu/armv7/start.S | 7 +- arch/arm/dts/exynos5250.dtsi | 5 + arch/arm/dts/tegra114.dtsi | 141 +++++ arch/arm/include/asm/arch-am33xx/clock.h | 2 +- arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 36 +- arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 75 ++- arch/arm/include/asm/arch-am33xx/hardware.h | 40 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 54 ++ arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 53 ++ arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 5 + arch/arm/include/asm/arch-am33xx/mux.h | 235 +-------- arch/arm/include/asm/arch-am33xx/mux_am33xx.h | 247 +++++++++ arch/arm/include/asm/arch-am33xx/mux_ti814x.h | 311 +++++++++++ arch/arm/include/asm/arch-am33xx/omap.h | 5 + arch/arm/include/asm/arch-am33xx/spl.h | 5 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + arch/arm/include/asm/arch-bcm2835/mbox.h | 433 +++++++++++++++ arch/arm/include/asm/arch-bcm2835/sdhci.h | 24 + arch/arm/include/asm/arch-exynos/power.h | 24 + arch/arm/include/asm/arch-exynos/spl.h | 3 +- arch/arm/include/asm/arch-exynos/tmu.h | 58 +++ arch/arm/include/asm/arch-tegra/board.h | 3 +- arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 --- arch/arm/include/asm/arch-tegra/tegra_spi.h | 75 --- arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 6 + arch/arm/include/asm/arch-tegra114/tegra114_spi.h | 41 ++ arch/arm/include/asm/arch-tegra20/tegra20_sflash.h | 41 ++ arch/arm/include/asm/arch-tegra20/tegra20_slink.h | 41 ++ arch/arm/include/asm/cache.h | 2 + arch/arm/include/asm/system.h | 14 + arch/arm/lib/cache-cp15.c | 11 +- board/cm_t35/cm_t35.c | 61 +++ board/nvidia/common/board.c | 5 +- board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 ----- board/nvidia/dalmore/dalmore.c | 66 +++ board/nvidia/dalmore/pinmux-config-dalmore.h | 6 + board/nvidia/dts/tegra114-dalmore.dts | 18 + board/nvidia/seaboard/seaboard.c | 2 +- board/phytec/pcm051/board.c | 8 +- board/raspberrypi/rpi_b/rpi_b.c | 47 +- board/samsung/dts/exynos5250-smdk5250.dts | 13 + board/samsung/dts/exynos5250-snow.dts | 58 +++ board/samsung/smdk5250/smdk5250.c | 178 ++++++- board/ti/am335x/board.c | 57 +- board/ti/ti814x/Makefile | 46 ++ board/ti/ti814x/evm.c | 198 +++++++ board/ti/ti814x/evm.h | 7 + board/ti/ti814x/mux.c | 51 ++ boards.cfg | 2 + common/cmd_dtt.c | 32 +- common/lcd.c | 4 +- doc/device-tree-bindings/exynos/tmu.txt | 44 ++ drivers/mmc/Makefile | 1 + drivers/mmc/bcm2835_sdhci.c | 189 +++++++ drivers/mmc/mmc.c | 16 +- drivers/mmc/omap_hsmmc.c | 8 +- drivers/mmc/sdhci.c | 8 +- drivers/mtd/nand/omap_gpmc.c | 1 + drivers/mtd/spi/winbond.c | 5 + drivers/net/cpsw.c | 1 + drivers/power/Makefile | 1 + drivers/power/exynos-tmu.c | 319 ++++++++++++ drivers/serial/ns16550.c | 5 +- drivers/sound/Makefile | 1 + drivers/sound/max98095.c | 550 ++++++++++++++++++++ drivers/sound/max98095.h | 311 +++++++++++ drivers/sound/sound.c | 9 +- drivers/spi/Makefile | 6 +- drivers/spi/fdt_spi.c | 186 +++++++ drivers/spi/tegra114_spi.c | 405 ++++++++++++++ drivers/spi/{tegra_spi.c => tegra20_sflash.c} | 217 ++++---- drivers/spi/{tegra_slink.c => tegra20_slink.c} | 128 +++-- drivers/video/Makefile | 1 + drivers/video/bcm2835.c | 127 +++++ include/configs/am335x_evm.h | 28 +- include/configs/cardhu.h | 2 +- include/configs/cm_t35.h | 4 + include/configs/dalmore.h | 23 +- include/configs/exynos5250-dt.h | 6 + include/configs/igep00x0.h | 3 +- include/configs/pcm051.h | 3 +- include/configs/rpi_b.h | 79 +++ .../uart-spi-switch.h => include/configs/snow.h | 35 +- include/configs/tegra-common-post.h | 4 + include/configs/tegra20-common.h | 1 + include/configs/ti814x_evm.h | 221 ++++++++ include/configs/trimslice.h | 2 +- include/fdtdec.h | 3 + include/power/max77686_pmic.h | 32 ++ include/sound.h | 1 + include/tmu.h | 46 ++ lib/fdtdec.c | 3 + spl/Makefile | 2 +- 116 files changed, 6120 insertions(+), 882 deletions(-) create mode 100644 arch/arm/cpu/arm1176/bcm2835/mbox.c rename arch/arm/cpu/armv7/am33xx/{clock.c => clock_am33xx.c} (91%) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_ti814x.c create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_am33xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_am33xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti814x.h create mode 100644 arch/arm/include/asm/arch-bcm2835/mbox.h create mode 100644 arch/arm/include/asm/arch-bcm2835/sdhci.h create mode 100644 arch/arm/include/asm/arch-exynos/tmu.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h create mode 100644 arch/arm/include/asm/arch-tegra114/tegra114_spi.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_sflash.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_slink.h delete mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 board/samsung/dts/exynos5250-snow.dts create mode 100644 board/ti/ti814x/Makefile create mode 100644 board/ti/ti814x/evm.c create mode 100644 board/ti/ti814x/evm.h create mode 100644 board/ti/ti814x/mux.c create mode 100644 doc/device-tree-bindings/exynos/tmu.txt create mode 100644 drivers/mmc/bcm2835_sdhci.c create mode 100644 drivers/power/exynos-tmu.c create mode 100644 drivers/sound/max98095.c create mode 100644 drivers/sound/max98095.h create mode 100644 drivers/spi/fdt_spi.c create mode 100644 drivers/spi/tegra114_spi.c rename drivers/spi/{tegra_spi.c => tegra20_sflash.c} (56%) rename drivers/spi/{tegra_slink.c => tegra20_slink.c} (72%) create mode 100644 drivers/video/bcm2835.c rename arch/arm/include/asm/arch-tegra20/uart-spi-switch.h => include/configs/snow.h (50%) create mode 100644 include/configs/ti814x_evm.h create mode 100644 include/tmu.h Amicalement, -- Albert.

2 1

[U-Boot] TI Davinci and KSZ8873MLL
by Andy Ng 28 Mar '13

28 Mar '13

Hi, Does anyone know what TI Davinci board is using the KSZ8873 switch? Thank you Andy

1 0

[U-Boot] [PATCH] Add separate environment variable for tftp server
by Rory Toma 28 Mar '13

28 Mar '13

This patch uses the environment variable "tftpserverip" as the tftp server IP instead of serverip. If it is unset, it defaults to serverip.

2 1

[U-Boot] Help with ppc460sx i2c_transfer
by tx co 28 Mar '13

28 Mar '13

I'm having a difficult time figuring out why I'm failing to get an ACK response generated when running the /drivers/i2c/ppc4xx_i2c.c -> i2c_transfer function. I'm using the same values as a reference boot loader from a while back (2007). Here is my I2C configurations: 231 /* SPD i2c spd addresses */ 232 #define SPD_EEPROM_ADDRESS {0x50, 0x52} 302 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed */ 303 304 /*#define CONFIG_SYS_I2C_MULTI_EEPROMS*/ 305 #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1) 306 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 307 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 5 308 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 309 310 /* I2C bootstrap EEPROM */ 311 #define IIC0_BOOTPROM_ADDR 0x54 312 #define IIC0_PLX_FPGA_ADDR 0x69 313 #define IIC0_PLX_PPC_ADDR 0x6A 314 315 /* I2C bootstrap EEPROM */ 316 #define CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR 0x52 317 #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 318 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16 319 320 /* RTC configuration */ 321 #define CONFIG_RTC_DS1337 1 322 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 The OLD, working configuration yields an ACK response. And I've noticed in the i2c_transfer function the value for "status" returns: i2c_trasfer -> status = 1 i2c_trasfer -> status = 28 i2c_trasfer -> status = 21 i2c_trasfer -> status = 8 i2c_trasfer -> status = 9 and my current port returns: i2c_trasfer -> status = 1 i2c_trasfer -> status = 4 i2c_trasfer -> status = 2 Looking at the differences between the old and new code is not revealing anything. I've got a hunch that my current port is not really accessing my i2c (0x50). If anyone is willing to provide me with any pointers I would greatly appreciate it. Thank you

1 0

[U-Boot] [PATCH 6/8] Add TI816X specific register definitions
by TENART Antoine 28 Mar '13

28 Mar '13

Also move some non common defintions from hardware.h --- arch/arm/include/asm/arch-am33xx/hardware.h | 7 +-- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 5 ++ arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 5 ++ arch/arm/include/asm/arch-am33xx/hardware_ti816x.h | 58 ++++++++++++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti816x.h diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h index 5a27f9c..7f3b555 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware.h +++ b/arch/arm/include/asm/arch-am33xx/hardware.h @@ -23,6 +23,8 @@ #include <asm/arch/omap.h> #ifdef CONFIG_AM33XX #include <asm/arch/hardware_am33xx.h> +#elif defined(CONFIG_TI816X) +#include <asm/arch/hardware_ti816x.h> #elif defined(CONFIG_TI814X) #include <asm/arch/hardware_ti814x.h> #endif @@ -67,15 +69,10 @@ /* DDR Base address */ #define DDR_CTRL_ADDR 0x44E10E04 #define DDR_CONTROL_BASE_ADDR 0x44E11404 -#define DDR_PHY_CMD_ADDR2 0x47C0C800 -#define DDR_PHY_DATA_ADDR2 0x47C0C8C8 /* UART */ #define DEFAULT_UART_BASE UART0_BASE -#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) -#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE - /* GPMC Base address */ #define GPMC_BASE 0x50000000 diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h index fa02f19..49a4392 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h @@ -43,8 +43,13 @@ /* DDR Base address */ #define DDR_PHY_CMD_ADDR 0x44E12000 #define DDR_PHY_DATA_ADDR 0x44E120C8 +#define DDR_PHY_CMD_ADDR2 0x47C0C800 +#define DDR_PHY_DATA_ADDR2 0x47C0C8C8 #define DDR_DATA_REGS_NR 2 +#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) +#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE + /* CPSW Config space */ #define CPSW_MDIO_BASE 0x4A101000 diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h index a950ac3..ae0f370 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h @@ -42,8 +42,13 @@ /* DDR Base address */ #define DDR_PHY_CMD_ADDR 0x47C0C400 #define DDR_PHY_DATA_ADDR 0x47C0C4C8 +#define DDR_PHY_CMD_ADDR2 0x47C0C800 +#define DDR_PHY_DATA_ADDR2 0x47C0C8C8 #define DDR_DATA_REGS_NR 4 +#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) +#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE + /* CPSW Config space */ #define CPSW_MDIO_BASE 0x4A100800 diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h new file mode 100644 index 0000000..cb75d09 --- /dev/null +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h @@ -0,0 +1,58 @@ +/* + * hardware_ti816x.h + * + * TI816x hardware specific header + * + * Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com> + * Antoine Tenart, <atenart(a)adeneo-embedded.com> + * Based on TI-PSP-04.00.02.14 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __AM33XX_HARDWARE_TI816X_H +#define __AM33XX_HARDWARE_TI816X_H + +/* Watchdog Timer */ +#define WDT_BASE 0x480C2000 + +/* Control Module Base Address */ +#define CTRL_BASE 0x48140000 + +/* PRCM Base Address */ +#define PRCM_BASE 0x48180000 + +/* VTP Base address */ +#define VTP0_CTRL_ADDR 0x48198358 + +/* DDR Base address */ +#define DDR_PHY_CMD_ADDR 0x48198000 +#define DDR_PHY_DATA_ADDR 0x481980C8 +#define DDR_PHY_CMD_ADDR2 0x4819A000 +#define DDR_PHY_DATA_ADDR2 0x4819A0C8 +#define DDR_DATA_REGS_NR 4 + +/* UART */ +#define UART0_BASE 0x48020000 +#define UART1_BASE 0x48022000 +#define UART2_BASE 0x48024000 + +#define DDRPHY_0_CONFIG_BASE 0x48198000 +#define DDRPHY_1_CONFIG_BASE 0x4819a000 +#define DDRPHY_CONFIG_BASE ((emif == 0) ? DDRPHY_0_CONFIG_BASE:DDRPHY_1_CONFIG_BASE) + +/* CPSW Config space */ +#define CPSW_MDIO_BASE 0x4A100800 + +/* RTC base address */ +#define RTC_BASE 0x480C0000 + +#endif /* __AM33XX_HARDWARE_TI816X_H */ -- 1.7.10.4

3 2