diff options
Diffstat (limited to 'arch/arm/boards/karo-tx6x/board.c')
| -rw-r--r-- | arch/arm/boards/karo-tx6x/board.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c index 54b1e248f4..f964ddefd1 100644 --- a/arch/arm/boards/karo-tx6x/board.c +++ b/arch/arm/boards/karo-tx6x/board.c @@ -1,19 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + /* * Copyright (C) 2014 Steffen Trumtrar, Pengutronix * - * * with the PMIC init code taken from u-boot * Copyright (C) 2012,2013 Lothar Waßmann <LW@KARO-electronics.de> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #define pr_fmt(fmt) "Karo-tx6: " fmt @@ -25,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" @@ -121,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"); } |