diff options
Diffstat (limited to 'arch/arm/boards/phytec-phycore-omap4460')
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/board.c | 43 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/lowlevel.c | 39 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/mux.c | 12 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/mux.h | 8 |
5 files changed, 44 insertions, 60 deletions
diff --git a/arch/arm/boards/phytec-phycore-omap4460/Makefile b/arch/arm/boards/phytec-phycore-omap4460/Makefile index 5e78e11ec1..c5d3950bc3 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/Makefile +++ b/arch/arm/boards/phytec-phycore-omap4460/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += board.o lwl-y += lowlevel.o mux.o bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-phytec-phycore-omap4460 diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index b7aeeca6df..2a176f156e 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.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> @@ -22,22 +9,21 @@ #include <io.h> #include <envfs.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-devices.h> -#include <mach/omap4-clock.h> -#include <mach/omap-fb.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/devices.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-devices.h> +#include <mach/omap/omap4-clock.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/gpmc.h> +#include <mach/omap/gpmc_nand.h> #include <i2c/i2c.h> static int pcm049_console_init(void) @@ -305,8 +291,7 @@ static int pcm049_devices_init(void) armlinux_set_architecture(MACH_TYPE_PCM049); - if (IS_ENABLED(CONFIG_DRIVER_VIDEO_OMAP)) - omap_add_display(&pcm049_fb_data); + omap_add_display(&pcm049_fb_data); if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) defaultenv_append_directory(defaultenv_phytec_phycore_omap4460); diff --git a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c index 6511dae9d4..17194c6562 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c @@ -1,34 +1,21 @@ -/* - * (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> +#include "mux.h" + #define TPS62361_VSEL0_GPIO 182 #define LPDDR2_2G 0x5 #define LPDDR2_4G 0x6 @@ -38,8 +25,6 @@ #define EMIF_LPDDR2_MODE_REG_CONFIG 0x0050 #define EMIF_LPDDR2_MODE_REG_DATA 0x0040 -void set_muxconf_regs(void); - /* 512MB */ static const struct ddr_regs ddr_regs_mt42L64M64_25_400_mhz = { .tim1 = 0x0EEB0662, @@ -94,7 +79,7 @@ static void noinline pcm049_init_lowlevel(void) struct dpll_param usb = OMAP4_USB_DPLL_PARAM_19M2; unsigned int rev = omap4_revision(); - set_muxconf_regs(); + phycore_omap4460_set_muxconf_regs(); if (IS_ENABLED(CONFIG_1024MB_DDR2RAM)) { omap4_ddr_init(&ddr_regs_mt42L64M64_25_400_mhz, &core); diff --git a/arch/arm/boards/phytec-phycore-omap4460/mux.c b/arch/arm/boards/phytec-phycore-omap4460/mux.c index fda4c519b8..287c2a4826 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/mux.c +++ b/arch/arm/boards/phytec-phycore-omap4460/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 phycore_omap4460_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-phycore-omap4460/mux.h b/arch/arm/boards/phytec-phycore-omap4460/mux.h new file mode 100644 index 0000000000..c84ecd32c8 --- /dev/null +++ b/arch/arm/boards/phytec-phycore-omap4460/mux.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __BOARD_MUX_H +#define __BOARD_MUX_H + +void phycore_omap4460_set_muxconf_regs(void); + +#endif /* __BOARD_MUX_H */ |