summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS1
-rwxr-xr-x[-rw-r--r--]MAKEALL1
-rw-r--r--Makefile3
-rw-r--r--include/asm-ppc/gpio.h5
4 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2a3b93735a..ffe0f512aa 100644
--- 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
index a817f2f6a9..866f3e1759 100644..100755
--- 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 0973999f82..57bae3390e 100644
--- 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 c3a4a88d58..fc05dc0df7 100644
--- 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
OpenPOWER on IntegriCloud