summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/karo-tx28/tx28-stk5.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/karo-tx28/tx28-stk5.c')
-rw-r--r--arch/arm/boards/karo-tx28/tx28-stk5.c34
1 files changed, 11 insertions, 23 deletions
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index 8628db2b25..d1fd526c00 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -1,16 +1,5 @@
-/*
- * Copyright (C) 2010 Juergen Beisert, Pengutronix <kernel@pengutronix.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.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2010 Juergen Beisert <kernel@pengutronix.de>, Pengutronix
#include <common.h>
#include <init.h>
@@ -25,13 +14,14 @@
#include <asm/sections.h>
#include <asm/barebox-arm.h>
#include <linux/err.h>
-#include <mach/imx-regs.h>
-#include <mach/clock.h>
-#include <mach/mci.h>
-#include <mach/fb.h>
-#include <mach/ocotp.h>
-#include <mach/iomux.h>
-#include <generated/mach-types.h>
+#include <mach/mxs/imx-regs.h>
+#include <mach/mxs/mci.h>
+#include <mach/mxs/fb.h>
+#include <mach/mxs/ocotp.h>
+#include <mach/mxs/iomux.h>
+#include <asm/mach-types.h>
+
+#include "tx28.h"
static struct mxs_mci_platform_data mci_pdata = {
.caps = MMC_CAP_4_BIT_DATA,
@@ -344,9 +334,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 void tx28_get_ethaddr(void)