* Re: Reminder: removal of arch/ppc
From: Josh Boyer @ 2008-01-26 3:22 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev list, Jon Loeliger, linuxppc-embedded
In-Reply-To: <fa686aa40801251907x710f1916y1fa8d8ac6913aae@mail.gmail.com>
On Fri, 25 Jan 2008 20:07:57 -0700
"Grant Likely" <grant.likely@secretlab.ca> wrote:
> On 1/25/08, Kumar Gala <galak@kernel.crashing.org> wrote:
> > Just a reminder that the plan is to remove arch/ppc this summer (June
> > 2008).
>
> I strongly recommend that we delay removal by about a month...
> somewhere around July 23-26... so we can have a great big "ding, dong,
> arch/ppc is dead" party at OLS.
Ironically, that is where the original June date came from. Segher
suggested doing it at OLS, which for some reason we all thought was in
June.
But this is Linux. We never do anything on time, so I'm sure it'll
work out ;)
josh
^ permalink raw reply
* Re: [PATCH] 5200 dts: add default address and size cells to soc node.
From: Grant Likely @ 2008-01-26 3:17 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linuxppc-dev
In-Reply-To: <1201293200-32031-1-git-send-email-paul.gortmaker@windriver.com>
On 1/25/08, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> The various 5200 dts files don't have values specified for the soc
> node, which in turn results in a warning from the processing of
> every child node (roughly 40 warnings per file). This explicitly
> sets the default values and gets rid of all the warnings.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Applied, thanks!
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* [PATCH] qe/muram dts: Explicitly set address-cells and size cells for muram
From: Paul Gortmaker @ 2008-01-25 19:29 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Gortmaker
Currently there are several dts that don't specify address or size
cells for the muram. This causes dtc to use default values, one of
which is an address-cells of two, and this breaks the parsing of the
muram ranges, which is assuming an address-cells of one. For example:
Warning (reg_format): "reg" property in
/qe@e0100000/muram@10000/data-only@0 has invalid length
(8 bytes) (#address-cells == 2, #size-cells == 1)
Explicitly setting the address and size cells gets it parsed properly
and gets rid of the four dtc warnings.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/powerpc/boot/dts/mpc832x_mds.dts | 2 ++
arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 ++
arch/powerpc/boot/dts/mpc836x_mds.dts | 4 +++-
arch/powerpc/boot/dts/mpc8568mds.dts | 4 +++-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 6902524..ec3ca83 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -213,6 +213,8 @@
bus-frequency = <BCD3D80>;
muram@10000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
device_type = "muram";
ranges = <0 00010000 00004000>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 10ff7aa..9251997 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -173,6 +173,8 @@
bus-frequency = <BCD3D80>;
muram@10000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
device_type = "muram";
ranges = <0 00010000 00004000>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 2181d2c..10b5d6d 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -214,10 +214,12 @@
bus-frequency = <179A7B00>;
muram@10000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
device_type = "muram";
ranges = <0 00010000 0000c000>;
- data-only@0{
+ data-only@0 {
reg = <0 c000>;
};
};
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 5818a7c..78d4b83 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -291,10 +291,12 @@
bus-frequency = <179A7B00>;
muram@10000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
device_type = "muram";
ranges = <0 00010000 0000c000>;
- data-only@0{
+ data-only@0 {
reg = <0 c000>;
};
};
--
1.5.4.rc4.gcab31
^ permalink raw reply related
* Re: Reminder: removal of arch/ppc
From: Grant Likely @ 2008-01-26 3:07 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev list, Jon Loeliger, linuxppc-embedded
In-Reply-To: <E83C3B2F-0FC4-4248-B718-0C45B56E969A@kernel.crashing.org>
On 1/25/08, Kumar Gala <galak@kernel.crashing.org> wrote:
> Just a reminder that the plan is to remove arch/ppc this summer (June
> 2008).
I strongly recommend that we delay removal by about a month...
somewhere around July 23-26... so we can have a great big "ding, dong,
arch/ppc is dead" party at OLS.
:-D
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: [PATCH 3/3] Cell IOMMU static mapping support
From: Olof Johansson @ 2008-01-26 2:51 UTC (permalink / raw)
To: Michael Ellerman; +Cc: linuxppc-dev, cbe-oss-dev
In-Reply-To: <9ce4678eef9e50908969eb1ef8470e307f3076ff.1201257905.git.michael@ellerman.id.au>
On Fri, Jan 25, 2008 at 09:45:07PM +1100, Michael Ellerman wrote:
> Citing "release early release often", I'm posting this now as a mega-patch
> to get people looking at it. I'll try to split it up and make it look a
> little prettier before submitting it.
>
> The intent of this patch is to setup (on certain machines) a "static" IOMMU
> mapping of all of memory, to reduce the overhead of the IOMMU. If anyone has
> a better name than "static" I'm all ears.
>
> So instead of having an IOMMU window that we use to temporarily map things
> in and out of DMA'able space, at boot we create a 1:1 mapping for all of
> memory. This obviously only works for devices that can do 64-bit DMA.
I don't get it. Why not disable the iommu instead?
-Olof
^ permalink raw reply
* SET_NETDEV_DEV -> 83xx HDLC Driver??
From: Russell McGuire @ 2008-01-26 2:43 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <mailman.1.1201309203.24413.linuxppc-embedded@ozlabs.org>
All,
I am partly done porting a combination of the 83xx ATM driver and dscc4 HDLC
driver into a 83xx HDLC driver.
However, encounter a call I don't truly understand.
SET_NETDEV_DEV(dev, pointer_to_some_handle);
I can see plenty of examples of this registering some kind of PCI device
handle, however in this case I am not using a PCI device. So what should the
pointer be? Or can this call be ignored, and if so what are the
consequences?
I see the some of the Freescale Ethernet devices don't use this call.
Anyway, can somebody shed some light on if I am going to need this, or a way
to get it to work, without creating a PCI device?
-Russ
^ permalink raw reply
* Re: Reminder: removal of arch/ppc
From: Josh Boyer @ 2008-01-26 2:20 UTC (permalink / raw)
To: Roland Dreier; +Cc: linuxppc-dev list, linuxppc-embedded
In-Reply-To: <adahch1jruv.fsf@cisco.com>
On Fri, 25 Jan 2008 17:30:32 -0800
Roland Dreier <rdreier@cisco.com> wrote:
> > > YUCCA
> >
> > Yucca was what again? 440spe?
>
> Yes, it was the first 440SPe eval board; since replaced by Katmai.
>
> I have a Yucca and can at least test thing; if no one else gets to it,
> I may try to port it to arch/powerpc for 2.6.26.
Hm. Katmai is already in-tree. Theoretically I should be able to get
the HW docs and do a new DTS and have it mostly "just work". Perhaps
I'll give that a shot and have you give it a quick spin.
josh
^ permalink raw reply
* Re: [PATCH] create modalias file in sysfs for bus vio
From: Olaf Hering @ 2008-01-25 17:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linuxppc-dev
In-Reply-To: <20080123010505.d812129e.sfr@canb.auug.org.au>
On Wed, Jan 23, Stephen Rothwell wrote:
> It would be nice if we could factor out the "vio:T%sS%s" string as it is
> also used in vio_hotplug().
What exactly do you have in mind?
Creating a tempstring seems to make things more complicated.
^ permalink raw reply
* [PATCH] 5200 dts: add default address and size cells to soc node.
From: Paul Gortmaker @ 2008-01-25 20:33 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Gortmaker
The various 5200 dts files don't have values specified for the soc
node, which in turn results in a warning from the processing of
every child node (roughly 40 warnings per file). This explicitly
sets the default values and gets rid of all the warnings.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/powerpc/boot/dts/cm5200.dts | 2 ++
arch/powerpc/boot/dts/lite5200.dts | 2 ++
arch/powerpc/boot/dts/lite5200b.dts | 2 ++
arch/powerpc/boot/dts/motionpro.dts | 2 ++
arch/powerpc/boot/dts/tqm5200.dts | 2 ++
5 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
index 9295083..2b88a58 100644
--- a/arch/powerpc/boot/dts/cm5200.dts
+++ b/arch/powerpc/boot/dts/cm5200.dts
@@ -45,6 +45,8 @@
};
soc5200@f0000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
model = "fsl,mpc5200b";
compatible = "fsl,mpc5200b";
revision = ""; // from bootloader
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index e1d6f44..7de3d21 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -46,6 +46,8 @@
};
soc5200@f0000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
model = "fsl,mpc5200";
compatible = "mpc5200";
revision = ""; // from bootloader
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 3e06f58..dd2c4fd 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -46,6 +46,8 @@
};
soc5200@f0000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
model = "fsl,mpc5200b";
compatible = "mpc5200";
revision = ""; // from bootloader
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts
index d8c316a..ee30805 100644
--- a/arch/powerpc/boot/dts/motionpro.dts
+++ b/arch/powerpc/boot/dts/motionpro.dts
@@ -45,6 +45,8 @@
};
soc5200@f0000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
model = "fsl,mpc5200b";
compatible = "fsl,mpc5200b";
revision = ""; // from bootloader
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
index 5017cec..58c9799 100644
--- a/arch/powerpc/boot/dts/tqm5200.dts
+++ b/arch/powerpc/boot/dts/tqm5200.dts
@@ -45,6 +45,8 @@
};
soc5200@f0000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
model = "fsl,mpc5200";
compatible = "fsl,mpc5200";
revision = ""; // from bootloader
--
1.5.4.rc4.gcab31
^ permalink raw reply related
* [PATCH] POWERPC: Convert StorCenter DTS file to /dts-v1/ format.
From: Jon Loeliger @ 2008-01-25 22:36 UTC (permalink / raw)
To: ppcdev
Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
arch/powerpc/boot/dts/storcenter.dts | 73 +++++++++++++++++----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
index 6aa1d69..2204874 100644
--- a/arch/powerpc/boot/dts/storcenter.dts
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -11,6 +11,8 @@
* warranty of any kind, whether express or implied.
*/
+/dts-v1/;
+
/ {
model = "StorCenter";
compatible = "storcenter";
@@ -30,19 +32,19 @@
PowerPC,8241@0 {
device_type = "cpu";
reg = <0>;
- clock-frequency = <d# 200000000>; /* Hz */
- timebase-frequency = <d# 25000000>; /* Hz */
+ clock-frequency = <200000000>;
+ timebase-frequency = <25000000>;
bus-frequency = <0>; /* from bootwrapper */
- i-cache-line-size = <d# 32>; /* bytes */
- d-cache-line-size = <d# 32>; /* bytes */
- i-cache-size = <4000>;
- d-cache-size = <4000>;
+ i-cache-line-size = <32>;
+ d-cache-line-size = <32>;
+ i-cache-size = <16384>;
+ d-cache-size = <16384>;
};
};
memory {
device_type = "memory";
- reg = <00000000 04000000>; /* 64MB @ 0x0 */
+ reg = <0x00000000 0x04000000>; /* 64MB @ 0x0 */
};
soc@fc000000 {
@@ -51,15 +53,15 @@
device_type = "soc";
compatible = "fsl,mpc8241", "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
- ranges = <0 fc000000 100000>;
- reg = <fc000000 100000>; /* EUMB */
+ ranges = <0x0 0xfc000000 0x100000>;
+ reg = <0xfc000000 0x100000>; /* EUMB */
bus-frequency = <0>; /* fixed by loader */
i2c@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl-i2c";
- reg = <3000 100>;
+ reg = <0x3000 0x100>;
interrupts = <5 2>;
interrupt-parent = <&mpic>;
@@ -73,9 +75,9 @@
cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
- reg = <4500 20>;
- clock-frequency = <d# 97553800>; /* Hz */
- current-speed = <d# 115200>;
+ reg = <0x4500 0x20>;
+ clock-frequency = <97553800>; /* Hz */
+ current-speed = <115200>;
interrupts = <9 2>;
interrupt-parent = <&mpic>;
};
@@ -84,10 +86,10 @@
cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
- reg = <4600 20>;
- clock-frequency = <d# 97553800>; /* Hz */
- current-speed = <d# 9600>;
- interrupts = <a 2>;
+ reg = <0x4600 0x20>;
+ clock-frequency = <97553800>; /* Hz */
+ current-speed = <9600>;
+ interrupts = <10 2>;
interrupt-parent = <&mpic>;
};
@@ -96,7 +98,7 @@
device_type = "open-pic";
compatible = "chrp,open-pic";
interrupt-controller;
- reg = <40000 40000>;
+ reg = <0x40000 0x40000>;
};
};
@@ -107,28 +109,29 @@
#interrupt-cells = <1>;
device_type = "pci";
compatible = "mpc10x-pci";
- reg = <fe800000 1000>;
- ranges = <01000000 0 0 fe000000 0 00c00000
- 02000000 0 80000000 80000000 0 70000000>;
- bus-range = <0 ff>;
- clock-frequency = <d# 97553800>; /* Hz */
+ reg = <0xfe800000 0x1000>;
+ ranges = <0x01000000 0x0 0x0 0xfe000000 0x0 0x00c00000
+ 0x02000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
+ bus-range = <0 0xff>;
+ clock-frequency = <97553800>;
interrupt-parent = <&mpic>;
- interrupt-map-mask = <f800 0 0 7>;
+ interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <
/* IDSEL 13 - IDE */
- 6800 0 0 1 &mpic 0 1
- 6800 0 0 2 &mpic 0 1
- 6800 0 0 3 &mpic 0 1
+ 0x6800 0 0 1 &mpic 0 1
+ 0x6800 0 0 2 &mpic 0 1
+ 0x6800 0 0 3 &mpic 0 1
+ 0x6800 0 0 4 &mpic 0 1
/* IDSEL 14 - USB */
- 7000 0 0 1 &mpic 0 1
- 7000 0 0 2 &mpic 0 1
- 7000 0 0 3 &mpic 0 1
- 7000 0 0 4 &mpic 0 1
+ 0x7000 0 0 1 &mpic 0 1
+ 0x7000 0 0 2 &mpic 0 1
+ 0x7000 0 0 3 &mpic 0 1
+ 0x7000 0 0 4 &mpic 0 1
/* IDSEL 15 - ETH */
- 7800 0 0 1 &mpic 0 1
- 7800 0 0 2 &mpic 0 1
- 7800 0 0 3 &mpic 0 1
- 7800 0 0 4 &mpic 0 1
+ 0x7800 0 0 1 &mpic 0 1
+ 0x7800 0 0 2 &mpic 0 1
+ 0x7800 0 0 3 &mpic 0 1
+ 0x7800 0 0 4 &mpic 0 1
>;
};
--
1.5.2.1.126.g6abd0
^ permalink raw reply related
* [PATCH] POWERPC: Convert all 86xx DTS files to /dts-v1/ format.
From: Jon Loeliger @ 2008-01-25 22:31 UTC (permalink / raw)
To: linuxppc-dev
Also fixed a few minor indent problems as well.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
arch/powerpc/boot/dts/mpc8610_hpcd.dts | 227 +++++++++++-----------
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 333 ++++++++++++++++----------------
2 files changed, 281 insertions(+), 279 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index d98715c..16c947b 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -8,6 +8,7 @@
* by the Free Software Foundation.
*/
+/dts-v1/;
/ {
model = "MPC8610HPCD";
@@ -29,11 +30,11 @@
PowerPC,8610@0 {
device_type = "cpu";
reg = <0>;
- d-cache-line-size = <d# 32>; // bytes
- i-cache-line-size = <d# 32>; // bytes
- d-cache-size = <8000>; // L1, 32K
- i-cache-size = <8000>; // L1, 32K
- timebase-frequency = <0>; // 33 MHz, from uboot
+ d-cache-line-size = <32>;
+ i-cache-line-size = <32>;
+ d-cache-size = <32768>; // L1
+ i-cache-size = <32768>; // L1
+ timebase-frequency = <0>; // From uboot
bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot
};
@@ -41,7 +42,7 @@
memory {
device_type = "memory";
- reg = <00000000 20000000>; // 512M at 0x0
+ reg = <0x00000000 0x20000000>; // 512M at 0x0
};
soc@e0000000 {
@@ -50,8 +51,8 @@
#interrupt-cells = <2>;
device_type = "soc";
compatible = "fsl,mpc8610-immr", "simple-bus";
- ranges = <0 e0000000 00100000>;
- reg = <e0000000 1000>;
+ ranges = <0x0 0xe0000000 0x00100000>;
+ reg = <0xe0000000 0x1000>;
bus-frequency = <0>;
i2c@3000 {
@@ -59,17 +60,17 @@
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
- reg = <3000 100>;
- interrupts = <2b 2>;
+ reg = <0x3000 0x100>;
+ interrupts = <43 2>;
interrupt-parent = <&mpic>;
dfsrr;
- cs4270:codec@4f {
+ cs4270:codec@4f {
compatible = "cirrus,cs4270";
- reg = <4f>;
+ reg = <0x4f>;
/* MCLK source is a stand-alone oscillator */
- clock-frequency = <bb8000>;
- };
+ clock-frequency = <12288000>;
+ };
};
i2c@3100 {
@@ -77,8 +78,8 @@
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
- reg = <3100 100>;
- interrupts = <2b 2>;
+ reg = <0x3100 0x100>;
+ interrupts = <43 2>;
interrupt-parent = <&mpic>;
dfsrr;
};
@@ -87,9 +88,9 @@
cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
- reg = <4500 100>;
+ reg = <0x4500 0x100>;
clock-frequency = <0>;
- interrupts = <2a 2>;
+ interrupts = <42 2>;
interrupt-parent = <&mpic>;
};
@@ -97,9 +98,9 @@
cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
- reg = <4600 100>;
+ reg = <0x4600 0x100>;
clock-frequency = <0>;
- interrupts = <1c 2>;
+ interrupts = <28 2>;
interrupt-parent = <&mpic>;
};
@@ -108,7 +109,7 @@
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <2>;
- reg = <40000 40000>;
+ reg = <0x40000 0x40000>;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
@@ -116,16 +117,16 @@
global-utilities@e0000 {
compatible = "fsl,mpc8610-guts";
- reg = <e0000 1000>;
+ reg = <0xe0000 0x1000>;
fsl,has-rstcr;
};
i2s@16000 {
compatible = "fsl,mpc8610-ssi";
cell-index = <0>;
- reg = <16000 100>;
+ reg = <0x16000 0x100>;
interrupt-parent = <&mpic>;
- interrupts = <3e 2>;
+ interrupts = <62 2>;
fsl,mode = "i2s-slave";
codec-handle = <&cs4270>;
};
@@ -133,94 +134,94 @@
ssi@16100 {
compatible = "fsl,mpc8610-ssi";
cell-index = <1>;
- reg = <16100 100>;
+ reg = <0x16100 0x100>;
interrupt-parent = <&mpic>;
- interrupts = <3f 2>;
+ interrupts = <63 2>;
};
- dma@21300 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
- cell-index = <0>;
- reg = <21300 4>; /* DMA general status register */
- ranges = <0 21100 200>;
+ dma@21300 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
+ cell-index = <0>;
+ reg = <0x21300 0x4>; /* DMA general status register */
+ ranges = <0x0 0x21100 0x200>;
- dma-channel@0 {
+ dma-channel@0 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel";
cell-index = <0>;
- reg = <0 80>;
+ reg = <0x0 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <14 2>;
- };
- dma-channel@1 {
+ interrupts = <20 2>;
+ };
+ dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel";
cell-index = <1>;
- reg = <80 80>;
+ reg = <0x80 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <15 2>;
- };
- dma-channel@2 {
+ interrupts = <21 2>;
+ };
+ dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel";
cell-index = <2>;
- reg = <100 80>;
+ reg = <0x100 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <16 2>;
- };
- dma-channel@3 {
+ interrupts = <22 2>;
+ };
+ dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel";
cell-index = <3>;
- reg = <180 80>;
+ reg = <0x180 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <17 2>;
- };
- };
+ interrupts = <23 2>;
+ };
+ };
- dma@c300 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
- cell-index = <1>;
- reg = <c300 4>; /* DMA general status register */
- ranges = <0 c100 200>;
+ dma@c300 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
+ cell-index = <1>;
+ reg = <0xc300 0x4>; /* DMA general status register */
+ ranges = <0x0 0xc100 0x200>;
- dma-channel@0 {
+ dma-channel@0 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel";
cell-index = <0>;
- reg = <0 80>;
+ reg = <0x0 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <3c 2>;
- };
- dma-channel@1 {
+ interrupts = <60 2>;
+ };
+ dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel";
cell-index = <1>;
- reg = <80 80>;
+ reg = <0x80 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <3d 2>;
- };
- dma-channel@2 {
+ interrupts = <61 2>;
+ };
+ dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel";
cell-index = <2>;
- reg = <100 80>;
+ reg = <0x100 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <3e 2>;
- };
- dma-channel@3 {
+ interrupts = <62 2>;
+ };
+ dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel";
cell-index = <3>;
- reg = <180 80>;
+ reg = <0x180 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <3f 2>;
- };
- };
+ interrupts = <63 2>;
+ };
+ };
};
@@ -231,26 +232,26 @@
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
- reg = <e0008000 1000>;
+ reg = <0xe0008000 0x1000>;
bus-range = <0 0>;
- ranges = <02000000 0 80000000 80000000 0 10000000
- 01000000 0 00000000 e1000000 0 00100000>;
- clock-frequency = <1fca055>;
+ ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+ 0x01000000 0x0 0x00000000 0xe1000000 0x0 0x00100000>;
+ clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
- interrupts = <18 2>;
- interrupt-map-mask = <f800 0 0 7>;
+ interrupts = <24 2>;
+ interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <
/* IDSEL 0x11 */
- 8800 0 0 1 &mpic 4 1
- 8800 0 0 2 &mpic 5 1
- 8800 0 0 3 &mpic 6 1
- 8800 0 0 4 &mpic 7 1
+ 0x8800 0 0 1 &mpic 4 1
+ 0x8800 0 0 2 &mpic 5 1
+ 0x8800 0 0 3 &mpic 6 1
+ 0x8800 0 0 4 &mpic 7 1
/* IDSEL 0x12 */
- 9000 0 0 1 &mpic 5 1
- 9000 0 0 2 &mpic 6 1
- 9000 0 0 3 &mpic 7 1
- 9000 0 0 4 &mpic 4 1
+ 0x9000 0 0 1 &mpic 5 1
+ 0x9000 0 0 2 &mpic 6 1
+ 0x9000 0 0 3 &mpic 7 1
+ 0x9000 0 0 4 &mpic 4 1
>;
};
@@ -261,28 +262,28 @@
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
- reg = <e000a000 1000>;
+ reg = <0xe000a000 0x1000>;
bus-range = <1 3>;
- ranges = <02000000 0 a0000000 a0000000 0 10000000
- 01000000 0 00000000 e3000000 0 00100000>;
- clock-frequency = <1fca055>;
+ ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+ 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
+ clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
- interrupts = <1a 2>;
- interrupt-map-mask = <f800 0 0 7>;
+ interrupts = <26 2>;
+ interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <
/* IDSEL 0x1b */
- d800 0 0 1 &mpic 2 1
+ 0xd800 0 0 1 &mpic 2 1
/* IDSEL 0x1c*/
- e000 0 0 1 &mpic 1 1
- e000 0 0 2 &mpic 1 1
- e000 0 0 3 &mpic 1 1
- e000 0 0 4 &mpic 1 1
+ 0xe000 0 0 1 &mpic 1 1
+ 0xe000 0 0 2 &mpic 1 1
+ 0xe000 0 0 3 &mpic 1 1
+ 0xe000 0 0 4 &mpic 1 1
/* IDSEL 0x1f */
- f800 0 0 1 &mpic 3 0
- f800 0 0 2 &mpic 0 1
+ 0xf800 0 0 1 &mpic 3 0
+ 0xf800 0 0 2 &mpic 0 1
>;
pcie@0 {
@@ -290,22 +291,22 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
- ranges = <02000000 0 a0000000
- 02000000 0 a0000000
- 0 10000000
- 01000000 0 00000000
- 01000000 0 00000000
- 0 00100000>;
+ ranges = <0x02000000 0x0 0xa0000000
+ 0x02000000 0x0 0xa0000000
+ 0x0 0x10000000
+ 0x01000000 0x0 0x00000000
+ 0x01000000 0x0 0x00000000
+ 0x0 0x00100000>;
uli1575@0 {
reg = <0 0 0 0 0>;
#size-cells = <2>;
#address-cells = <3>;
- ranges = <02000000 0 a0000000
- 02000000 0 a0000000
- 0 10000000
- 01000000 0 00000000
- 01000000 0 00000000
- 0 00100000>;
+ ranges = <0x02000000 0x0 0xa0000000
+ 0x02000000 0x0 0xa0000000
+ 0x0 0x10000000
+ 0x01000000 0x0 0x00000000
+ 0x01000000 0x0 0x00000000
+ 0x0 0x00100000>;
};
};
};
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 556a9ca..79385bc 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -9,6 +9,7 @@
* option) any later version.
*/
+/dts-v1/;
/ {
model = "MPC8641HPCN";
@@ -34,22 +35,22 @@
PowerPC,8641@0 {
device_type = "cpu";
reg = <0>;
- d-cache-line-size = <20>; // 32 bytes
- i-cache-line-size = <20>; // 32 bytes
- d-cache-size = <8000>; // L1, 32K
- i-cache-size = <8000>; // L1, 32K
- timebase-frequency = <0>; // 33 MHz, from uboot
+ d-cache-line-size = <32>;
+ i-cache-line-size = <32>;
+ d-cache-size = <32768>; // L1
+ i-cache-size = <32768>; // L1
+ timebase-frequency = <0>; // From uboot
bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot
};
PowerPC,8641@1 {
device_type = "cpu";
reg = <1>;
- d-cache-line-size = <20>; // 32 bytes
- i-cache-line-size = <20>; // 32 bytes
- d-cache-size = <8000>; // L1, 32K
- i-cache-size = <8000>; // L1, 32K
- timebase-frequency = <0>; // 33 MHz, from uboot
+ d-cache-line-size = <32>;
+ i-cache-line-size = <32>;
+ d-cache-size = <32768>;
+ i-cache-size = <32768>;
+ timebase-frequency = <0>; // From uboot
bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot
};
@@ -57,45 +58,45 @@
memory {
device_type = "memory";
- reg = <00000000 40000000>; // 1G at 0x0
+ reg = <0x00000000 0x40000000>; // 1G at 0x0
};
localbus@f8005000 {
#address-cells = <2>;
#size-cells = <1>;
compatible = "fsl,mpc8641-localbus", "simple-bus";
- reg = <f8005000 1000>;
- interrupts = <13 2>;
+ reg = <0xf8005000 0x1000>;
+ interrupts = <19 2>;
interrupt-parent = <&mpic>;
- ranges = <0 0 ff800000 00800000
- 1 0 fe000000 01000000
- 2 0 f8200000 00100000
- 3 0 f8100000 00100000>;
+ ranges = <0 0 0xff800000 0x00800000
+ 1 0 0xfe000000 0x01000000
+ 2 0 0xf8200000 0x00100000
+ 3 0 0xf8100000 0x00100000>;
flash@0,0 {
compatible = "cfi-flash";
- reg = <0 0 00800000>;
+ reg = <0 0 0x00800000>;
bank-width = <2>;
device-width = <2>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "kernel";
- reg = <00000000 00300000>;
+ reg = <0x00000000 0x00300000>;
};
partition@300000 {
label = "firmware b";
- reg = <00300000 00100000>;
+ reg = <0x00300000 0x00100000>;
read-only;
};
partition@400000 {
label = "fs";
- reg = <00400000 00300000>;
+ reg = <0x00400000 0x00300000>;
};
partition@700000 {
label = "firmware a";
- reg = <00700000 00100000>;
+ reg = <0x00700000 0x00100000>;
read-only;
};
};
@@ -106,8 +107,8 @@
#size-cells = <1>;
device_type = "soc";
compatible = "simple-bus";
- ranges = <00000000 f8000000 00100000>;
- reg = <f8000000 00001000>; // CCSRBAR
+ ranges = <0x00000000 0xf8000000 0x00100000>;
+ reg = <0xf8000000 0x00001000>; // CCSRBAR
bus-frequency = <0>;
i2c@3000 {
@@ -115,8 +116,8 @@
#size-cells = <0>;
cell-index = <0>;
compatible = "fsl-i2c";
- reg = <3000 100>;
- interrupts = <2b 2>;
+ reg = <0x3000 0x100>;
+ interrupts = <43 2>;
interrupt-parent = <&mpic>;
dfsrr;
};
@@ -126,8 +127,8 @@
#size-cells = <0>;
cell-index = <1>;
compatible = "fsl-i2c";
- reg = <3100 100>;
- interrupts = <2b 2>;
+ reg = <0x3100 0x100>;
+ interrupts = <43 2>;
interrupt-parent = <&mpic>;
dfsrr;
};
@@ -136,29 +137,29 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,gianfar-mdio";
- reg = <24520 20>;
+ reg = <0x24520 0x20>;
phy0: ethernet-phy@0 {
interrupt-parent = <&mpic>;
- interrupts = <a 1>;
+ interrupts = <10 1>;
reg = <0>;
device_type = "ethernet-phy";
};
phy1: ethernet-phy@1 {
interrupt-parent = <&mpic>;
- interrupts = <a 1>;
+ interrupts = <10 1>;
reg = <1>;
device_type = "ethernet-phy";
};
phy2: ethernet-phy@2 {
interrupt-parent = <&mpic>;
- interrupts = <a 1>;
+ interrupts = <10 1>;
reg = <2>;
device_type = "ethernet-phy";
};
phy3: ethernet-phy@3 {
interrupt-parent = <&mpic>;
- interrupts = <a 1>;
+ interrupts = <10 1>;
reg = <3>;
device_type = "ethernet-phy";
};
@@ -169,9 +170,9 @@
device_type = "network";
model = "TSEC";
compatible = "gianfar";
- reg = <24000 1000>;
+ reg = <0x24000 0x1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
- interrupts = <1d 2 1e 2 22 2>;
+ interrupts = <29 2 30 2 34 2>;
interrupt-parent = <&mpic>;
phy-handle = <&phy0>;
phy-connection-type = "rgmii-id";
@@ -182,9 +183,9 @@
device_type = "network";
model = "TSEC";
compatible = "gianfar";
- reg = <25000 1000>;
+ reg = <0x25000 0x1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
- interrupts = <23 2 24 2 28 2>;
+ interrupts = <35 2 36 2 40 2>;
interrupt-parent = <&mpic>;
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
@@ -195,9 +196,9 @@
device_type = "network";
model = "TSEC";
compatible = "gianfar";
- reg = <26000 1000>;
+ reg = <0x26000 0x1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
- interrupts = <1F 2 20 2 21 2>;
+ interrupts = <31 2 32 2 33 2>;
interrupt-parent = <&mpic>;
phy-handle = <&phy2>;
phy-connection-type = "rgmii-id";
@@ -208,9 +209,9 @@
device_type = "network";
model = "TSEC";
compatible = "gianfar";
- reg = <27000 1000>;
+ reg = <0x27000 0x1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
- interrupts = <25 2 26 2 27 2>;
+ interrupts = <37 2 38 2 39 2>;
interrupt-parent = <&mpic>;
phy-handle = <&phy3>;
phy-connection-type = "rgmii-id";
@@ -220,9 +221,9 @@
cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
- reg = <4500 100>;
+ reg = <0x4500 0x100>;
clock-frequency = <0>;
- interrupts = <2a 2>;
+ interrupts = <42 2>;
interrupt-parent = <&mpic>;
};
@@ -230,9 +231,9 @@
cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
- reg = <4600 100>;
+ reg = <0x4600 0x100>;
clock-frequency = <0>;
- interrupts = <1c 2>;
+ interrupts = <28 2>;
interrupt-parent = <&mpic>;
};
@@ -241,7 +242,7 @@
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <2>;
- reg = <40000 40000>;
+ reg = <0x40000 0x40000>;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
@@ -249,7 +250,7 @@
global-utilities@e0000 {
compatible = "fsl,mpc8641-guts";
- reg = <e0000 1000>;
+ reg = <0xe0000 0x1000>;
fsl,has-rstcr;
};
};
@@ -261,127 +262,127 @@
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
- reg = <f8008000 1000>;
- bus-range = <0 ff>;
- ranges = <02000000 0 80000000 80000000 0 20000000
- 01000000 0 00000000 e2000000 0 00100000>;
- clock-frequency = <1fca055>;
+ reg = <0xf8008000 0x1000>;
+ bus-range = <0x0 0xff>;
+ ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
+ 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+ clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
- interrupts = <18 2>;
- interrupt-map-mask = <ff00 0 0 7>;
+ interrupts = <24 2>;
+ interrupt-map-mask = <0xff00 0 0 7>;
interrupt-map = <
/* IDSEL 0x11 func 0 - PCI slot 1 */
- 8800 0 0 1 &mpic 2 1
- 8800 0 0 2 &mpic 3 1
- 8800 0 0 3 &mpic 4 1
- 8800 0 0 4 &mpic 1 1
+ 0x8800 0 0 1 &mpic 2 1
+ 0x8800 0 0 2 &mpic 3 1
+ 0x8800 0 0 3 &mpic 4 1
+ 0x8800 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 1 - PCI slot 1 */
- 8900 0 0 1 &mpic 2 1
- 8900 0 0 2 &mpic 3 1
- 8900 0 0 3 &mpic 4 1
- 8900 0 0 4 &mpic 1 1
+ 0x8900 0 0 1 &mpic 2 1
+ 0x8900 0 0 2 &mpic 3 1
+ 0x8900 0 0 3 &mpic 4 1
+ 0x8900 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 2 - PCI slot 1 */
- 8a00 0 0 1 &mpic 2 1
- 8a00 0 0 2 &mpic 3 1
- 8a00 0 0 3 &mpic 4 1
- 8a00 0 0 4 &mpic 1 1
+ 0x8a00 0 0 1 &mpic 2 1
+ 0x8a00 0 0 2 &mpic 3 1
+ 0x8a00 0 0 3 &mpic 4 1
+ 0x8a00 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 3 - PCI slot 1 */
- 8b00 0 0 1 &mpic 2 1
- 8b00 0 0 2 &mpic 3 1
- 8b00 0 0 3 &mpic 4 1
- 8b00 0 0 4 &mpic 1 1
+ 0x8b00 0 0 1 &mpic 2 1
+ 0x8b00 0 0 2 &mpic 3 1
+ 0x8b00 0 0 3 &mpic 4 1
+ 0x8b00 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 4 - PCI slot 1 */
- 8c00 0 0 1 &mpic 2 1
- 8c00 0 0 2 &mpic 3 1
- 8c00 0 0 3 &mpic 4 1
- 8c00 0 0 4 &mpic 1 1
+ 0x8c00 0 0 1 &mpic 2 1
+ 0x8c00 0 0 2 &mpic 3 1
+ 0x8c00 0 0 3 &mpic 4 1
+ 0x8c00 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 5 - PCI slot 1 */
- 8d00 0 0 1 &mpic 2 1
- 8d00 0 0 2 &mpic 3 1
- 8d00 0 0 3 &mpic 4 1
- 8d00 0 0 4 &mpic 1 1
+ 0x8d00 0 0 1 &mpic 2 1
+ 0x8d00 0 0 2 &mpic 3 1
+ 0x8d00 0 0 3 &mpic 4 1
+ 0x8d00 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 6 - PCI slot 1 */
- 8e00 0 0 1 &mpic 2 1
- 8e00 0 0 2 &mpic 3 1
- 8e00 0 0 3 &mpic 4 1
- 8e00 0 0 4 &mpic 1 1
+ 0x8e00 0 0 1 &mpic 2 1
+ 0x8e00 0 0 2 &mpic 3 1
+ 0x8e00 0 0 3 &mpic 4 1
+ 0x8e00 0 0 4 &mpic 1 1
/* IDSEL 0x11 func 7 - PCI slot 1 */
- 8f00 0 0 1 &mpic 2 1
- 8f00 0 0 2 &mpic 3 1
- 8f00 0 0 3 &mpic 4 1
- 8f00 0 0 4 &mpic 1 1
+ 0x8f00 0 0 1 &mpic 2 1
+ 0x8f00 0 0 2 &mpic 3 1
+ 0x8f00 0 0 3 &mpic 4 1
+ 0x8f00 0 0 4 &mpic 1 1
/* IDSEL 0x12 func 0 - PCI slot 2 */
- 9000 0 0 1 &mpic 3 1
- 9000 0 0 2 &mpic 4 1
- 9000 0 0 3 &mpic 1 1
- 9000 0 0 4 &mpic 2 1
+ 0x9000 0 0 1 &mpic 3 1
+ 0x9000 0 0 2 &mpic 4 1
+ 0x9000 0 0 3 &mpic 1 1
+ 0x9000 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 1 - PCI slot 2 */
- 9100 0 0 1 &mpic 3 1
- 9100 0 0 2 &mpic 4 1
- 9100 0 0 3 &mpic 1 1
- 9100 0 0 4 &mpic 2 1
+ 0x9100 0 0 1 &mpic 3 1
+ 0x9100 0 0 2 &mpic 4 1
+ 0x9100 0 0 3 &mpic 1 1
+ 0x9100 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 2 - PCI slot 2 */
- 9200 0 0 1 &mpic 3 1
- 9200 0 0 2 &mpic 4 1
- 9200 0 0 3 &mpic 1 1
- 9200 0 0 4 &mpic 2 1
+ 0x9200 0 0 1 &mpic 3 1
+ 0x9200 0 0 2 &mpic 4 1
+ 0x9200 0 0 3 &mpic 1 1
+ 0x9200 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 3 - PCI slot 2 */
- 9300 0 0 1 &mpic 3 1
- 9300 0 0 2 &mpic 4 1
- 9300 0 0 3 &mpic 1 1
- 9300 0 0 4 &mpic 2 1
+ 0x9300 0 0 1 &mpic 3 1
+ 0x9300 0 0 2 &mpic 4 1
+ 0x9300 0 0 3 &mpic 1 1
+ 0x9300 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 4 - PCI slot 2 */
- 9400 0 0 1 &mpic 3 1
- 9400 0 0 2 &mpic 4 1
- 9400 0 0 3 &mpic 1 1
- 9400 0 0 4 &mpic 2 1
+ 0x9400 0 0 1 &mpic 3 1
+ 0x9400 0 0 2 &mpic 4 1
+ 0x9400 0 0 3 &mpic 1 1
+ 0x9400 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 5 - PCI slot 2 */
- 9500 0 0 1 &mpic 3 1
- 9500 0 0 2 &mpic 4 1
- 9500 0 0 3 &mpic 1 1
- 9500 0 0 4 &mpic 2 1
+ 0x9500 0 0 1 &mpic 3 1
+ 0x9500 0 0 2 &mpic 4 1
+ 0x9500 0 0 3 &mpic 1 1
+ 0x9500 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 6 - PCI slot 2 */
- 9600 0 0 1 &mpic 3 1
- 9600 0 0 2 &mpic 4 1
- 9600 0 0 3 &mpic 1 1
- 9600 0 0 4 &mpic 2 1
+ 0x9600 0 0 1 &mpic 3 1
+ 0x9600 0 0 2 &mpic 4 1
+ 0x9600 0 0 3 &mpic 1 1
+ 0x9600 0 0 4 &mpic 2 1
/* IDSEL 0x12 func 7 - PCI slot 2 */
- 9700 0 0 1 &mpic 3 1
- 9700 0 0 2 &mpic 4 1
- 9700 0 0 3 &mpic 1 1
- 9700 0 0 4 &mpic 2 1
+ 0x9700 0 0 1 &mpic 3 1
+ 0x9700 0 0 2 &mpic 4 1
+ 0x9700 0 0 3 &mpic 1 1
+ 0x9700 0 0 4 &mpic 2 1
// IDSEL 0x1c USB
- e000 0 0 1 &i8259 c 2
- e100 0 0 2 &i8259 9 2
- e200 0 0 3 &i8259 a 2
- e300 0 0 4 &i8259 b 2
+ 0xe000 0 0 1 &i8259 12 2
+ 0xe100 0 0 2 &i8259 9 2
+ 0xe200 0 0 3 &i8259 10 2
+ 0xe300 0 0 4 &i8259 112
// IDSEL 0x1d Audio
- e800 0 0 1 &i8259 6 2
+ 0xe800 0 0 1 &i8259 6 2
// IDSEL 0x1e Legacy
- f000 0 0 1 &i8259 7 2
- f100 0 0 1 &i8259 7 2
+ 0xf000 0 0 1 &i8259 7 2
+ 0xf100 0 0 1 &i8259 7 2
// IDSEL 0x1f IDE/SATA
- f800 0 0 1 &i8259 e 2
- f900 0 0 1 &i8259 5 2
+ 0xf800 0 0 1 &i8259 14 2
+ 0xf900 0 0 1 &i8259 5 2
>;
pcie@0 {
@@ -389,37 +390,37 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
- ranges = <02000000 0 80000000
- 02000000 0 80000000
- 0 20000000
+ ranges = <0x02000000 0x0 0x80000000
+ 0x02000000 0x0 0x80000000
+ 0x0 0x20000000
- 01000000 0 00000000
- 01000000 0 00000000
- 0 00100000>;
+ 0x01000000 0x0 0x00000000
+ 0x01000000 0x0 0x00000000
+ 0x0 0x00100000>;
uli1575@0 {
reg = <0 0 0 0 0>;
#size-cells = <2>;
#address-cells = <3>;
- ranges = <02000000 0 80000000
- 02000000 0 80000000
- 0 20000000
- 01000000 0 00000000
- 01000000 0 00000000
- 0 00100000>;
+ ranges = <0x02000000 0x0 0x80000000
+ 0x02000000 0x0 0x80000000
+ 0x0 0x20000000
+ 0x01000000 0x0 0x00000000
+ 0x01000000 0x0 0x00000000
+ 0x0 0x00100000>;
isa@1e {
device_type = "isa";
#interrupt-cells = <2>;
#size-cells = <1>;
#address-cells = <2>;
- reg = <f000 0 0 0 0>;
- ranges = <1 0 01000000 0 0
- 00001000>;
+ reg = <0xf000 0 0 0 0>;
+ ranges = <1 0 0x01000000 0 0
+ 0x00001000>;
interrupt-parent = <&i8259>;
i8259: interrupt-controller@20 {
- reg = <1 20 2
- 1 a0 2
- 1 4d0 2>;
+ reg = <1 0x20 2
+ 1 0xa0 2
+ 1 0x4d0 2>;
interrupt-controller;
device_type = "interrupt-controller";
#address-cells = <0>;
@@ -432,8 +433,8 @@
i8042@60 {
#size-cells = <0>;
#address-cells = <1>;
- reg = <1 60 1 1 64 1>;
- interrupts = <1 3 c 3>;
+ reg = <1 0x60 1 1 0x64 1>;
+ interrupts = <1 3 12 3>;
interrupt-parent =
<&i8259>;
@@ -451,11 +452,11 @@
rtc@70 {
compatible =
"pnpPNP,b00";
- reg = <1 70 2>;
+ reg = <1 0x70 2>;
};
gpio@400 {
- reg = <1 400 80>;
+ reg = <1 0x400 0x80>;
};
};
};
@@ -470,33 +471,33 @@
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
- reg = <f8009000 1000>;
- bus-range = <0 ff>;
- ranges = <02000000 0 a0000000 a0000000 0 20000000
- 01000000 0 00000000 e3000000 0 00100000>;
- clock-frequency = <1fca055>;
+ reg = <0xf8009000 0x1000>;
+ bus-range = <0 0xff>;
+ ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
+ 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
+ clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
- interrupts = <19 2>;
- interrupt-map-mask = <f800 0 0 7>;
+ interrupts = <25 2>;
+ interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <
/* IDSEL 0x0 */
- 0000 0 0 1 &mpic 4 1
- 0000 0 0 2 &mpic 5 1
- 0000 0 0 3 &mpic 6 1
- 0000 0 0 4 &mpic 7 1
+ 0x0000 0 0 1 &mpic 4 1
+ 0x0000 0 0 2 &mpic 5 1
+ 0x0000 0 0 3 &mpic 6 1
+ 0x0000 0 0 4 &mpic 7 1
>;
pcie@0 {
reg = <0 0 0 0 0>;
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
- ranges = <02000000 0 a0000000
- 02000000 0 a0000000
- 0 20000000
+ ranges = <0x02000000 0x0 0xa0000000
+ 0x02000000 0x0 0xa0000000
+ 0x0 0x20000000
- 01000000 0 00000000
- 01000000 0 00000000
- 0 00100000>;
+ 0x01000000 0x0 0x00000000
+ 0x01000000 0x0 0x00000000
+ 0x0 0x00100000>;
};
};
};
--
1.5.2.1.126.g6abd0
^ permalink raw reply related
* Re: Reminder: removal of arch/ppc
From: Roland Dreier @ 2008-01-26 1:30 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev list, linuxppc-embedded
In-Reply-To: <20080125192150.4cde6fac@zod.rchland.ibm.com>
> > YUCCA
>
> Yucca was what again? 440spe?
Yes, it was the first 440SPe eval board; since replaced by Katmai.
I have a Yucca and can at least test thing; if no one else gets to it,
I may try to port it to arch/powerpc for 2.6.26.
^ permalink raw reply
* Re: [RFC][PATCH] remove section mappinng
From: Paul Mackerras @ 2008-01-26 1:24 UTC (permalink / raw)
To: Badari Pulavarty; +Cc: linux-mm, linuxppc-dev, anton
In-Reply-To: <1201277105.26929.36.camel@dyn9047017100.beaverton.ibm.com>
Badari Pulavarty writes:
> Here is the code I cooked up, it seems to be working fine.
> But I have concerns where I need your help.
>
> In order to invalidate htab entries, we need to find the "slot".
> But I can only find the hpte group. Is it okay to invalidate the
> first entry in the group ? Do I need to invalidate the entire group ?
You do need to find the correct slot. (I suppose you could invalidate
the entire group, but that would be pretty gross.)
Note that in the CONFIG_DEBUG_PAGEALLOC case we use 4k pages and keep
a map of the slot numbers in linear_map_hash_slots[]. But in that
case I assume that the generic code would have already unmapped all
the pages of the LMB that you're trying to hot-unplug.
In the non-DEBUG_PAGEALLOC case on a System p machine, the hash table
will be big enough that the linear mapping entries should always be in
slot 0. So just invalidating slot 0 would probably work in practice,
but it seems pretty fragile. We might want to use your new
htab_remove_mapping() function on a bare-metal system with a smaller
hash table in future, for instance.
Have a look at pSeries_lpar_hpte_updateboltedpp. It calls
pSeries_lpar_hpte_find to find the slot for a bolted HPTE. You could
do something similar. In fact maybe the best approach is to do a
pSeries_lpar_hpte_remove_bolted() and not try to solve the more
general problem.
Paul.
^ permalink raw reply
* Re: Reminder: removal of arch/ppc
From: Josh Boyer @ 2008-01-26 1:21 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev list, linuxppc-embedded
In-Reply-To: <E83C3B2F-0FC4-4248-B718-0C45B56E969A@kernel.crashing.org>
On Fri, 25 Jan 2008 10:55:25 -0600
Kumar Gala <galak@kernel.crashing.org> wrote:
> Just a reminder that the plan is to remove arch/ppc this summer (June
> 2008). The following boards still existing over in arch/ppc. Some of
> them have been ported over to arch/powerpc. If you care about one of
> these boards and its not ported speak up (it helps if you have access
> to the board). Also, if you know a given board is free to die of
> bitrot let us know so we know not to worry about it:
> 4xx:
> BAMBOO
Ported (mostly)
> CPCI405
Doubt this will be ported.
> EBONY
Ported (mostly)
> EP405
Ported (mostly)
> BUBINGA
> LUAN
No idea on these.
> YUCCA
Yucca was what again? 440spe?
> OCOTEA
This one will be ported soon. I have an ocotea now.
> REDWOOD_5
> REDWOOD_6
Don't have either of these.
> SYCAMORE
I think Mathias was working on a 405gpr port somewhere.
> TAISHAN
> WALNUT
Ported (mostly)
> XILINX_ML300
> XILINX_ML403
Grant should have these in decent shape.
josh
^ permalink raw reply
* Re: drivers/char/hvc_* and /Documentation/powerpc/hvcs.txt
From: Olof Johansson @ 2008-01-26 1:04 UTC (permalink / raw)
To: Timur Tabi; +Cc: linuxppc-dev
In-Reply-To: <479A651F.2070109@freescale.com>
On Fri, Jan 25, 2008 at 04:39:27PM -0600, Timur Tabi wrote:
> Hi,
>
> I'm working on a console driver for the Freescale hypervisor. I notice a bunch
> of hvc_* files in the drivers/char directory. I also noticed
> /Documentation/powerpc/hvcs.txt.
>
> My guess is that hvcs.txt talks about drivers/char/hvcs.c, which is a console
> driver specific to some IBM hypervisor. The hvc_*.c files are based on that
> code but they're more generic and allow people to write console drivers for
> other hypervisors easliy. Am I right?
Hvcs is the server-side driver in some environments. I.e. a hvc console
connects through the hypervisor to a hvcs in another partition.
> If so, does this mean that I can take hvc_beat.c, modify it to make Freescale
> hypervisor calls instead, and presto, I'm done?
Yep, pretty much. It's real easy to write a new backend to hvc, I've got
a couple for various bringup environments here as well.
-Olof
^ permalink raw reply
* Re: [PATCH 5/5] [POWERPC] fsl_soc, legacy_serial: add support for "soc" compatible matching
From: Anton Vorontsov @ 2008-01-25 17:13 UTC (permalink / raw)
To: Kumar Gala; +Cc: Scott Wood, linuxppc-dev list, Yoder Stuart
In-Reply-To: <9C11FC54-29CF-4027-97C3-FEB1EBA2D78B@kernel.crashing.org>
On Fri, Jan 25, 2008 at 10:35:06AM -0600, Kumar Gala wrote:
>
> On Jan 24, 2008, at 9:40 AM, Anton Vorontsov wrote:
>
> >We'll match on "soc" compatible for generic code, and "fsl,soc"
> >for fsl specific code.
> >
> >Unfortunately it's still impossible to remove device_type = "soc"
> >from the existing device tree, because older u-boots are looking for
> >it.
> >
> >Neither we can remove model number from the soc name to heal
> >arch/powerpc/boot/cuboot-85xx.c, because then dts'es will be
> >incompatible with older u-boots again.
> >
> >So, just one machine converted so far: MPC8360E-RDK. It's new machine
> >so we don't care about backward compatibility yet.
> >
> >Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> >---
> >
> >I know, this patch will conflict with the legacy serial rework[1].
> >It's okay though, if [1] will hit galak/powerpc.git first, I'll
> >simply rebase that patch.
> >
> >[1] http://ozlabs.org/pipermail/linuxppc-dev/2008-January/050096.html
> >
> >Documentation/powerpc/booting-without-of.txt | 18 ++++------
> >arch/powerpc/boot/dts/mpc836x_rdk.dts | 1 -
> >arch/powerpc/kernel/legacy_serial.c | 3 +-
> >arch/powerpc/sysdev/fsl_soc.c | 51 ++++++++++++++
> >+-----------
> >4 files changed, 39 insertions(+), 34 deletions(-)
>
> this needs a bit more discussion.
Ok.
> "fsl,soc" is terrible describe. I
> think we want some generic for the compat that implies 'soc register
> space'.
My thinking:
Freescale soc register space: "fsl,soc"
generic soc device: "soc" (or maybe "linux,soc" better?)
I know, Scott Wood is pushing "xxxx-immr" thing forward... but
I don't like that name because SOC isn't only device with the
Internal Memory Mapped Registers. (Think of QE placed outside
of "soc"/"immr" node).
Though, "soc" by itself is fully unfortunate name. QE is the
part of SOC too, as we used to call it when speaking of hardware.
But logically we divide things for "core soc" and "core soc's
companion/communication/offload modules", i.e. QE/CPMs/...
We can remove that ambiguity by moving QE/CPMs nodes inside
the soc node. Then indeed -immr would be the best compatible for
the "soc" node.
--
Anton Vorontsov
email: cbou@mail.ru
backup email: ya-cbou@yandex.ru
irc://irc.freenode.net/bd2
^ permalink raw reply
* Re: [PATCH 5/5] [POWERPC] fsl_soc, legacy_serial: add support for "soc" compatible matching
From: Anton Vorontsov @ 2008-01-25 19:18 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev list, Yoder Stuart
In-Reply-To: <479A3280.5070401@freescale.com>
On Fri, Jan 25, 2008 at 01:03:28PM -0600, Scott Wood wrote:
> Anton Vorontsov wrote:
> >$ grep qe@ arch/powerpc/boot/dts/*
> >arch/powerpc/boot/dts/mpc832x_mds.dts: qe@e0100000 {
> >arch/powerpc/boot/dts/mpc832x_rdb.dts: qe@e0100000 {
> >arch/powerpc/boot/dts/mpc836x_mds.dts: qe@e0100000 {
> >arch/powerpc/boot/dts/mpc8568mds.dts: qe@e0080000 {
> >
> >^^^ if the practice is wrong, then we should fix it, and then
> >-immr would be the good name indeed (just as I've said previously).
>
> It's wrong, and we should fix it.
Ok, good. I'll fix that for at least new RDK board. Though, fixing
other boards would be not trivial because of backward compatibility
and such. I'll also use -immr for RDK.
> It would make sense if the QE block
> were relocatable separately from IMMR (but even if it were, the QE
> compatible should be fsl,xxxx-qe or similar, so no conflict with
> fsl,xxxx-immr) -- but it isn't, at least on the 8323 and 8360 (I don't
> have an 8568 manual handy).
Nobody have an MPC8568E manual handy. :-P I've just looked there..
no QE isn't relocatable.
Oh, and I lied regarding CPM being relocatable. It isn't,
at least CPM2 and at least on MPC8555E. What a pity.
--
Anton Vorontsov
email: cbou@mail.ru
backup email: ya-cbou@yandex.ru
irc://irc.freenode.net/bd2
^ permalink raw reply
* Re: [PATCH 5/5] [POWERPC] fsl_soc, legacy_serial: add support for "soc" compatible matching
From: Kumar Gala @ 2008-01-25 16:35 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: Scott Wood, linuxppc-dev list, Yoder Stuart
In-Reply-To: <20080124154010.GE23246@localhost.localdomain>
On Jan 24, 2008, at 9:40 AM, Anton Vorontsov wrote:
> We'll match on "soc" compatible for generic code, and "fsl,soc"
> for fsl specific code.
>
> Unfortunately it's still impossible to remove device_type = "soc"
> from the existing device tree, because older u-boots are looking for
> it.
>
> Neither we can remove model number from the soc name to heal
> arch/powerpc/boot/cuboot-85xx.c, because then dts'es will be
> incompatible with older u-boots again.
>
> So, just one machine converted so far: MPC8360E-RDK. It's new machine
> so we don't care about backward compatibility yet.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>
> I know, this patch will conflict with the legacy serial rework[1].
> It's okay though, if [1] will hit galak/powerpc.git first, I'll
> simply rebase that patch.
>
> [1] http://ozlabs.org/pipermail/linuxppc-dev/2008-January/050096.html
>
> Documentation/powerpc/booting-without-of.txt | 18 ++++------
> arch/powerpc/boot/dts/mpc836x_rdk.dts | 1 -
> arch/powerpc/kernel/legacy_serial.c | 3 +-
> arch/powerpc/sysdev/fsl_soc.c | 51 ++++++++++++++
> +-----------
> 4 files changed, 39 insertions(+), 34 deletions(-)
this needs a bit more discussion. "fsl,soc" is terrible describe. I
think we want some generic for the compat that implies 'soc register
space'.
- k
^ permalink raw reply
* Re: [PATCH 7/9] powerpc: add MPC837x RDB platform support
From: Kumar Gala @ 2008-01-25 16:17 UTC (permalink / raw)
To: Kim Phillips; +Cc: linuxppc-dev, Joe D'Abbraccio
In-Reply-To: <20080124204711.02ba14f0.kim.phillips@freescale.com>
On Jan 24, 2008, at 8:47 PM, Kim Phillips wrote:
> primarily based on mpc837x mds code.
>
> Signed-off-by: Joe D'Abbraccio <ljd015@freescale.com>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> ---
Who's the actual other of these patches? (all 9 of them).
- k
^ permalink raw reply
* Re: [PATCH 6/5] [POWERPC] get rid of `model = "UCC"' in the ucc nodes
From: Kumar Gala @ 2008-01-25 16:33 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: linuxppc-dev
In-Reply-To: <20080125143700.GA24027@localhost.localdomain>
On Jan 25, 2008, at 8:37 AM, Anton Vorontsov wrote:
> It isn't used anywhere, so remove it. If we'll ever need something
> like this, we'll use compatible property instead.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>
> New cleanup in this series...
>
> Documentation/powerpc/booting-without-of.txt | 1 -
> arch/powerpc/boot/dts/mpc832x_mds.dts | 3 ---
> arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 --
> arch/powerpc/boot/dts/mpc836x_mds.dts | 2 --
> arch/powerpc/boot/dts/mpc8568mds.dts | 2 --
> 5 files changed, 0 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/powerpc/booting-without-of.txt b/
> Documentation/powerpc/booting-without-of.txt
> index a3b6e2a..ab9f0bf 100644
> --- a/Documentation/powerpc/booting-without-of.txt
> +++ b/Documentation/powerpc/booting-without-of.txt
> @@ -1675,7 +1675,6 @@ platforms are moved over to use the flattened-
> device-tree model.
> ucc@2000 {
> device_type = "network";
> compatible = "ucc_geth";
> - model = "UCC";
> device-id = <1>;
can device-id be changed to cell-index?
- k
^ permalink raw reply
* Re: [PATCH] mpc834x_mds: Convert device tree source to dts-v1
From: Kumar Gala @ 2008-01-25 16:19 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linuxppc-dev
In-Reply-To: <479A0B6E.20507@windriver.com>
On Jan 25, 2008, at 10:16 AM, Paul Gortmaker wrote:
> Kumar Gala wrote:
>> On Fri, 25 Jan 2008, Paul Gortmaker wrote:
>>
>>
>>> Move mpc834x_mds device tree source forward to dts-v1 format.
>>> Nothing
>>> too complex in this one, so it boils down to just adding a bunch
>>> of 0x
>>> in the right places and converting clock speeds to decimal.
>>>
>>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>>> ---
>>> arch/powerpc/boot/dts/mpc834x_mds.dts | 254 ++++++++++++++++
>>> +----------------
>>> 1 files changed, 128 insertions(+), 126 deletions(-)
>>>
>>>
>>
>> applied. I fixed up things so that interrupts use decimal.
>>
>
> Yeah, IRQ was one of those gray areas where I wasn't 100%
> sure whether DTS folks would rather hex or decimal values.
decimal is easier since UMs tend to reference IRQs in dec.
I think on 85xx I might have left them as hex since the IRQs don't
directly reflect the UMs.
- k
^ permalink raw reply
* Re: [PATCH v2] [POWERPC] 85xx: Port STX GP3 board over from arch/ppc
From: Kumar Gala @ 2008-01-25 16:23 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20080125160820.GA7750@ld0162-tx32.am.freescale.net>
On Jan 25, 2008, at 10:08 AM, Scott Wood wrote:
> On Thu, Jan 24, 2008 at 10:47:21PM -0600, Kumar Gala wrote:
>> + soc8560@fdf00000 {
>
> soc@fdf00000
will fix this up in the tqm port as well.
>
>
> -Scott
>> + cpm@919c0 {
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
>
> This is also a simple-bus.
yeah, I realized I missed this. Its fixed in my tree.
>
>
>> +static struct of_device_id __initdata of_bus_ids[] = {
>> + { .name = "soc", },
>> + { .type = "soc", },
>> + { .name = "cpm", },
>> + { .name = "localbus", },
>> + { .compatible = "simple-bus", },
>> + {},
>> +};
>
> You should be able to get rid of the others besides simple-bus
> (there may
> have been some confusion in what you asked over IRC yesterday -- I
> thought you were talking about compatible in the device tree, not
> here).
yep :)
fixed and in the tqm port as well.
- k
^ permalink raw reply
* [PATCH] [POWERPC] 85xx: some minor cleanups for stx_gp3 and tqm85xx
From: Kumar Gala @ 2008-01-25 16:39 UTC (permalink / raw)
To: linuxppc-dev
* "simple-bus" covers all our needs for of_platform_bus_probe()
* make device tree name just 'soc' not 'soc85..'
---
arch/powerpc/boot/dts/stx_gp3_8560.dts | 2 +-
arch/powerpc/boot/dts/tqm8540.dts | 2 +-
arch/powerpc/boot/dts/tqm8541.dts | 2 +-
arch/powerpc/boot/dts/tqm8555.dts | 2 +-
arch/powerpc/boot/dts/tqm8560.dts | 2 +-
arch/powerpc/platforms/85xx/stx_gp3.c | 4 ----
arch/powerpc/platforms/85xx/tqm85xx.c | 4 ----
7 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index 2e97236..f81fd7f 100644
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -46,7 +46,7 @@
reg = <0x00000000 0x10000000>;
};
- soc8560@fdf00000 {
+ soc@fdf00000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index a6e3989..1addb3a 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -48,7 +48,7 @@
reg = <0x00000000 0x10000000>;
};
- soc8540@e0000000 {
+ soc@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index 11bdb0f..9e01093 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -47,7 +47,7 @@
reg = <0x00000000 0x10000000>;
};
- soc8541@e0000000 {
+ soc@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index eef9a6b..a20eb06 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -47,7 +47,7 @@
reg = <0x00000000 0x10000000>;
};
- soc8555@e0000000 {
+ soc@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index 8ca7fdd..b9ac6c9 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -48,7 +48,7 @@
reg = <0x00000000 0x10000000>;
};
- soc8560@e0000000 {
+ soc@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "soc";
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 0b20c17..18499d7 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -148,10 +148,6 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
}
static struct of_device_id __initdata of_bus_ids[] = {
- { .name = "soc", },
- { .type = "soc", },
- { .name = "cpm", },
- { .name = "localbus", },
{ .compatible = "simple-bus", },
{},
};
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 2a08b31..77681ac 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -146,10 +146,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
}
static struct of_device_id __initdata of_bus_ids[] = {
- { .name = "soc", },
- { .type = "soc", },
- { .name = "cpm", },
- { .name = "localbus", },
{ .compatible = "simple-bus", },
{},
};
--
1.5.3.7
^ permalink raw reply related
* Re: ppc32: Weird process scheduling behaviour with 2.6.24-rc
From: Benjamin Herrenschmidt @ 2008-01-25 21:10 UTC (permalink / raw)
To: Michel Dänzer; +Cc: linuxppc-dev, Ingo Molnar, Peter Zijlstra, vatsa
In-Reply-To: <1201273484.6090.12.camel@thor.sulgenrain.local>
On Fri, 2008-01-25 at 16:04 +0100, Michel Dänzer wrote:
> > Hmm, interesting. As I said before, I thought I had tested with this
> > disabled and not seen a difference, but I'll try again to confirm.
>
> So, 2.6.24 final is indeed much better with this disabled, but still
> not
> as good as 2.6.23: While I can reliably move a window again while the
> infinite loop is running, it still stutters badly every couple of
> seconds. With 2.6.23 this is smooth all the time.
This is with or without fair group scheduler enabled ?
Ben.
^ permalink raw reply
* Re: [PATCH 4/9] enable FSL SATA driver config for Freescale SoCs
From: Kumar Gala @ 2008-01-25 21:23 UTC (permalink / raw)
To: Kim Phillips; +Cc: linux-ide, linuxppc-dev, Jeff Garzik, Jerry Huang
In-Reply-To: <20080124204621.2c09359e.kim.phillips@freescale.com>
On Thu, 24 Jan 2008, Kim Phillips wrote:
> The mpc8315 shares the same SATA controller as the mpc837x,
> and likelihood is that future SoCs from Freescale will also.
>
> Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> ---
> Kumar, let me know if you want me to post this to the ata list (I'm
> assuming it's not necessary).
>
> drivers/ata/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
applied.
- k
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox