[PATCH 7/9] 8xx: mpc885ads cleanup
It now uses the new CPM binding and the generic pin/clock functions, and
has assorted fixes and cleanup.
Signed-off-by: Scott Wood <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/mpc885ads.dts | 191 ++-
arch/powerpc/configs/mpc885_ads_defconfig| 297 +
arch/powerpc/platforms/8xx/Kconfig |1 +
arch/powerpc/platforms/8xx/mpc885ads.h | 38 ---
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 450 +-
5 files changed, 414 insertions(+), 563 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts
b/arch/powerpc/boot/dts/mpc885ads.dts
index dc7ab9c..c21b54d 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -2,6 +2,7 @@
* MPC885 ADS Device Tree Source
*
* Copyright 2006 MontaVista Software, Inc.
+ * Copyright 2007 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -12,7 +13,7 @@
/ {
model = "MPC885ADS";
- compatible = "mpc8xx";
+ compatible = "fsl,mpc885ads";
#address-cells = <1>;
#size-cells = <1>;
@@ -23,161 +24,179 @@
PowerPC,[EMAIL PROTECTED] {
device_type = "cpu";
reg = <0>;
- d-cache-line-size = <20>; // 32 bytes
- i-cache-line-size = <20>; // 32 bytes
- d-cache-size = <2000>; // L1, 8K
- i-cache-size = <2000>; // L1, 8K
+ d-cache-line-size = ;
+ i-cache-line-size = ;
+ d-cache-size = ;
+ i-cache-size = ;
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
interrupts = ; // decrementer interrupt
- interrupt-parent = <&Mpc8xx_pic>;
+ interrupt-parent = <&PIC>;
};
};
memory {
device_type = "memory";
- reg = < 80>;
+ reg = <0 0>;
};
- [EMAIL PROTECTED] {
+ chipselect {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ [EMAIL PROTECTED] {
+ device_type = "rom";
+ compatible = "direct-mapped";
+ reg = ;
+ probe-type = "JEDEC";
+ bank-width = <4>;
+ };
+
+ [EMAIL PROTECTED] {
+ reg = ;
+ compatible = "fsl,mpc885ads-bcsr";
+ };
+ };
+
+ [EMAIL PROTECTED] {
+ compatible = "fsl,mpc885", "fsl,pq1-soc";
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
- ranges = <0 ff00 0010>;
- reg = ;
+ ranges = <0 ff00 4000>;
bus-frequency = <0>;
- [EMAIL PROTECTED] {
- device_type = "mdio";
- compatible = "fs_enet";
- reg = ;
+
+ [EMAIL PROTECTED] {
+ compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
+ reg = ;
#address-cells = <1>;
#size-cells = <0>;
- Phy0: [EMAIL PROTECTED] {
+
+ PHY0: [EMAIL PROTECTED] {
reg = <0>;
device_type = "ethernet-phy";
};
- Phy1: [EMAIL PROTECTED] {
+
+ PHY1: [EMAIL PROTECTED] {
reg = <1>;
device_type = "ethernet-phy";
};
- Phy2: [EMAIL PROTECTED] {
+
+ PHY2: [EMAIL PROTECTED] {
reg = <2>;
device_type = "ethernet-phy";
};
};
- [EMAIL PROTECTED] {
+ [EMAIL PROTECTED] {
device_type = "network";
- compatible = "fs_enet";
- model = "FEC";
- device-id = <1>;
+ compatible = "fsl,mpc885-fec-enet",
+"fsl,pq1-fec-enet";
reg = ;
- mac-address = [ 00 00 0C 00 01 FD ];
+ local-mac-address = [ 00 00 00 00 00 00 ];
interrupt
Re: [PATCH 7/9] 8xx: mpc885ads cleanup
On Tue, 28 Aug 2007 15:19:09 -0500
Scott Wood wrote:
> It now uses the new CPM binding and the generic pin/clock functions,
> and has assorted fixes and cleanup.
>
good work, thanks.
> Signed-off-by: Scott Wood <[EMAIL PROTECTED]>
Acked-by: Vitaly Bordug <[EMAIL PROTECTED]>
> ---
> arch/powerpc/boot/dts/mpc885ads.dts | 192 ++-
> arch/powerpc/configs/mpc885_ads_defconfig| 445
> +++---
> arch/powerpc/platforms/8xx/Kconfig |1 +
> arch/powerpc/platforms/8xx/mpc885ads.h | 38 ---
> arch/powerpc/platforms/8xx/mpc885ads_setup.c | 455
> +- 5 files changed, 455 insertions(+), 676
> deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc885ads.dts
> b/arch/powerpc/boot/dts/mpc885ads.dts index dc7ab9c..76c0a06 100644
> --- a/arch/powerpc/boot/dts/mpc885ads.dts
> +++ b/arch/powerpc/boot/dts/mpc885ads.dts
> @@ -2,6 +2,7 @@
> * MPC885 ADS Device Tree Source
> *
> * Copyright 2006 MontaVista Software, Inc.
> + * Copyright 2007 Freescale Semiconductor, Inc.
> *
> * This program is free software; you can redistribute it and/or
> modify it
> * under the terms of the GNU General Public License as published
> by the @@ -12,7 +13,7 @@
>
> / {
> model = "MPC885ADS";
> - compatible = "mpc8xx";
> + compatible = "fsl,mpc885ads";
> #address-cells = <1>;
> #size-cells = <1>;
>
> @@ -23,161 +24,180 @@
> PowerPC,[EMAIL PROTECTED] {
> device_type = "cpu";
> reg = <0>;
> - d-cache-line-size = <20>; // 32 bytes
> - i-cache-line-size = <20>; // 32 bytes
> - d-cache-size = <2000>; // L1,
> 8K
> - i-cache-size = <2000>; // L1,
> 8K
> + d-cache-line-size = ;
> + i-cache-line-size = ;
> + d-cache-size = ;
> + i-cache-size = ;
> timebase-frequency = <0>;
> bus-frequency = <0>;
> clock-frequency = <0>;
> - 32-bit;
> interrupts = ; // decrementer
> interrupt
> - interrupt-parent = <&Mpc8xx_pic>;
> + interrupt-parent = <&PIC>;
> };
> };
>
> memory {
> device_type = "memory";
> - reg = < 80>;
> + reg = <0 0>;
> };
>
> - [EMAIL PROTECTED] {
> + chipselect {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + [EMAIL PROTECTED] {
> + device_type = "rom";
> + compatible = "direct-mapped";
> + reg = ;
> + probe-type = "JEDEC";
> + bank-width = <4>;
> + };
> +
> + [EMAIL PROTECTED] {
> + reg = ;
> + compatible = "fsl,mpc885ads-bcsr";
> + };
> + };
> +
> + [EMAIL PROTECTED] {
> + compatible = "fsl,mpc885", "fsl,pq1-soc";
> #address-cells = <1>;
> #size-cells = <1>;
> - #interrupt-cells = <2>;
> device_type = "soc";
> - ranges = <0 ff00 0010>;
> - reg = ;
> + ranges = <0 ff00 4000>;
> bus-frequency = <0>;
> - [EMAIL PROTECTED] {
> - device_type = "mdio";
> - compatible = "fs_enet";
> - reg = ;
> +
> + [EMAIL PROTECTED] {
> + compatible = "fsl,mpc885-fec-mdio",
> "fsl,pq1-fec-mdio";
> + reg = ;
> #address-cells = <1>;
> #size-cells = <0>;
> - Phy0: [EMAIL PROTECTED] {
> +
> + PHY0: [EMAIL PROTECTED] {
> reg = <0>;
> device_type = "ethernet-phy";
> };
> - Phy1: [EMAIL PROTECTED] {
> +
> + PHY1: [EMAIL PROTECTED] {
> reg = <1>;
> device_type = "ethernet-phy";
> };
> - Phy2: [EMAIL PROTECTED] {
> +
> + PHY2: [EMAIL PROTECTED] {
> reg = <2>;
> device_type = "ethernet-phy";
> };
> };
>
> - [EMAIL PROTECTED] {
> + [EMAIL PROTECTED] {
> device_type = "network";
> - compatible = "fs_enet";
> - model = "FEC";
> - device-id = <1>;
> + compatible = "fsl,mpc885-fec-enet",
> +
[PATCH 7/9] 8xx: mpc885ads cleanup
It now uses the new CPM binding and the generic pin/clock functions, and
has assorted fixes and cleanup.
Signed-off-by: Scott Wood <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/mpc885ads.dts | 192 ++-
arch/powerpc/configs/mpc885_ads_defconfig| 445 +++---
arch/powerpc/platforms/8xx/Kconfig |1 +
arch/powerpc/platforms/8xx/mpc885ads.h | 38 ---
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 455 +-
5 files changed, 455 insertions(+), 676 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts
b/arch/powerpc/boot/dts/mpc885ads.dts
index dc7ab9c..76c0a06 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -2,6 +2,7 @@
* MPC885 ADS Device Tree Source
*
* Copyright 2006 MontaVista Software, Inc.
+ * Copyright 2007 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -12,7 +13,7 @@
/ {
model = "MPC885ADS";
- compatible = "mpc8xx";
+ compatible = "fsl,mpc885ads";
#address-cells = <1>;
#size-cells = <1>;
@@ -23,161 +24,180 @@
PowerPC,[EMAIL PROTECTED] {
device_type = "cpu";
reg = <0>;
- d-cache-line-size = <20>; // 32 bytes
- i-cache-line-size = <20>; // 32 bytes
- d-cache-size = <2000>; // L1, 8K
- i-cache-size = <2000>; // L1, 8K
+ d-cache-line-size = ;
+ i-cache-line-size = ;
+ d-cache-size = ;
+ i-cache-size = ;
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
interrupts = ; // decrementer interrupt
- interrupt-parent = <&Mpc8xx_pic>;
+ interrupt-parent = <&PIC>;
};
};
memory {
device_type = "memory";
- reg = < 80>;
+ reg = <0 0>;
};
- [EMAIL PROTECTED] {
+ chipselect {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ [EMAIL PROTECTED] {
+ device_type = "rom";
+ compatible = "direct-mapped";
+ reg = ;
+ probe-type = "JEDEC";
+ bank-width = <4>;
+ };
+
+ [EMAIL PROTECTED] {
+ reg = ;
+ compatible = "fsl,mpc885ads-bcsr";
+ };
+ };
+
+ [EMAIL PROTECTED] {
+ compatible = "fsl,mpc885", "fsl,pq1-soc";
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
- ranges = <0 ff00 0010>;
- reg = ;
+ ranges = <0 ff00 4000>;
bus-frequency = <0>;
- [EMAIL PROTECTED] {
- device_type = "mdio";
- compatible = "fs_enet";
- reg = ;
+
+ [EMAIL PROTECTED] {
+ compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
+ reg = ;
#address-cells = <1>;
#size-cells = <0>;
- Phy0: [EMAIL PROTECTED] {
+
+ PHY0: [EMAIL PROTECTED] {
reg = <0>;
device_type = "ethernet-phy";
};
- Phy1: [EMAIL PROTECTED] {
+
+ PHY1: [EMAIL PROTECTED] {
reg = <1>;
device_type = "ethernet-phy";
};
- Phy2: [EMAIL PROTECTED] {
+
+ PHY2: [EMAIL PROTECTED] {
reg = <2>;
device_type = "ethernet-phy";
};
};
- [EMAIL PROTECTED] {
+ [EMAIL PROTECTED] {
device_type = "network";
- compatible = "fs_enet";
- model = "FEC";
- device-id = <1>;
+ compatible = "fsl,mpc885-fec-enet",
+"fsl,pq1-fec-enet";
reg = ;
- mac-address = [ 00 00 0C 00 01 FD ];
+ local-mac-address = [ 00 00 00 00 00 00 ];
