/*
- * (C) Copyright 2007
+ * (C) Copyright 2007-2008
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this
* MA 02111-1307 USA
*/
-/* define DEBUG for debugging output (obviously ;-)) */
-#if 0
-#define DEBUG
-#endif
-
#include <common.h>
#include <watchdog.h>
#include <command.h>
#include <asm/cache.h>
#include <ppc4xx.h>
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
#include <libfdt.h>
#include <libfdt_env.h>
#include <fdt_support.h>
+#include <asm/4xx_pcie.h>
DECLARE_GLOBAL_DATA_PTR;
+void __ft_board_setup(void *blob, bd_t *bd)
+{
+ u32 val[4];
+ int rc;
+
+ ft_cpu_setup(blob, bd);
+
+ /* Fixup NOR mapping */
+ val[0] = 0; /* chip select number */
+ val[1] = 0; /* always 0 */
+ val[2] = gd->bd->bi_flashstart;
+ val[3] = gd->bd->bi_flashsize;
+ if (fdt_path_offset(blob, "/plb/opb/ebc") >= 0) {
+ rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges",
+ val, sizeof(val), 1);
+ } else {
+ /*
+ * Some 405 PPC's have EBC as direct PLB child in the dts
+ */
+ rc = fdt_find_and_setprop(blob, "/plb/ebc", "ranges",
+ val, sizeof(val), 1);
+ }
+ if (rc)
+ printf("Unable to update property NOR mapping, err=%s\n",
+ fdt_strerror(rc));
+}
+void ft_board_setup(void *blob, bd_t *bd) __attribute__((weak, alias("__ft_board_setup")));
+
/*
- * The aliases needed for this generic etherne MAC address
- * fixup function are not in place yet. So don't use this
- * approach for now. This will be enabled later.
+ * Fixup all PCIe nodes by setting the device_type property
+ * to "pci-endpoint" instead is "pci" for endpoint ports.
+ * This property will get checked later by the Linux driver
+ * to properly configure the PCIe port in Linux (again).
*/
-#undef USES_FDT_ALIASES
-
-#ifndef USES_FDT_ALIASES
-static void do_fixup_macaddr(void *fdt, int offset, const void *val, int i)
+void fdt_pcie_setup(void *blob)
{
+ const char *compat = "ibm,plb-pciex";
+ const char *prop = "device_type";
+ const char *prop_val = "pci-endpoint";
+ const u32 *port;
+ int no;
int rc;
- debug("Updating node EMAC%d\n", i);
+ /* Search first PCIe node */
+ no = fdt_node_offset_by_compatible(blob, -1, compat);
+ while (no != -FDT_ERR_NOTFOUND) {
+ port = fdt_getprop(blob, no, "port", NULL);
+ if (port == NULL) {
+ printf("WARNING: could not find port property\n");
+ } else {
+ if (is_end_point(*port)) {
+ rc = fdt_setprop(blob, no, prop, prop_val,
+ strlen(prop_val) + 1);
+ if (rc < 0)
+ printf("WARNING: could not set %s for %s: %s.\n",
+ prop, compat, fdt_strerror(rc));
+ }
+ }
- rc = fdt_setprop(fdt, offset, "mac-address", val, 6);
- if (rc)
- printf("Unable to update property %s, err=%s\n",
- "mac-address", fdt_strerror(rc));
- rc = fdt_setprop(fdt, offset, "local-mac-address", val, 6);
- if (rc)
- printf("Unable to update property %s, err=%s\n",
- "local-mac-address", fdt_strerror(rc));
+ /* Jump to next PCIe node */
+ no = fdt_node_offset_by_compatible(blob, no, compat);
+ }
}
-#endif /* USES_FDT_ALIASES */
void ft_cpu_setup(void *blob, bd_t *bd)
{
- char *cpu_path = "/cpus/" OF_CPU;
sys_info_t sys_info;
- int offset;
- int i;
get_sys_info(&sys_info);
- do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", bd->bi_intfreq, 1);
- do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
+ do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, "timebase-frequency",
+ bd->bi_intfreq, 1);
+ do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, "clock-frequency",
+ bd->bi_intfreq, 1);
do_fixup_by_path_u32(blob, "/plb", "clock-frequency", sys_info.freqPLB, 1);
do_fixup_by_path_u32(blob, "/plb/opb", "clock-frequency", sys_info.freqOPB, 1);
- do_fixup_by_path_u32(blob, "/plb/opb/ebc", "clock-frequency",
- sys_info.freqEBC, 1);
+
+ if (fdt_path_offset(blob, "/plb/opb/ebc") >= 0)
+ do_fixup_by_path_u32(blob, "/plb/opb/ebc", "clock-frequency",
+ sys_info.freqEBC, 1);
+ else
+ do_fixup_by_path_u32(blob, "/plb/ebc", "clock-frequency",
+ sys_info.freqEBC, 1);
+
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
/*
*/
do_fixup_by_compat_u32(blob, "ns16550", "clock-frequency", gd->uart_clk, 1);
-#ifdef USES_FDT_ALIASES
/*
- * The aliases needed for this generic etherne MAC address
- * fixup function are not in place yet. So don't use this
- * approach for now. This will be enabled later.
+ * Fixup all ethernet nodes
+ * Note: aliases in the dts are required for this
*/
- fdt_fixup_ethernet(blob, bd);
-#else
- offset = -1;
- for (i = 0; i < 4; i++) {
- /*
- * FIXME: This will cause problems with emac3 compatible
- * devices, like on 405GP. But hopefully when we deal
- * with those devices, the aliases stuff will be in
- * place.
- */
- offset = fdt_node_offset_by_compatible(blob, offset, "ibm,emac4");
- if (offset < 0)
- break;
-
- switch (i) {
- case 0:
- do_fixup_macaddr(blob, offset, bd->bi_enetaddr, 0);
- break;
-#ifdef CONFIG_HAS_ETH1
- case 1:
- do_fixup_macaddr(blob, offset, bd->bi_enet1addr, 1);
- break;
-#endif
-#ifdef CONFIG_HAS_ETH2
- case 2:
- do_fixup_macaddr(blob, offset, bd->bi_enet2addr, 2);
- break;
-#endif
-#ifdef CONFIG_HAS_ETH3
- case 3:
- do_fixup_macaddr(blob, offset, bd->bi_enet3addr, 3);
- break;
-#endif
- }
- }
-#endif /* USES_FDT_ALIASES */
+ fdt_fixup_ethernet(blob);
+
+ /*
+ * Fixup all available PCIe nodes by setting the device_type property
+ */
+ fdt_pcie_setup(blob);
}
-#endif /* CONFIG_OF_LIBFDT */
+#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */
projects / u-boot / blobdiff