hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[POWERPC] mv64x60: Remove device tree absolute path references 

Replace several device node absolute path lookups in the mv64x60
bootwrapper code with lookups by compatible or device_type
properties.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Acked-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Dale Farnsworth 2008-04-08 08:09:51 +10:00 committed by Paul Mackerras
parent a1810b44c2
commit a05ce88ab3
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/boot/mv64x60.c
View File

@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)
u32 v[2]; u32 v[2];
void *devp; void *devp;
devp = finddevice("/mv64x60"); devp = find_node_by_compatible(NULL, "marvell,mv64360");
if (devp == NULL) if (devp == NULL)
goto err_out; goto err_out;
if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v)) if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))
@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void)
u32 v; u32 v;
void *devp; void *devp;
devp = finddevice("/mv64x60"); devp = find_node_by_compatible(NULL, "marvell,mv64360");
if (devp == NULL) if (devp == NULL)
goto err_out; goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))

2
arch/powerpc/boot/mv64x60_i2c.c
View File

@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)
u32 v; u32 v;
void *devp; void *devp;
devp = finddevice("/mv64x60/i2c"); devp = find_node_by_compatible(NULL, "marvell,mv64360-i2c");
if (devp == NULL) if (devp == NULL)
goto err_out; goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))

23
arch/powerpc/boot/prpmc2800.c
View File

@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 mem_size)
acc_bits); acc_bits);
/* Get the cpu -> pci i/o & mem mappings from the device tree */ /* Get the cpu -> pci i/o & mem mappings from the device tree */
devp = finddevice("/mv64x60/pci@80000000"); devp = find_node_by_compatible(NULL, "marvell,mv64360-pci");
if (devp == NULL) if (devp == NULL)
fatal("Error: Missing /mv64x60/pci@80000000" fatal("Error: Missing marvell,mv64360-pci"
" device tree node\n\r"); " device tree node\n\r");
rc = getprop(devp, "ranges", v, sizeof(v)); rc = getprop(devp, "ranges", v, sizeof(v));
if (rc != sizeof(v)) if (rc != sizeof(v))
fatal("Error: Can't find /mv64x60/pci@80000000/ranges" fatal("Error: Can't find marvell,mv64360-pci ranges"
" property\n\r"); " property\n\r");
/* Get the cpu -> pci i/o & mem mappings from the device tree */ /* Get the cpu -> pci i/o & mem mappings from the device tree */
devp = finddevice("/mv64x60"); devp = find_node_by_compatible(NULL, "marvell,mv64360");
if (devp == NULL) if (devp == NULL)
fatal("Error: Missing /mv64x60 device tree node\n\r"); fatal("Error: Missing marvell,mv64360 device tree node\n\r");
enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE)); enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
enables |= 0x0007fe00; /* Disable all cpu->pci windows */ enables |= 0x0007fe00; /* Disable all cpu->pci windows */
@ -429,9 +429,9 @@ static void prpmc2800_fixups(void)
setprop(devp, "model", model, l); setprop(devp, "model", model, l);
/* Set /cpus/PowerPC,7447/clock-frequency */ /* Set /cpus/PowerPC,7447/clock-frequency */
devp = finddevice("/cpus/PowerPC,7447"); devp = find_node_by_prop_value_str(NULL, "device_type", "cpu");
if (devp == NULL) if (devp == NULL)
fatal("Error: Missing proper /cpus device tree node\n\r"); fatal("Error: Missing proper cpu device tree node\n\r");
v[0] = bip->core_speed; v[0] = bip->core_speed;
setprop(devp, "clock-frequency", &v[0], sizeof(v[0])); setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
@ -443,16 +443,17 @@ static void prpmc2800_fixups(void)
v[1] = bip->mem_size; v[1] = bip->mem_size;
setprop(devp, "reg", v, sizeof(v)); setprop(devp, "reg", v, sizeof(v));
/* Update /mv64x60/model, if this is a mv64362 */ /* Update model, if this is a mv64362 */
if (bip->bridge_type == BRIDGE_TYPE_MV64362) { if (bip->bridge_type == BRIDGE_TYPE_MV64362) {
devp = finddevice("/mv64x60"); devp = find_node_by_compatible(NULL, "marvell,mv64360");
if (devp == NULL) if (devp == NULL)
fatal("Error: Missing /mv64x60 device tree node\n\r"); fatal("Error: Missing marvell,mv64360"
" device tree node\n\r");
setprop(devp, "model", "mv64362", strlen("mv64362") + 1); setprop(devp, "model", "mv64362", strlen("mv64362") + 1);
} }
/* Set User FLASH size */ /* Set User FLASH size */
devp = finddevice("/mv64x60/flash@a0000000"); devp = find_node_by_compatible(NULL, "direct-mapped");
if (devp == NULL) if (devp == NULL)
fatal("Error: Missing User FLASH device tree node\n\r"); fatal("Error: Missing User FLASH device tree node\n\r");
rc = getprop(devp, "reg", v, sizeof(v)); rc = getprop(devp, "reg", v, sizeof(v));