← Back to branch summary

~ubuntu-branches/ubuntu/saucy/u-boot/saucy

« back to all changes in this revision

Viewing changes to board/nvidia/harmony/harmony.c

  • Committer: Package Import Robot
  • Author(s): Clint Adams
  • Date: 2012-05-01 18:07:19 UTC
  • mfrom: (16.1.23 sid)
  • Revision ID: package-import@ubuntu.com-20120501180719-rjntk3287im4a0ns
Tags: 2012.04.01-1
* New upstream version.
  - Update mipsel-native-endianness.diff.
  - Update no-error-on-set-but-unused-variables.diff (partially merged).
  - Drop kirkwood_spi-irq_mask.diff (merged).
  - Drop kirkwood-disable-l2c.diff (merged).

Show diffs side-by-side

added added

removed removed

Lines of Context:
board/nvidia/harmony/harmony.c
24
24
#include <common.h>
25
25
#include <asm/io.h>
26
26
#include <asm/arch/tegra2.h>
 
27
#include <asm/arch/clock.h>
 
28
#include <asm/arch/funcmux.h>
27
29
#include <asm/arch/pinmux.h>
 
30
#include <asm/arch/mmc.h>
28
31
#include <asm/gpio.h>
29
32
#ifdef CONFIG_TEGRA2_MMC
30
33
#include <mmc.h>
31
34
#endif
32
 
#include "../common/board.h"
33
35
 
34
36
/*
35
37
 * Routine: gpio_config_uart
46
48
 */
47
49
static void pin_mux_mmc(void)
48
50
{
49
 
        /* SDMMC4: config 3, x8 on 2nd set of pins */
50
 
        pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
51
 
        pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
52
 
        pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
53
 
 
54
 
        pinmux_tristate_disable(PINGRP_ATB);
55
 
        pinmux_tristate_disable(PINGRP_GMA);
56
 
        pinmux_tristate_disable(PINGRP_GME);
 
51
        funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
 
52
        funcmux_select(PERIPH_ID_SDMMC2, FUNCMUX_SDMMC2_DTA_DTD_8BIT);
57
53
 
58
54
        /* For power GPIO PI6 */
59
55
        pinmux_tristate_disable(PINGRP_ATA);
60
56
        /* For CD GPIO PH2 */
61
57
        pinmux_tristate_disable(PINGRP_ATD);
62
58
 
63
 
        /* SDMMC2: SDIO2_CLK, SDIO2_CMD, SDIO2_DAT[7:0] */
64
 
        pinmux_set_func(PINGRP_DTA, PMUX_FUNC_SDIO2);
65
 
        pinmux_set_func(PINGRP_DTD, PMUX_FUNC_SDIO2);
66
 
 
67
 
        pinmux_tristate_disable(PINGRP_DTA);
68
 
        pinmux_tristate_disable(PINGRP_DTD);
69
 
 
70
59
        /* For power GPIO PT3 */
71
60
        pinmux_tristate_disable(PINGRP_DTB);
72
61
        /* For CD GPIO PI5 */