diff options
Diffstat (limited to 'arch/arm/boards/phytec-phycard-omap4')
| -rw-r--r-- | arch/arm/boards/phytec-phycard-omap4/Makefile | 18 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycard-omap4/lowlevel.c | 39 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycard-omap4/mux.c | 12 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycard-omap4/mux.h | 8 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 38 |
5 files changed, 43 insertions, 72 deletions
diff --git a/arch/arm/boards/phytec-phycard-omap4/Makefile b/arch/arm/boards/phytec-phycard-omap4/Makefile index 0fec0c7f53..0ac095becc 100644 --- a/arch/arm/boards/phytec-phycard-omap4/Makefile +++ b/arch/arm/boards/phytec-phycard-omap4/Makefile @@ -1,18 +1,6 @@ -# (C) Copyright 2012 Jan Weitzel <j.weitzel@phytec.de> -# -# See file CREDITS for list of people who contributed to this -# project. -# -# 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: 2012 Jan Weitzel <j.weitzel@phytec.de> + obj-y += pca-a-xl2.o lwl-y += mux.o lowlevel.o bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-phytec-phycard-omap4 diff --git a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c index c49c4ca841..b5906234d3 100644 --- a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c @@ -1,37 +1,22 @@ -/* - * (C) Copyright 2004-2009 - * Texas Instruments, <www.ti.com> - * Richard Woodruff <r-woodruff2@ti.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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-only +// SPDX-FileCopyrightText: 2004-2009 Richard Woodruff <r-woodruff2@ti.com>, Texas Instruments (http://www.ti.com/) + #include <common.h> #include <init.h> #include <io.h> #include <linux/sizes.h> -#include <mach/generic.h> -#include <mach/omap4-mux.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-generic.h> -#include <mach/omap4-clock.h> -#include <mach/syslib.h> +#include <mach/omap/generic.h> +#include <mach/omap/omap4-mux.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-generic.h> +#include <mach/omap/omap4-clock.h> +#include <mach/omap/syslib.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> -#define TPS62361_VSEL0_GPIO 7 +#include "mux.h" -void set_muxconf_regs(void); +#define TPS62361_VSEL0_GPIO 7 static const struct ddr_regs ddr_regs_mt42L64M64_25_400_mhz = { .tim1 = 0x0EEB0662, @@ -57,7 +42,7 @@ static noinline void pcaaxl2_init_lowlevel(void) struct dpll_param usb = OMAP4_USB_DPLL_PARAM_19M2; unsigned int rev = omap4_revision(); - set_muxconf_regs(); + phycard_omap4_set_muxconf_regs(); omap4_ddr_init(&ddr_regs_mt42L64M64_25_400_mhz, &core); diff --git a/arch/arm/boards/phytec-phycard-omap4/mux.c b/arch/arm/boards/phytec-phycard-omap4/mux.c index a31d995767..a545ca5948 100644 --- a/arch/arm/boards/phytec-phycard-omap4/mux.c +++ b/arch/arm/boards/phytec-phycard-omap4/mux.c @@ -1,9 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only + #include <common.h> #include <init.h> #include <io.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-mux.h> -#include <mach/omap4-clock.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-mux.h> +#include <mach/omap/omap4-clock.h> + +#include "mux.h" static const struct pad_conf_entry core_padconf_array[] = { {GPMC_AD0, (IEN | PTD | DIS | M0)}, /* gpmc_ad0 */ @@ -236,7 +240,7 @@ static const struct pad_conf_entry wkup_padconf_array[] = { {SYS_BOOT7, (M0)}, /* sys_boot7 */ }; -void set_muxconf_regs(void) +void phycard_omap4_set_muxconf_regs(void) { omap4_do_set_mux(OMAP44XX_CONTROL_PADCONF_CORE, core_padconf_array, ARRAY_SIZE(core_padconf_array)); diff --git a/arch/arm/boards/phytec-phycard-omap4/mux.h b/arch/arm/boards/phytec-phycard-omap4/mux.h new file mode 100644 index 0000000000..46a2434ad0 --- /dev/null +++ b/arch/arm/boards/phytec-phycard-omap4/mux.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __BOARD_MUX_H +#define __BOARD_MUX_H + +void phycard_omap4_set_muxconf_regs(void); + +#endif /* __BOARD_MUX_H */ diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c index c0e4448a00..f18f11c331 100644 --- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c +++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c @@ -1,18 +1,5 @@ -/* - * Copyright (C) 2011 Sascha Hauer, 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: 2011 Sascha Hauer, Pengutronix #include <common.h> #include <console.h> @@ -21,21 +8,20 @@ #include <io.h> #include <gpio.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <mach/omap4-silicon.h> -#include <mach/sdrc.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> -#include <mach/control.h> +#include <asm/mach-types.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/sdrc.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> +#include <mach/omap/control.h> #include <linux/err.h> #include <linux/sizes.h> -#include <partition.h> #include <nand.h> #include <asm/mmu.h> -#include <mach/gpmc.h> -#include <mach/gpmc_nand.h> -#include <mach/omap_hsmmc.h> -#include <mach/omap4-devices.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/gpmc_nand.h> +#include <mach/omap/omap_hsmmc.h> +#include <mach/omap/omap4-devices.h> #include <i2c/i2c.h> static int pcaaxl2_console_init(void) |