diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-12 08:33:09 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-12 08:33:55 +0200 |
| commit | aca00bb7196355a30b091253ea7ee3ed698ee082 (patch) | |
| tree | 1a4ee17a2f0c3a4ab8885855e421703686793337 | |
| parent | 693b92d58a50e7ed3d6f5c4ddfbec980228ecc55 (diff) | |
| download | barebox-aca00bb7196355a30b091253ea7ee3ed698ee082.tar.gz barebox-aca00bb7196355a30b091253ea7ee3ed698ee082.tar.xz | |
ARM: Phytec-phyCARD-imx27: Add missing compatible check
Only run pca100 code when it's actually a pca100. While at it
consolidate two initcalls.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/phytec-phycard-imx27/pca100.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c index 4b355bcc6a..895a3a3957 100644 --- a/arch/arm/boards/phytec-phycard-imx27/pca100.c +++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c @@ -119,6 +119,12 @@ static int pca100_devices_init(void) PE25_PF_USBOTG_DATA7, }; + if (!of_machine_is_compatible("phytec,imx27-pca100")) + return 0; + + barebox_set_model("Phytec phyCARD-i.MX27"); + barebox_set_hostname("phycard-imx27"); + pca100_usb_init(); /* initizalize gpios */ @@ -137,13 +143,3 @@ static int pca100_devices_init(void) } device_initcall(pca100_devices_init); - -static int pca100_console_init(void) -{ - barebox_set_model("Phytec phyCARD-i.MX27"); - barebox_set_hostname("phycard-imx27"); - - return 0; -} - -console_initcall(pca100_console_init); |