ppc4xx: Add AMCC Canyonlands support (460EX) (3/3)

This patch adds support for the AMCC Canyonlands 460EX evaluation
board.

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2a3b937..ffe0f51 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -320,6 +320,7 @@ Stefan Roese <sr@denx.de>
        alpr                    PPC440GX
        bamboo                  PPC440EP
        bunbinga                PPC405EP
+       canyonlands             PPC460EX
        ebony                   PPC440GP
        haleakala               PPC405EXr
        katmai                  PPC440SPe

diff --git a/MAKEALL b/MAKEALL
old mode 100644 (file)
new mode 100755 (executable)
index a817f2f..866f3e1
--- a/MAKEALL
+++ b/MAKEALL
@@ -165,6 +165,7 @@ LIST_4xx="          \
        bamboo_nand     \
        bubinga         \
        CANBT           \
+       canyonlands     \
        CMS700          \
        CPCI2DP         \
        CPCI405         \

diff --git a/Makefile b/Makefile
index 0973999..57bae33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1170,6 +1170,9 @@ bubinga_config:   unconfig
 CANBT_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
 
+canyonlands_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx canyonlands amcc
+
 CATcenter_config       \
 CATcenter_25_config    \
 CATcenter_33_config:   unconfig

diff --git a/include/asm-ppc/gpio.h b/include/asm-ppc/gpio.h
index c3a4a88..fc05dc0 100644 (file)
--- a/include/asm-ppc/gpio.h
+++ b/include/asm-ppc/gpio.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007
+ * (C) Copyright 2007-2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -27,7 +27,8 @@
 /* 4xx PPC's have 2 GPIO controllers */
 #if defined(CONFIG_405EZ) ||                                   \
        defined(CONFIG_440EP) || defined(CONFIG_440GR) ||       \
-       defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
+       defined(CONFIG_440EPX) || defined(CONFIG_440GRX) ||     \
+       defined(CONFIG_460EX) || defined(CONFIG_460GT)
 #define GPIO_GROUP_MAX 2
 #else
 #define GPIO_GROUP_MAX 1