Commit 2d779b39 authored by Marek Vasut's avatar Marek Vasut

arm: socfpga: system: Clean up pinmux_config.c

Implement new accessor, sysmgr_get_pinmux_table(), used to obtain pinmux
table and it's size from the QTS-generated pinmux_config.c. The target
here is again to get rid of poluting global namespace by including the
pinmux_config.h into it.

Furthermore, the pinmux_config.h declares some CONFIG_HPS_* macros,
which are explicitly useless to us in U-Boot. Instead, U-Boot does
use DT to detect exactly these configuration options. This patch
makes sure that while this QTS-generated file can stay in the tree,
these obscure macros do not ooze into the namespace anymore.
Signed-off-by: default avatarMarek Vasut <marex@denx.de>
parent 40687b4f
......@@ -12,9 +12,8 @@
void sysmgr_pinmux_init(void);
void sysmgr_config_warmrstcfgio(int enable);
/* declaration for handoff table type */
extern unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM];
void sysmgr_get_pinmux_table(const unsigned long **table,
unsigned int *table_len);
#endif
struct socfpga_system_manager {
......
......@@ -57,9 +57,13 @@ static void populate_sysmgr_fpgaintf_module(void)
void sysmgr_pinmux_init(void)
{
uint32_t regs = (uint32_t)&sysmgr_regs->emacio[0];
const unsigned long *sys_mgr_init_table;
unsigned int len;
int i;
for (i = 0; i < ARRAY_SIZE(sys_mgr_init_table); i++) {
sysmgr_get_pinmux_table(&sys_mgr_init_table, &len);
for (i = 0; i < len; i++) {
writel(sys_mgr_init_table[i], regs);
regs += sizeof(regs);
}
......
......@@ -7,4 +7,4 @@
#
obj-y := socfpga.o wrap_pll_config.o
obj-$(CONFIG_SPL_BUILD) += qts/ wrap_iocsr_config.o
obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o
#
# (C) Copyright 2015 Marek Vasut <marex@denx.de>
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += pinmux_config.o
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <errno.h>
/*
* Yes, dear reader, we're including a C file here, this is no mistake.
* But this time around, we do even more perverse hacking here to be
* compatible with QTS headers and obtain reasonably nice results too.
*
* First, we define _PRELOADER_PINMUX_CONFIG_H_, which will neutralise
* the pinmux_config.h inclusion in pinmux_config.c . Since we are
* probing everything from DT, we do NOT want those macros from the
* pinmux_config.h to ooze into our build system, anywhere, ever. So
* we nip it at the bud.
*
* Next, pinmux_config.c needs CONFIG_HPS_PINMUX_NUM and uses it to
* specify sized array explicitly. Instead, we want to use ARRAY_SIZE
* to figure out the size of the array, so define this macro as an
* empty one, so that the preprocessor optimizes things such that the
* arrays are not sized by default.
*/
#define _PRELOADER_PINMUX_CONFIG_H_
#define CONFIG_HPS_PINMUX_NUM
#include "qts/pinmux_config.c"
void sysmgr_get_pinmux_table(const unsigned long **table,
unsigned int *table_len)
{
*table = sys_mgr_init_table;
*table_len = ARRAY_SIZE(sys_mgr_init_table);
}
......@@ -7,7 +7,6 @@
#define __CONFIG_SOCFPGA_ARRIA5_H__
#include <asm/arch/socfpga_base_addrs.h>
#include "../../board/altera/socfpga/qts/pinmux_config.h"
/* U-Boot Commands */
#define CONFIG_SYS_NO_FLASH
......
......@@ -7,7 +7,6 @@
#define __CONFIG_SOCFPGA_CYCLONE5_H__
#include <asm/arch/socfpga_base_addrs.h>
#include "../../board/altera/socfpga/qts/pinmux_config.h"
/* U-Boot Commands */
#define CONFIG_SYS_NO_FLASH
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment