diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-20 11:02:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-20 11:02:40 +0200 |
| commit | 2cf467ec07cac78e60742e24553e89f80c401399 (patch) | |
| tree | d8fb139b78b768142c2adfa07d77eab3f1322cb0 /arch/arm/mach-imx/imx31.c | |
| parent | d3924e4fe5c8a1445ca677065fa1376b51d3db7e (diff) | |
| download | barebox-2cf467ec07cac78e60742e24553e89f80c401399.tar.gz barebox-2cf467ec07cac78e60742e24553e89f80c401399.tar.xz | |
ARM: i.MX: move esdctl device registration to soc_init
The esdctl devices are currently not in the devicetrees. this means
they are not registered when booting from the devicetree. Move the
device registration from soc_devices_init to soc_init which is called
even with devicetree support so that we get esdctl devices.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/imx31.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c index eb0c4150e7..3013f0208f 100644 --- a/arch/arm/mach-imx/imx31.c +++ b/arch/arm/mach-imx/imx31.c @@ -29,6 +29,7 @@ void imx31_setup_weimcs(size_t cs, unsigned upper, unsigned lower, int imx31_init(void) { + add_generic_device("imx31-esdctl", 0, NULL, MX31_ESDCTL_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); return 0; } @@ -44,7 +45,6 @@ int imx31_devices_init(void) add_generic_device("imx31-gpio", 1, NULL, MX31_GPIO2_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx31-gpio", 2, NULL, MX31_GPIO3_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx21-wdt", 0, NULL, MX31_WDOG_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); - add_generic_device("imx31-esdctl", 0, NULL, MX31_ESDCTL_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx31-usb-misc", 0, NULL, MX31_USB_OTG_BASE_ADDR + 0x600, 0x100, IORESOURCE_MEM, NULL); return 0; |