diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
| commit | daac8bf5d3bd5e157c66d753eac0d5efb47aa145 (patch) | |
| tree | d599de85cebf7ab3da97e0275dbf1b40399e1943 /arch/arm/mach-versatile | |
| parent | 2f5cd8571912689900651a17297ee5e8ed2bb816 (diff) | |
| parent | 33f59d8a81b4f870239b79ef274609b964292f84 (diff) | |
| download | barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.gz barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.xz | |
Merge branch 'for-next/bcm2835'
Conflicts:
arch/arm/configs/versatilepb_defconfig
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/include/mach/gpio.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 853437991a..8aca2a19e3 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -203,3 +203,13 @@ void __noreturn reset_cpu (unsigned long ignored) while(1); } EXPORT_SYMBOL(reset_cpu); + +static int versatile_init(void) +{ + amba_apb_device_add(NULL, "pl061_gpio", 0, 0x101e4000, 4096, NULL, 0); + amba_apb_device_add(NULL, "pl061_gpio", 1, 0x101e5000, 4096, NULL, 0); + amba_apb_device_add(NULL, "pl061_gpio", 2, 0x101e6000, 4096, NULL, 0); + amba_apb_device_add(NULL, "pl061_gpio", 3, 0x101e7000, 4096, NULL, 0); + return 0; +} +coredevice_initcall(versatile_init); diff --git a/arch/arm/mach-versatile/include/mach/gpio.h b/arch/arm/mach-versatile/include/mach/gpio.h new file mode 100644 index 0000000000..306ab4c9f2 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/gpio.h @@ -0,0 +1 @@ +#include <asm-generic/gpio.h> |