diff options
| author | Tom Rini <trini@ti.com> | 2014-12-30 12:17:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-30 12:17:18 -0500 |
| commit | 5523cc2b8aa01c81c1df476e4e466d418510eae3 (patch) | |
| tree | ebd59e72a6cb4c0f6b56aee8938bc3309ec0dad0 /board/kosagi/novena/novena_spl.c | |
| parent | f23041a38afd302db862fbbceb81b05590579c40 (diff) | |
| parent | 87e47e905887b91c0505495cc6bbab70ba266d51 (diff) | |
| download | talos-obmc-uboot-5523cc2b8aa01c81c1df476e4e466d418510eae3.tar.gz talos-obmc-uboot-5523cc2b8aa01c81c1df476e4e466d418510eae3.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/kosagi/novena/novena_spl.c')
| -rw-r--r-- | board/kosagi/novena/novena_spl.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c index c07735ad03..b1688e0295 100644 --- a/board/kosagi/novena/novena_spl.c +++ b/board/kosagi/novena/novena_spl.c @@ -25,6 +25,8 @@ #include <asm/arch/mx6-ddr.h> +#include "novena.h" + DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL \ @@ -68,14 +70,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) -#define NOVENA_AUDIO_PWRON IMX_GPIO_NR(5, 17) -#define NOVENA_FPGA_RESET_N_GPIO IMX_GPIO_NR(5, 7) -#define NOVENA_HDMI_GHOST_HPD IMX_GPIO_NR(5, 4) -#define NOVENA_PCIE_RESET_GPIO IMX_GPIO_NR(3, 29) -#define NOVENA_PCIE_POWER_ON_GPIO IMX_GPIO_NR(7, 12) -#define NOVENA_PCIE_WAKE_UP_GPIO IMX_GPIO_NR(3, 22) -#define NOVENA_PCIE_DISABLE_GPIO IMX_GPIO_NR(2, 16) - /* * Audio */ @@ -392,6 +386,13 @@ static void novena_spl_setup_iomux_uart(void) static iomux_v3_cfg_t hdmi_pads[] = { /* "Ghost HPD" pin */ MX6_PAD_EIM_A24__GPIO5_IO04 | MUX_PAD_CTRL(NO_PAD_CTRL), + + /* LCD_PWR_CTL */ + MX6_PAD_CSI0_DAT10__GPIO5_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL), + /* LCD_BL_ON */ + MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL), + /* GPIO_PWM1 */ + MX6_PAD_DISP0_DAT8__GPIO4_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL), }; static void novena_spl_setup_iomux_video(void) |
