diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-01-31 14:59:49 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-04-03 15:11:02 -0700 |
| commit | 05e2421388857fdd265e1e00c1f0e37b1d72fa97 (patch) | |
| tree | af03154efcc56d3daf2bf849998a4885938d4bf2 /board/olio/h1/h1.c | |
| parent | ad9990a7549c0d8882f72fa4947dd19fbc86ffb1 (diff) | |
| download | olio-uboot-2014.01-05e2421388857fdd265e1e00c1f0e37b1d72fa97.tar.xz olio-uboot-2014.01-05e2421388857fdd265e1e00c1f0e37b1d72fa97.zip | |
Updated memory configuration(NAND and DDR). Removed led.c from board init. Simplified bootcommand procedure
Diffstat (limited to 'board/olio/h1/h1.c')
| -rw-r--r-- | board/olio/h1/h1.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c index be5d43064..defdf01e4 100644 --- a/board/olio/h1/h1.c +++ b/board/olio/h1/h1.c @@ -24,6 +24,7 @@ #include <asm/errno.h> #include "h1.h" #include <command.h> +#include <power/tps65910.h> DECLARE_GLOBAL_DATA_PTR; @@ -60,19 +61,11 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) identify_nand_chip(&pop_mfr, &pop_id); timings->mr = MICRON_V_MR_165; - if (pop_mfr == 0) { - /* 256MB DDR */ - timings->mcfg = MICRON_V_MCFG_200(256 << 20); - timings->ctrla = MICRON_V_ACTIMA_200; - timings->ctrlb = MICRON_V_ACTIMB_200; - timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz; - } else { - /* Assume 128MB and Micron/165MHz timings to be safe */ - timings->mcfg = MICRON_V_MCFG_165(128 << 20); - timings->ctrla = MICRON_V_ACTIMA_165; - timings->ctrlb = MICRON_V_ACTIMB_165; - timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; - } + /* 128MB DDR */ + timings->mcfg = MICRON_V_MCFG_200(128 << 20); + timings->ctrla = MICRON_V_ACTIMA_200; + timings->ctrlb = MICRON_V_ACTIMB_200; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz; } #endif @@ -89,18 +82,8 @@ int misc_init_r(void) /* Enable i2c2 pullup resisters */ writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1); printf("Olio H1\n"); - MUX_BEAGLE_XM(); - - /* Set GPIO states before they are made outputs */ - writel(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1, - &gpio6_base->setdataout); - writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); - /* Configure GPIOs to output */ - writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); - writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe); + MUX_BEAGLE_XM(); dieid_num_r(); |