fdt: move fsl specific code from common fdt area to mpc8xxx/fdt.c
Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kim Phillips
Kumar Gala
parent
d6f324d03d
commit
5d0c3b57b2
1
Makefile
1
Makefile
|
|
@ -221,6 +221,7 @@ LIBS += drivers/power/libpower.a
|
|||
LIBS += drivers/spi/libspi.a
|
||||
ifeq ($(CPU),mpc83xx)
|
||||
LIBS += drivers/qe/qe.a
|
||||
LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.a
|
||||
endif
|
||||
ifeq ($(CPU),mpc85xx)
|
||||
LIBS += drivers/qe/qe.a
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright 2009 Freescale Semiconductor, Inc.
|
||||
# Copyright 2009-2010 Freescale Semiconductor, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
|
|
@ -10,9 +10,12 @@ include $(TOPDIR)/config.mk
|
|||
|
||||
LIB = $(obj)lib8xxx.a
|
||||
|
||||
ifneq ($(CPU),mpc83xx)
|
||||
COBJS-y += cpu.o
|
||||
COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
|
||||
COBJS-$(CONFIG_PCI) += pci_cfg.o
|
||||
endif
|
||||
|
||||
COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
|
||||
|
||||
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2009 Freescale Semiconductor, Inc.
|
||||
* Copyright 2009-2010 Freescale Semiconductor, Inc.
|
||||
*
|
||||
* This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
|
||||
* arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
|
||||
void ft_fixup_num_cores(void *blob) {
|
||||
int off, num_cores, del_cores;
|
||||
|
||||
|
|
@ -53,3 +54,133 @@ void ft_fixup_num_cores(void *blob) {
|
|||
debug ("deleted %d extra core entry entries from device tree\n",
|
||||
del_cores);
|
||||
}
|
||||
#endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
|
||||
|
||||
#ifdef CONFIG_HAS_FSL_DR_USB
|
||||
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
|
||||
{
|
||||
char *mode;
|
||||
char *type;
|
||||
const char *compat = "fsl-usb2-dr";
|
||||
const char *prop_mode = "dr_mode";
|
||||
const char *prop_type = "phy_type";
|
||||
int node_offset;
|
||||
int err;
|
||||
|
||||
mode = getenv("usb_dr_mode");
|
||||
type = getenv("usb_phy_type");
|
||||
if (!mode && !type)
|
||||
return;
|
||||
|
||||
node_offset = fdt_node_offset_by_compatible(blob, 0, compat);
|
||||
if (node_offset < 0) {
|
||||
printf("WARNING: could not find compatible node %s: %s.\n",
|
||||
compat, fdt_strerror(node_offset));
|
||||
return;
|
||||
}
|
||||
|
||||
if (mode) {
|
||||
err = fdt_setprop(blob, node_offset, prop_mode, mode,
|
||||
strlen(mode) + 1);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set %s for %s: %s.\n",
|
||||
prop_mode, compat, fdt_strerror(err));
|
||||
}
|
||||
|
||||
if (type) {
|
||||
err = fdt_setprop(blob, node_offset, prop_type, type,
|
||||
strlen(type) + 1);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set %s for %s: %s.\n",
|
||||
prop_type, compat, fdt_strerror(err));
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_HAS_FSL_DR_USB */
|
||||
|
||||
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
|
||||
/*
|
||||
* update crypto node properties to a specified revision of the SEC
|
||||
* called with sec_rev == 0 if not on an mpc8xxxE processor
|
||||
*/
|
||||
void fdt_fixup_crypto_node(void *blob, int sec_rev)
|
||||
{
|
||||
const struct sec_rev_prop {
|
||||
u32 sec_rev;
|
||||
u32 num_channels;
|
||||
u32 channel_fifo_len;
|
||||
u32 exec_units_mask;
|
||||
u32 descriptor_types_mask;
|
||||
} sec_rev_prop_list [] = {
|
||||
{ 0x0200, 4, 24, 0x07e, 0x01010ebf }, /* SEC 2.0 */
|
||||
{ 0x0201, 4, 24, 0x0fe, 0x012b0ebf }, /* SEC 2.1 */
|
||||
{ 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */
|
||||
{ 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */
|
||||
{ 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */
|
||||
{ 0x0301, 4, 24, 0xbfe, 0x03ab0ebf }, /* SEC 3.1 */
|
||||
{ 0x0303, 4, 24, 0x97c, 0x03a30abf }, /* SEC 3.3 */
|
||||
};
|
||||
char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) *
|
||||
sizeof("fsl,secX.Y")];
|
||||
int crypto_node, sec_idx, err;
|
||||
char *p;
|
||||
u32 val;
|
||||
|
||||
/* locate crypto node based on lowest common compatible */
|
||||
crypto_node = fdt_node_offset_by_compatible(blob, -1, "fsl,sec2.0");
|
||||
if (crypto_node == -FDT_ERR_NOTFOUND)
|
||||
return;
|
||||
|
||||
/* delete it if not on an E-processor */
|
||||
if (crypto_node > 0 && !sec_rev) {
|
||||
fdt_del_node(blob, crypto_node);
|
||||
return;
|
||||
}
|
||||
|
||||
/* else we got called for possible uprev */
|
||||
for (sec_idx = 0; sec_idx < ARRAY_SIZE(sec_rev_prop_list); sec_idx++)
|
||||
if (sec_rev_prop_list[sec_idx].sec_rev == sec_rev)
|
||||
break;
|
||||
|
||||
if (sec_idx == ARRAY_SIZE(sec_rev_prop_list)) {
|
||||
puts("warning: unknown SEC revision number\n");
|
||||
return;
|
||||
}
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].num_channels);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,num-channels", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].descriptor_types_mask);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,descriptor-types-mask", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].exec_units_mask);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,exec-units-mask", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].channel_fifo_len);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,channel-fifo-len", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = 0;
|
||||
while (sec_idx >= 0) {
|
||||
p = compat_strlist + val;
|
||||
val += sprintf(p, "fsl,sec%d.%d",
|
||||
(sec_rev_prop_list[sec_idx].sec_rev & 0xff00) >> 8,
|
||||
sec_rev_prop_list[sec_idx].sec_rev & 0x00ff) + 1;
|
||||
sec_idx--;
|
||||
}
|
||||
err = fdt_setprop(blob, crypto_node, "compatible", &compat_strlist, val);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
}
|
||||
#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */
|
||||
|
|
|
|||
|
|
@ -474,135 +474,6 @@ void fdt_fixup_ethernet(void *fdt)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HAS_FSL_DR_USB
|
||||
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
|
||||
{
|
||||
char *mode;
|
||||
char *type;
|
||||
const char *compat = "fsl-usb2-dr";
|
||||
const char *prop_mode = "dr_mode";
|
||||
const char *prop_type = "phy_type";
|
||||
int node_offset;
|
||||
int err;
|
||||
|
||||
mode = getenv("usb_dr_mode");
|
||||
type = getenv("usb_phy_type");
|
||||
if (!mode && !type)
|
||||
return;
|
||||
|
||||
node_offset = fdt_node_offset_by_compatible(blob, 0, compat);
|
||||
if (node_offset < 0) {
|
||||
printf("WARNING: could not find compatible node %s: %s.\n",
|
||||
compat, fdt_strerror(node_offset));
|
||||
return;
|
||||
}
|
||||
|
||||
if (mode) {
|
||||
err = fdt_setprop(blob, node_offset, prop_mode, mode,
|
||||
strlen(mode) + 1);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set %s for %s: %s.\n",
|
||||
prop_mode, compat, fdt_strerror(err));
|
||||
}
|
||||
|
||||
if (type) {
|
||||
err = fdt_setprop(blob, node_offset, prop_type, type,
|
||||
strlen(type) + 1);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set %s for %s: %s.\n",
|
||||
prop_type, compat, fdt_strerror(err));
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_HAS_FSL_DR_USB */
|
||||
|
||||
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
|
||||
/*
|
||||
* update crypto node properties to a specified revision of the SEC
|
||||
* called with sec_rev == 0 if not on an mpc8xxxE processor
|
||||
*/
|
||||
void fdt_fixup_crypto_node(void *blob, int sec_rev)
|
||||
{
|
||||
const struct sec_rev_prop {
|
||||
u32 sec_rev;
|
||||
u32 num_channels;
|
||||
u32 channel_fifo_len;
|
||||
u32 exec_units_mask;
|
||||
u32 descriptor_types_mask;
|
||||
} sec_rev_prop_list [] = {
|
||||
{ 0x0200, 4, 24, 0x07e, 0x01010ebf }, /* SEC 2.0 */
|
||||
{ 0x0201, 4, 24, 0x0fe, 0x012b0ebf }, /* SEC 2.1 */
|
||||
{ 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */
|
||||
{ 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */
|
||||
{ 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */
|
||||
{ 0x0301, 4, 24, 0xbfe, 0x03ab0ebf }, /* SEC 3.1 */
|
||||
{ 0x0303, 4, 24, 0x97c, 0x03a30abf }, /* SEC 3.3 */
|
||||
};
|
||||
char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) *
|
||||
sizeof("fsl,secX.Y")];
|
||||
int crypto_node, sec_idx, err;
|
||||
char *p;
|
||||
u32 val;
|
||||
|
||||
/* locate crypto node based on lowest common compatible */
|
||||
crypto_node = fdt_node_offset_by_compatible(blob, -1, "fsl,sec2.0");
|
||||
if (crypto_node == -FDT_ERR_NOTFOUND)
|
||||
return;
|
||||
|
||||
/* delete it if not on an E-processor */
|
||||
if (crypto_node > 0 && !sec_rev) {
|
||||
fdt_del_node(blob, crypto_node);
|
||||
return;
|
||||
}
|
||||
|
||||
/* else we got called for possible uprev */
|
||||
for (sec_idx = 0; sec_idx < ARRAY_SIZE(sec_rev_prop_list); sec_idx++)
|
||||
if (sec_rev_prop_list[sec_idx].sec_rev == sec_rev)
|
||||
break;
|
||||
|
||||
if (sec_idx == ARRAY_SIZE(sec_rev_prop_list)) {
|
||||
puts("warning: unknown SEC revision number\n");
|
||||
return;
|
||||
}
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].num_channels);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,num-channels", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].descriptor_types_mask);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,descriptor-types-mask", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].exec_units_mask);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,exec-units-mask", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].channel_fifo_len);
|
||||
err = fdt_setprop(blob, crypto_node, "fsl,channel-fifo-len", &val, 4);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
|
||||
val = 0;
|
||||
while (sec_idx >= 0) {
|
||||
p = compat_strlist + val;
|
||||
val += sprintf(p, "fsl,sec%d.%d",
|
||||
(sec_rev_prop_list[sec_idx].sec_rev & 0xff00) >> 8,
|
||||
sec_rev_prop_list[sec_idx].sec_rev & 0x00ff) + 1;
|
||||
sec_idx--;
|
||||
}
|
||||
err = fdt_setprop(blob, crypto_node, "compatible", &compat_strlist, val);
|
||||
if (err < 0)
|
||||
printf("WARNING: could not set crypto property: %s\n",
|
||||
fdt_strerror(err));
|
||||
}
|
||||
#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */
|
||||
|
||||
/* Resize the fdt to its actual size + a bit of padding */
|
||||
int fdt_resize(void *blob)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue