UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: 8136/1: sa1100: add Micro ASIC platform device 

This adds the Atmel Micro ASIC platform device and selects it
by default for h3100 and h3600.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Linus Walleij 2014-09-02 13:21:44 +01:00 committed by Russell King
parent 084bb5bc00
commit abf3878047
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-sa1100/Kconfig
View File

@ -58,6 +58,7 @@ config SA1100_H3100
bool "Compaq iPAQ H3100" bool "Compaq iPAQ H3100"
select ARM_SA1110_CPUFREQ select ARM_SA1110_CPUFREQ
select HTC_EGPIO select HTC_EGPIO
select MFD_IPAQ_MICRO
help help
Say Y here if you intend to run this kernel on the Compaq iPAQ Say Y here if you intend to run this kernel on the Compaq iPAQ
H3100 handheld computer. Information about this machine and the H3100 handheld computer. Information about this machine and the
@ -69,6 +70,7 @@ config SA1100_H3600
bool "Compaq iPAQ H3600/H3700" bool "Compaq iPAQ H3600/H3700"
select ARM_SA1110_CPUFREQ select ARM_SA1110_CPUFREQ
select HTC_EGPIO select HTC_EGPIO
select MFD_IPAQ_MICRO
help help
Say Y here if you intend to run this kernel on the Compaq iPAQ Say Y here if you intend to run this kernel on the Compaq iPAQ
H3600 handheld computer. Information about this machine and the H3600 handheld computer. Information about this machine and the

15
arch/arm/mach-sa1100/h3xxx.c
View File

@ -25,6 +25,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/h3xxx.h> #include <mach/h3xxx.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
@ -244,9 +245,23 @@ static struct platform_device h3xxx_keys = {
}, },
}; };
static struct resource h3xxx_micro_resources[] = {
DEFINE_RES_MEM(0x80010000, SZ_4K),
DEFINE_RES_MEM(0x80020000, SZ_4K),
DEFINE_RES_IRQ(IRQ_Ser1UART),
};
struct platform_device h3xxx_micro_asic = {
.name = "ipaq-h3xxx-micro",
.id = -1,
.resource = h3xxx_micro_resources,
.num_resources = ARRAY_SIZE(h3xxx_micro_resources),
};
static struct platform_device *h3xxx_devices[] = { static struct platform_device *h3xxx_devices[] = {
&h3xxx_egpio, &h3xxx_egpio,
&h3xxx_keys, &h3xxx_keys,
&h3xxx_micro_asic,
}; };
void __init h3xxx_mach_init(void) void __init h3xxx_mach_init(void)