diff options
Diffstat (limited to 'arch/arm/boards/freescale-mx23-evk/mx23-evk.c')
-rw-r--r-- | arch/arm/boards/freescale-mx23-evk/mx23-evk.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index 75a7d5a6b4..d4de99eafb 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c @@ -1,18 +1,6 @@ -/* - * (C) Copyright 2010 Juergen Beisert - Pengutronix - * (C) Copyright 2011 Wolfram Sang - Pengutronix - * - * 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. - * - */ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2010 Juergen Beisert, Pengutronix +// SPDX-FileCopyrightText: 2011 Wolfram Sang, Pengutronix #include <common.h> #include <init.h> @@ -21,14 +9,13 @@ #include <mci.h> #include <linux/err.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> +#include <asm/mach-types.h> #include <asm/barebox-arm.h> -#include <mach/imx-regs.h> -#include <mach/clock.h> -#include <mach/mci.h> -#include <usb/fsl_usb2.h> -#include <mach/usb.h> -#include <mach/iomux.h> +#include <mach/mxs/imx-regs.h> +#include <mach/mxs/mci.h> +#include <linux/usb/fsl_usb2.h> +#include <mach/mxs/usb.h> +#include <mach/mxs/iomux.h> static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, @@ -91,9 +78,7 @@ static int register_persistent_environment(void) /* use the full partition as our persistent environment storage */ cdev = devfs_add_partition("disk0.1", 0, cdev->size, DEVFS_PARTITION_FIXED, "env0"); - if (IS_ERR(cdev)) - return PTR_ERR(cdev); - return 0; + return PTR_ERR_OR_ZERO(cdev); } static int mx23_evk_devices_init(void) |