Beside the MPC 8360 based board kmeter1 other km83xx boards
from keymile will follow. Therefore the board specific naming
kmeter1 for functions and files were replaced with km83xx.
Additionally some updates were made:
- update defconfig for 2.6.38
- rework flash partitioning in dts file
- add gpio controller for qe_pio_c in dts
Signed-off-by: Holger Brunck holger.bru...@keymile.com
Acked-by: Heiko Schocher h...@denx.de
CC: Benjamin Herrenschmidt b...@kernel.crashing.org
CC: Kumar Gala ga...@kernel.crashing.org
CC: Heiko Schocher h...@denx.de
---
arch/powerpc/boot/dts/kmeter1.dts | 69 +++-
arch/powerpc/configs/83xx/kmeter1_defconfig|7 +--
arch/powerpc/platforms/83xx/Makefile |2 +-
.../powerpc/platforms/83xx/{kmeter1.c = km83xx.c} | 46 +
4 files changed, 71 insertions(+), 53 deletions(-)
rename arch/powerpc/platforms/83xx/{kmeter1.c = km83xx.c} (80%)
diff --git a/arch/powerpc/boot/dts/kmeter1.dts
b/arch/powerpc/boot/dts/kmeter1.dts
index d8b5d12..d16bae1 100644
--- a/arch/powerpc/boot/dts/kmeter1.dts
+++ b/arch/powerpc/boot/dts/kmeter1.dts
@@ -1,7 +1,7 @@
/*
* Keymile KMETER1 Device Tree Source
*
- * 2008 DENX Software Engineering GmbH
+ * 2008-2011 DENX Software Engineering GmbH
*
* 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
@@ -70,11 +70,11 @@
#address-cells = 1;
#size-cells = 0;
cell-index = 0;
- compatible = fsl-i2c;
+ compatible = fsl,mpc8313-i2c,fsl-i2c;
reg = 0x3000 0x100;
interrupts = 14 0x8;
interrupt-parent = ipic;
- dfsrr;
+ clock-frequency = 40;
};
serial0: serial@4500 {
@@ -137,6 +137,13 @@
compatible = fsl,mpc8360-par_io;
num-ports = 7;
+ qe_pio_c: gpio-controller@30 {
+ #gpio-cells = 2;
+ compatible = fsl,mpc8360-qe-pario-bank,
+fsl,mpc8323-qe-pario-bank;
+ reg = 0x1430 0x18;
+ gpio-controller;
+ };
pio_ucc1: ucc_pin@0 {
reg = 0;
@@ -472,7 +479,17 @@
#address-cells = 0;
#interrupt-cells = 1;
reg = 0x80 0x80;
- interrupts = 32 8 33 8;
+ big-endian;
+ interrupts =
+ 32 0x8
+ 33 0x8
+ 34 0x8
+ 35 0x8
+ 40 0x8
+ 41 0x8
+ 42 0x8
+ 43 0x8
+ ;
interrupt-parent = ipic;
};
};
@@ -484,43 +501,31 @@
compatible = fsl,mpc8360-localbus, fsl,pq2pro-localbus,
simple-bus;
reg = 0xe0005000 0xd8;
- ranges = 0 0 0xf000 0x0400; /* Filled in by U-Boot
*/
+ ranges = 0 0 0xf000 0x0400 /* LB 0 */
+ 1 0 0xe800 0x0100 /* LB 1 */
+ 3 0 0xa000 0x1000; /* LB 3 */
- flash@f000,0 {
+ flash@0,0 {
compatible = cfi-flash;
- /*
-* The Intel P30 chip has 2 non-identical chips on
-* one die, so we need to define 2 separate regions
-* that are scanned by physmap_of independantly.
-*/
- reg = 0 0x 0x0200
- 0 0x0200 0x0200;/* Filled in by
U-Boot */
- bank-width = 2;
+ reg = 0 0 0x0400;
#address-cells = 1;
#size-cells = 1;
- partition@0 {
+ bank-width = 2;
+ partition@0 { /* 768KB */
label = u-boot;
- reg = 0 0x4;
+ reg = 0 0xC;
};
- partition@4 {
+ partition@c { /* 128KB */
