Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / el / el6x / el6x.c

diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index cbe355a600a3eb21add00e3f3490305701fed01d..b2fe7fd291eada938dfbf7e11aaf6677c56ab78f 100644 (file)
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
+#include <input.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <asm/arch/mx6-ddr.h>
@@ -466,7 +467,7 @@ int board_late_init(void)
        add_board_boot_modes(board_boot_modes);
 #endif
 
-       setenv("board_name", BOARD_NAME);
+       env_set("board_name", BOARD_NAME);
        return 0;
 }
 
@@ -570,17 +571,6 @@ static void ccgr_init(void)
        writel(0x000003FF, &ccm->CCGR6);
 }
 
-static void gpr_init(void)
-{
-       struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
-
-       /* enable AXI cache for VDOA/VPU/IPU */
-       writel(0xF00000CF, &iomux->gpr[4]);
-       /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-       writel(0x007F007F, &iomux->gpr[6]);
-       writel(0x007F007F, &iomux->gpr[7]);
-}
-
 /*
  * This section requires the differentiation between iMX6 Sabre boards, but
  * for now, it will configure only for the mx6q variant.