summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/karo-tx6x/board.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/karo-tx6x/board.c')
-rw-r--r--arch/arm/boards/karo-tx6x/board.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c
index 2a141be61a..f964ddefd1 100644
--- a/arch/arm/boards/karo-tx6x/board.c
+++ b/arch/arm/boards/karo-tx6x/board.c
@@ -16,8 +16,8 @@
#include <linux/clk.h>
#include <linux/kernel.h>
#include <environment.h>
-#include <mach/bbu.h>
-#include <mach/imx6.h>
+#include <mach/imx/bbu.h>
+#include <mach/imx/imx6.h>
#include <mfd/imx6q-iomuxc-gpr.h>
#include "pmic.h"
@@ -112,12 +112,12 @@ static int tx6x_devices_init(void)
if (sbmr1 & (1 << 7)) {
imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
of_device_enable_and_register_by_name("environment-nand");
- of_device_enable_and_register_by_name("gpmi-nand@00112000");
+ of_device_enable_and_register_by_alias("nand");
} else {
imx6_bbu_internal_mmc_register_handler("eMMC", "/dev/mmc3.boot0",
BBU_HANDLER_FLAG_DEFAULT);
of_device_enable_and_register_by_name("environment-emmc");
- of_device_enable_and_register_by_name("usdhc@0219c000");
+ of_device_enable_and_register_by_alias("mmc3");
}