mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
QE: Move FDT support into a common file
Move the flat device tree setup for QE related devices into a common file shared between 83xx & 85xx platforms that have QE's. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
37e3c62fa0
commit
69018ce2e0
6 changed files with 99 additions and 64 deletions
|
@ -30,9 +30,6 @@
|
|||
#include <fdt_support.h>
|
||||
#include <exports.h>
|
||||
|
||||
#ifdef CONFIG_QE
|
||||
#include "../drivers/qe/qe.h"
|
||||
#endif
|
||||
/*
|
||||
* Global data (for the gd->bd)
|
||||
*/
|
||||
|
@ -617,49 +614,4 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd)
|
|||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_QE
|
||||
/*
|
||||
* If a QE firmware has been uploaded, then add the 'firmware' node under
|
||||
* the 'qe' node.
|
||||
*/
|
||||
void fdt_fixup_qe_firmware(void *fdt)
|
||||
{
|
||||
struct qe_firmware_info *qe_fw_info;
|
||||
int node, ret;
|
||||
|
||||
qe_fw_info = qe_get_firmware_info();
|
||||
if (!qe_fw_info)
|
||||
return;
|
||||
|
||||
node = fdt_path_offset(fdt, "/qe");
|
||||
if (node < 0)
|
||||
return;
|
||||
|
||||
/* We assume the node doesn't exist yet */
|
||||
node = fdt_add_subnode(fdt, node, "firmware");
|
||||
if (node < 0)
|
||||
return;
|
||||
|
||||
ret = fdt_setprop(fdt, node, "extended-modes",
|
||||
&qe_fw_info->extended_modes, sizeof(u64));
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
ret = fdt_setprop_string(fdt, node, "id", qe_fw_info->id);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
ret = fdt_setprop(fdt, node, "virtual-traps", qe_fw_info->vtraps,
|
||||
sizeof(qe_fw_info->vtraps));
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
return;
|
||||
|
||||
error:
|
||||
fdt_del_node(fdt, node);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
extern void ft_qe_setup(void *blob);
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
|
@ -48,16 +50,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
|||
do_fixup_by_prop_u32(blob, "device_type", "soc", 4,
|
||||
"bus-frequency", bd->bi_busfreq, 1);
|
||||
#ifdef CONFIG_QE
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"bus-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"brg-frequency", gd->brg_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"clock-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"bus-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"brg-frequency", gd->brg_clk, 1);
|
||||
ft_qe_setup(blob);
|
||||
#endif
|
||||
|
||||
#ifdef CFG_NS16550
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
extern void ft_qe_setup(void *blob);
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
|
||||
|
@ -43,11 +45,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
|||
do_fixup_by_prop_u32(blob, "device_type", "soc", 4,
|
||||
"bus-frequency", bd->bi_busfreq, 1);
|
||||
#ifdef CONFIG_QE
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"bus-frequency", bd->bi_busfreq, 1);
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"brg-frequency", bd->bi_busfreq / 2, 1);
|
||||
fdt_fixup_qe_firmware(blob);
|
||||
ft_qe_setup(blob);
|
||||
#endif
|
||||
|
||||
#ifdef CFG_NS16550
|
||||
|
|
|
@ -24,7 +24,8 @@ include $(TOPDIR)/config.mk
|
|||
|
||||
LIB := $(obj)qe.a
|
||||
|
||||
COBJS := qe.o uccf.o uec.o uec_phy.o
|
||||
COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
|
||||
COBJS := qe.o uccf.o uec.o uec_phy.o $(COBJS-y)
|
||||
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
|
|
90
drivers/qe/fdt.c
Normal file
90
drivers/qe/fdt.c
Normal file
|
@ -0,0 +1,90 @@
|
|||
/*
|
||||
* Copyright 2008 Freescale Semiconductor, Inc.
|
||||
*
|
||||
* (C) Copyright 2000
|
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#include "qe.h"
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
/*
|
||||
* If a QE firmware has been uploaded, then add the 'firmware' node under
|
||||
* the 'qe' node.
|
||||
*/
|
||||
void fdt_fixup_qe_firmware(void *blob)
|
||||
{
|
||||
struct qe_firmware_info *qe_fw_info;
|
||||
int node, ret;
|
||||
|
||||
qe_fw_info = qe_get_firmware_info();
|
||||
if (!qe_fw_info)
|
||||
return;
|
||||
|
||||
node = fdt_path_offset(blob, "/qe");
|
||||
if (node < 0)
|
||||
return;
|
||||
|
||||
/* We assume the node doesn't exist yet */
|
||||
node = fdt_add_subnode(blob, node, "firmware");
|
||||
if (node < 0)
|
||||
return;
|
||||
|
||||
ret = fdt_setprop(blob, node, "extended-modes",
|
||||
&qe_fw_info->extended_modes, sizeof(u64));
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
ret = fdt_setprop_string(blob, node, "id", qe_fw_info->id);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
ret = fdt_setprop(blob, node, "virtual-traps", qe_fw_info->vtraps,
|
||||
sizeof(qe_fw_info->vtraps));
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
return;
|
||||
|
||||
error:
|
||||
fdt_del_node(blob, node);
|
||||
}
|
||||
|
||||
void ft_qe_setup(void *blob)
|
||||
{
|
||||
#ifdef CONFIG_QE
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"bus-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
|
||||
"brg-frequency", gd->brg_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"clock-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"bus-frequency", gd->qe_clk, 1);
|
||||
do_fixup_by_compat_u32(blob, "fsl,qe",
|
||||
"brg-frequency", gd->brg_clk, 1);
|
||||
fdt_fixup_qe_firmware(blob);
|
||||
#endif
|
||||
}
|
|
@ -289,5 +289,6 @@ int qe_set_brg(uint brg, uint rate);
|
|||
int qe_set_mii_clk_src(int ucc_num);
|
||||
int qe_upload_firmware(const struct qe_firmware *firmware);
|
||||
struct qe_firmware_info *qe_get_firmware_info(void);
|
||||
void ft_qe_setup(void *blob);
|
||||
|
||||
#endif /* __QE_H__ */
|
||||
|
|
Loading…
Reference in a new issue