Merge git://git.denx.de/u-boot-rockchip

[u-boot] / arch / arm / mach-bcm283x / include / mach / gpio.h

diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h
index b2df75ad3f257c26b7c6b11626404f8ff9e5f3db..7b4ddc924640b215c10f2ade91ce28f2e022f630 100644 (file)
--- a/arch/arm/mach-bcm283x/include/mach/gpio.h
+++ b/arch/arm/mach-bcm283x/include/mach/gpio.h
@@ -9,11 +9,6 @@
 #ifndef _BCM2835_GPIO_H_
 #define _BCM2835_GPIO_H_
 
-#ifndef CONFIG_BCM2835
-#define BCM2835_GPIO_BASE              0x3f200000
-#else
-#define BCM2835_GPIO_BASE              0x20200000
-#endif
 #define BCM2835_GPIO_COUNT             54
 
 #define BCM2835_GPIO_FSEL_MASK         0x7
@@ -66,6 +61,4 @@ struct bcm2835_gpio_platdata {
        unsigned long base;
 };
 
-int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned gpio);
-
 #endif /* _BCM2835_GPIO_H_ */