Patchwork [4/6] pseries: Add a phandle to the xicp interrupt controller device tree node

login
register
mail settings
Submitter David Gibson
Date Aug. 4, 2011, 7:02 a.m.
Message ID <1312441339-22477-5-git-send-email-david@gibson.dropbear.id.au>
Download mbox | patch
Permalink /patch/108352/
State New
Headers show

Comments

David Gibson - Aug. 4, 2011, 7:02 a.m.
Future devices we will be adding to the pseries machine (e.g. PCI) will
need nodes in the device tree which explicitly reference the top-level
interrupt controller via interrupt-parent or interrupt-map properties.

In order to do this, the interrupt controller node needs an assigned
phandle.  This patch adds the appropriate property, in preparation.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/spapr.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/spapr.c b/hw/spapr.c
index 109b774..bc15b5c 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -54,6 +54,8 @@ 
 #define MAX_CPUS                256
 #define XICS_IRQS		1024
 
+#define PHANDLE_XICP            0x00001111
+
 sPAPREnvironment *spapr;
 
 static void *spapr_create_fdt_skel(const char *cpu_model,
@@ -199,6 +201,9 @@  static void *spapr_create_fdt_skel(const char *cpu_model,
     _FDT((fdt_property(fdt, "ibm,interrupt-server-ranges",
                        interrupt_server_ranges_prop,
                        sizeof(interrupt_server_ranges_prop))));
+    _FDT((fdt_property_cell(fdt, "#interrupt-cells", 2)));
+    _FDT((fdt_property_cell(fdt, "linux,phandle", PHANDLE_XICP)));
+    _FDT((fdt_property_cell(fdt, "phandle", PHANDLE_XICP)));
 
     _FDT((fdt_end_node(fdt)));