[PATCH 0/2] ppc: minor fixups

[Mark Cave-Ayland]

Here are a couple of minor fixups which have been kicking around my
OpenBIOS git repository for a little while.

Signed-off-by: Mark Cave-Ayland

Mark Cave-Ayland (2):
  ppc: don't hardcode the system bus frequency
  macio: set correct UniNorth device revision

arch/ppc/qemu/init.c | 4 ++--
 drivers/macio.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[PATCH 1/2] ppc: don't hardcode the system bus frequency

[Mark Cave-Ayland]

The system bus frequency has been available from the QEMU fw_cfg interface for
some time, so let's use it rather than hard-coding the relevant values.

Signed-off-by: Mark Cave-Ayland 
---
 arch/ppc/qemu/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index 5ce080c..8524750 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -835,7 +835,7 @@ arch_of_init(void)
         push_str("AAPL,cpu-id");
         fword("property");

-        PUSH(66 * 1000 * 1000);
+        PUSH(fw_cfg_read_i32(FW_CFG_PPC_BUSFREQ));
         fword("encode-int");
         push_str("clock-frequency");
         fword("property");
@@ -872,7 +872,7 @@ arch_of_init(void)
         push_str("bootrom");
         fword("device-type");

-        PUSH(100 * 1000 * 1000);
+        PUSH(fw_cfg_read_i32(FW_CFG_PPC_BUSFREQ));
         fword("encode-int");
         push_str("clock-frequency");
         fword("property");

[PATCH 2/2] macio: set correct UniNorth device revision

[Mark Cave-Ayland]

Make sure that we set the device-rev property to 7 as found on a real Mac99
machine.

Signed-off-by: Mark Cave-Ayland 
---
 drivers/macio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/macio.c b/drivers/macio.c
index f54bc86..fe19091 100644
--- a/drivers/macio.c
+++ b/drivers/macio.c
@@ -240,7 +240,7 @@ ob_unin_init(void)
         dnode = find_dev("/uni-n");
         set_property(dnode, "device_type", "memory-controller", 18);
         set_property(dnode, "compatible", "uni-north", 10);
-        set_int_property(dnode, "device-rev", 0);
+        set_int_property(dnode, "device-rev", 7);
         props[0] = __cpu_to_be32(0xf8000000);
         props[1] = __cpu_to_be32(0x1000000);
         set_property(dnode, "reg", (char *)&props, sizeof(props));

[Mark Cave-Ayland]

On 06/05/18 15:04, Mark Cave-Ayland wrote:
> Here are a couple of minor fixups which have been kicking around my
> OpenBIOS git repository for a little while.
>
> Signed-off-by: Mark Cave-Ayland
>
> Mark Cave-Ayland (2):
>    ppc: don't hardcode the system bus frequency
>    macio: set correct UniNorth device revision
>
> arch/ppc/qemu/init.c | 4 ++--
>   drivers/macio.c      | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)

No further comments, so I've applied these to master.

ATB,

Mark.