diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-16 23:01:12 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-16 23:01:12 +0200 | 
| commit | db39f24151627733d6166c5e9a875fe8b356fa72 (patch) | |
| tree | d091e23af47b9ae848c6f69144f941d9f072aae6 /board/cm_t35/cm_t35.c | |
| parent | b64c2420e02a7d068aae6e0d069f270feb3cdc9a (diff) | |
| parent | 2694bb9bcc8ca9636faf38c866dda7bf0529e35f (diff) | |
| download | olio-uboot-2014.01-db39f24151627733d6166c5e9a875fe8b356fa72.tar.xz olio-uboot-2014.01-db39f24151627733d6166c5e9a875fe8b356fa72.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
  ARM926EJS: Fix cache.c to comply with checkpatch.pl
  ARM926EJS: Make asm routines volatile in cache ops
  MX35: mx35pdk: wrong board revision
  ARM1136: MX35: Make asm routines volatile in cache ops
  ARM: add u-boot.imx as target for i.MX SOCs
  M28: Pull out CONFIG_APBH_DMA so it's always enabled
  DMA: Split the APBH DMA init into block and channel init
  imx: Return gpio_set_value in gpio_direction_output
  imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)
  imx: Add GPIO_TO_PORT macro in the mxc_gpio driver
  imx: Remove unneeded/repititive definitions from imx headers
  i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
  MX31: mx31pdk: drop enable_caches from board file
  i.MX28: Fix initial stack pointer position
  mx35: mx35pdk: fix when cache functions are linked
  mx35: flea3: fix when cache functions are linked
  ARM: 926ejs: use debug() for misaligned addresses
  ARM1136: add cache flush and invalidate operations
  mx6qsabrelite: Fix the serial console port
  mx6qsabrelite: Add boot switch setting information into the README
  i.MX6: mx6qsabrelite: add cache commands if cache is enabled
  i.MX6: implement enable_caches()
  i.MX6: define CACHELINE_SIZE
  MX53: DDR: Fix ZQHWCTRL field TZQ_CS
  mx28evk: Add a README file
  mx28: Split the README into a common part and a m28 specific part
  tricorder: Load kernel from ubifs
  tricorder: Add UBIFS
  cm-t35: fix Ethernet reset timing
  hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT
  BeagleBoard: Remove userbutton command and use gpio command instead
  OMAP: Move omap1510inn to Unmaintained / Orphaned
Diffstat (limited to 'board/cm_t35/cm_t35.c')
| -rw-r--r-- | board/cm_t35/cm_t35.c | 11 | 
1 files changed, 6 insertions, 5 deletions
| diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c index 0a049944d..7af1f41af 100644 --- a/board/cm_t35/cm_t35.c +++ b/board/cm_t35/cm_t35.c @@ -356,16 +356,17 @@ static void reset_net_chip(void)  {  	/* Set GPIO1 of TPS65930 as output */  	twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, -			     TWL4030_BASEADD_GPIO+0x03); +				TWL4030_BASEADD_GPIO + 0x03);  	/* Send a pulse on the GPIO pin */  	twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, -			     TWL4030_BASEADD_GPIO+0x0C); +				TWL4030_BASEADD_GPIO + 0x0C);  	udelay(1);  	twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, -			     TWL4030_BASEADD_GPIO+0x09); -	udelay(1); +				TWL4030_BASEADD_GPIO + 0x09); +	mdelay(40);  	twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, -			     TWL4030_BASEADD_GPIO+0x0C); +				TWL4030_BASEADD_GPIO + 0x0C); +	mdelay(1);  }  #else  static inline void reset_net_chip(void) {} |