* [patch 5/6] Update the 83xx/85xx/86xx boards device tree
@ 2007-07-10 15:53 Zang Roy-r61911
2007-07-10 20:28 ` Segher Boessenkool
0 siblings, 1 reply; 4+ messages in thread
From: Zang Roy-r61911 @ 2007-07-10 15:53 UTC (permalink / raw)
To: Paul Mackerras, Kumar Gala; +Cc: linuxppc-dev list
From: Roy Zang <tie-fei.zang@freescale.com>
Update the 83xx/85xx/86xx boards device tree.
Indentify pci, pcie host by compatible property
"fsl,mpc83xx-pci","83xx"
"fsl,mpc85xx-pci","85xx"
"fsl,mpc86xx-pci","86xx"
and
"fsl, mpc85xx-pciex","85xx"
"fsl, mpc86xx-pciex","86xx"
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
---
arch/powerpc/boot/dts/mpc8313erdb.dts | 2 +-
arch/powerpc/boot/dts/mpc832x_mds.dts | 2 +-
arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 +-
arch/powerpc/boot/dts/mpc8349emitx.dts | 4 ++--
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 2 +-
arch/powerpc/boot/dts/mpc834x_mds.dts | 4 ++--
arch/powerpc/boot/dts/mpc836x_mds.dts | 2 +-
arch/powerpc/boot/dts/mpc8540ads.dts | 2 +-
arch/powerpc/boot/dts/mpc8541cds.dts | 4 ++--
arch/powerpc/boot/dts/mpc8555cds.dts | 4 ++--
arch/powerpc/boot/dts/mpc8560ads.dts | 2 +-
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index a1533cc..5276843 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -178,7 +178,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 4fc0c4d..ee8897b 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -154,7 +154,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 447c03f..d83469b 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -123,7 +123,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index ae9bca5..911984b 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -197,7 +197,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
@@ -222,7 +222,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8600 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index f636528..8790349 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -154,7 +154,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8600 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 310e877..dc4d97d 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -241,7 +241,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
@@ -301,7 +301,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8600 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 1e914f3..2750eb1 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -169,7 +169,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
- compatible = "83xx";
+ compatible = "fsl,mpc83xx-pci","83xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 364a969..8efea9b 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -258,7 +258,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8000 1000>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 070206f..be89d46 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -193,7 +193,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8000 1000>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
i8259@19000 {
@@ -230,7 +230,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <9000 1000>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 17e45d9..0bee322 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -193,7 +193,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <8000 1000>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
i8259@19000 {
@@ -230,7 +230,7 @@
#size-cells = <2>;
#address-cells = <3>;
reg = <9000 1000>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
};
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 21ccaaa..d0627bd 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -136,7 +136,7 @@
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
- compatible = "85xx";
+ compatible = "fsl,mpc85xx-pci","85xx";
device_type = "pci";
reg = <8000 1000>;
clock-frequency = <3f940aa>;
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index db56a02..2b36ae3 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -208,7 +208,7 @@
};
pci@8000 {
- compatible = "86xx";
+ compatible = "fsl,mpc86xx-pciex","86xx";
device_type = "pci";
#interrupt-cells = <1>;
#size-cells = <2>;
@@ -396,7 +396,7 @@
};
pci@9000 {
- compatible = "86xx";
+ compatible = "fsl,mpc86xx-pciex","86xx";
device_type = "pci";
#interrupt-cells = <1>;
#size-cells = <2>;
--
1.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch 5/6] Update the 83xx/85xx/86xx boards device tree
2007-07-10 15:53 [patch 5/6] Update the 83xx/85xx/86xx boards device tree Zang Roy-r61911
@ 2007-07-10 20:28 ` Segher Boessenkool
2007-07-11 2:53 ` Zang Roy-r61911
0 siblings, 1 reply; 4+ messages in thread
From: Segher Boessenkool @ 2007-07-10 20:28 UTC (permalink / raw)
To: Zang Roy-r61911; +Cc: linuxppc-dev list, Paul Mackerras
> Indentify pci, pcie host by compatible property
> "fsl,mpc83xx-pci","83xx"
> "fsl,mpc85xx-pci","85xx"
> "fsl,mpc86xx-pci","86xx"
> and
> "fsl, mpc85xx-pciex","85xx"
> "fsl, mpc86xx-pciex","86xx"
This can't ever work -- if you see "compatible" = "85xx",
what is it? PCI or PCIe? Or something else perhaps, maybe
a CPU or an I2C controller or who-knows-what?
Segher
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 5/6] Update the 83xx/85xx/86xx boards device tree
2007-07-10 20:28 ` Segher Boessenkool
@ 2007-07-11 2:53 ` Zang Roy-r61911
2007-07-11 18:49 ` Segher Boessenkool
0 siblings, 1 reply; 4+ messages in thread
From: Zang Roy-r61911 @ 2007-07-11 2:53 UTC (permalink / raw)
To: Segher Boessenkool; +Cc: linuxppc-dev list, Paul Mackerras
On Wed, 2007-07-11 at 04:28, Segher Boessenkool wrote:
> > Indentify pci, pcie host by compatible property
> > "fsl,mpc83xx-pci","83xx"
> > "fsl,mpc85xx-pci","85xx"
> > "fsl,mpc86xx-pci","86xx"
> > and
> > "fsl, mpc85xx-pciex","85xx"
> > "fsl, mpc86xx-pciex","86xx"
>
> This can't ever work --
It works!
> if you see "compatible" = "85xx",
> what is it?
That's why I remove the original compatible "85xx".
> PCI or PCIe? Or something else perhaps, maybe
> a CPU or an I2C controller or who-knows-what?
I just think the compatible field
"fsl,mpc83xx-pci","83xx"
has some redundant information.
Kumar don't want to break anything using the old
information.
We can remove it in the future:-).
Roy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 5/6] Update the 83xx/85xx/86xx boards device tree
2007-07-11 2:53 ` Zang Roy-r61911
@ 2007-07-11 18:49 ` Segher Boessenkool
0 siblings, 0 replies; 4+ messages in thread
From: Segher Boessenkool @ 2007-07-11 18:49 UTC (permalink / raw)
To: Zang Roy-r61911; +Cc: linuxppc-dev list, Paul Mackerras
>>> Indentify pci, pcie host by compatible property
>>> "fsl,mpc83xx-pci","83xx"
>>> "fsl,mpc85xx-pci","85xx"
>>> "fsl,mpc86xx-pci","86xx"
>>> and
>>> "fsl, mpc85xx-pciex","85xx"
>>> "fsl, mpc86xx-pciex","86xx"
>>
>> This can't ever work --
> It works!
How can any driver match for "85xx" if two completely different
devices use it as device name?
>> if you see "compatible" = "85xx",
>> what is it?
> That's why I remove the original compatible "85xx".
All entries in "compatible" are independent of each other. So
there still is a "85xx" in there.
>> PCI or PCIe? Or something else perhaps, maybe
>> a CPU or an I2C controller or who-knows-what?
> I just think the compatible field
> "fsl,mpc83xx-pci","83xx"
> has some redundant information.
> Kumar don't want to break anything using the old
> information.
Yes, you can keep the existing "compatible" for, ahem,
compatibility reasons -- but that doesn't mean you should
add "85xx" to new (incompatible!) nodes.
> We can remove it in the future:-).
I hope so :-)
Segher
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-07-11 18:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-10 15:53 [patch 5/6] Update the 83xx/85xx/86xx boards device tree Zang Roy-r61911
2007-07-10 20:28 ` Segher Boessenkool
2007-07-11 2:53 ` Zang Roy-r61911
2007-07-11 18:49 ` Segher Boessenkool
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).