diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-02-24 13:23:57 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-25 08:57:40 +0100 |
| commit | 5f19b733449e7ff90c0e3e9f48af6f284e9335f3 (patch) | |
| tree | e8d124122d3260cd6deb2791e57f070fde0ad5fe /arch/arm/mach-imx/imx27.c | |
| parent | cb8ee706afdcf89a15ff3ce1a16de1abd8964025 (diff) | |
| download | barebox-5f19b733449e7ff90c0e3e9f48af6f284e9335f3.tar.gz barebox-5f19b733449e7ff90c0e3e9f48af6f284e9335f3.tar.xz | |
ARM: i.MX27: Use DEVICE_ID_SINGLE for IIM, CCM and ESDCTL
Only one of IIM, CCM or ESDCTL device is allowed, so use DEVICE_ID_SINGLE
for these devices.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx27.c')
| -rw-r--r-- | arch/arm/mach-imx/imx27.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c index 6d30276284..e9d6197d55 100644 --- a/arch/arm/mach-imx/imx27.c +++ b/arch/arm/mach-imx/imx27.c @@ -103,12 +103,13 @@ static int imx27_init(void) imx_iomuxv1_init((void *)MX27_GPIO1_BASE_ADDR); - add_generic_device("imx_iim", 0, NULL, MX27_IIM_BASE_ADDR, SZ_4K, - IORESOURCE_MEM, NULL); + add_generic_device("imx_iim", DEVICE_ID_SINGLE, NULL, + MX27_IIM_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); imx27_init_max(); - add_generic_device("imx27-ccm", 0, NULL, MX27_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); + add_generic_device("imx27-ccm", DEVICE_ID_SINGLE, NULL, + MX27_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx1-gpt", 0, NULL, MX27_GPT1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx1-gpio", 0, NULL, MX27_GPIO1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx1-gpio", 1, NULL, MX27_GPIO2_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); @@ -117,7 +118,8 @@ static int imx27_init(void) add_generic_device("imx1-gpio", 4, NULL, MX27_GPIO5_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx1-gpio", 5, NULL, MX27_GPIO6_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx21-wdt", 0, NULL, MX27_WDOG_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); - add_generic_device("imx27-esdctl", 0, NULL, MX27_ESDCTL_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); + add_generic_device("imx27-esdctl", DEVICE_ID_SINGLE, NULL, + MX27_ESDCTL_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx27-usb-misc", 0, NULL, MX27_USB_OTG_BASE_ADDR + 0x600, 0x100, IORESOURCE_MEM, NULL); return 0; |