From d788b6db26ae05368c119fbe0f988daa277948b1 Mon Sep 17 00:00:00 2001 From: Christian Krafft Date: Thu, 23 Aug 2007 03:01:25 +1000 Subject: [PATCH] --- yaml --- r: 64459 b: refs/heads/master c: fa7f374bbf6d8e5fc7dd281a62498041066aaf43 h: refs/heads/master i: 64457: 06b3d2e9f3e6ee92a2c193b1604fb1efda83539c 64455: e2e065c92e511f6dac0a4cbfb47742727df4131c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/cbe_thermal.c | 6 +----- trunk/arch/powerpc/platforms/cell/spu_manage.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fcf97d8eef5f..9f713b0a4aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfa70f81a05fa857fb1428ac2a88da84ecd50dd9 +refs/heads/master: fa7f374bbf6d8e5fc7dd281a62498041066aaf43 diff --git a/trunk/arch/powerpc/platforms/cell/cbe_thermal.c b/trunk/arch/powerpc/platforms/cell/cbe_thermal.c index e4132f8f51b3..fb5eda48467d 100644 --- a/trunk/arch/powerpc/platforms/cell/cbe_thermal.c +++ b/trunk/arch/powerpc/platforms/cell/cbe_thermal.c @@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev) /* returns the value for a given spu in a given register */ static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg) { - const unsigned int *id; union spe_reg value; struct spu *spu; - /* getting the id from the reg attribute will not work on future device-tree layouts - * in future we should store the id to the spu struct and use it here */ spu = container_of(sysdev, struct spu, sysdev); - id = of_get_property(spu_devnode(spu), "reg", NULL); value.val = in_be64(®->val); - return value.spe[*id]; + return value.spe[spu->spe_id]; } static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf) diff --git a/trunk/arch/powerpc/platforms/cell/spu_manage.c b/trunk/arch/powerpc/platforms/cell/spu_manage.c index 5eb88346181a..7c0668a9dcc7 100644 --- a/trunk/arch/powerpc/platforms/cell/spu_manage.c +++ b/trunk/arch/powerpc/platforms/cell/spu_manage.c @@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node *spe) { const unsigned int *prop; int proplen; - prop = of_get_property(spe, "unit-id", &proplen); + prop = of_get_property(spe, "physical-id", &proplen); if (proplen == 4) return (u64)*prop;