diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-27 22:47:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-28 08:18:44 +0100 |
| commit | f3ff746d20931b681f5f1fcac44aea317b06dac0 (patch) | |
| tree | d74192654fb0a083735604e0eaf01a0dfc9c2909 | |
| parent | f0535fe5eee24fd78643dcd2e448c2f7d0c386ee (diff) | |
| download | barebox-f3ff746d20931b681f5f1fcac44aea317b06dac0.tar.gz barebox-f3ff746d20931b681f5f1fcac44aea317b06dac0.tar.xz | |
ARM: MXS: Create ocotp device in SoC code
The ocotp device is completely SoC internal, no need to register
it from boards. Register it from SoC code instead.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 3 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx28-evk/mx28-evk.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/karo-tx28/tx28-stk5.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/soc-imx28.c | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index 1412eff4a7..6e83570c55 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -127,9 +127,6 @@ static int cfa10036_devices_init(void) add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, SZ_8K, IORESOURCE_MEM, &mci_pdata); - add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, SZ_8K, - IORESOURCE_MEM, NULL); - i2c_register_board_info(0, cfa10036_i2c_devices, ARRAY_SIZE(cfa10036_i2c_devices)); add_generic_device_res("i2c-gpio", 0, NULL, 0, &i2c_gpio_pdata); diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index dce6d31030..d77a6c7156 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -275,8 +275,6 @@ static int mx28_evk_devices_init(void) add_generic_device("stmfb", 0, NULL, IMX_FB_BASE, 0x2000, IORESOURCE_MEM, &mx28_evk_fb_pdata); - add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000, - IORESOURCE_MEM, NULL); mx28_evk_get_ethaddr(); /* must be after registering ocotp */ mx28_evk_fec_reset(); diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index c4c51099b4..9b86d1c883 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -382,9 +382,6 @@ void base_board_init(void) add_generic_device("stmfb", 0, NULL, IMX_FB_BASE, 0x2000, IORESOURCE_MEM, &tx28_fb_pdata); - add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000, - IORESOURCE_MEM, NULL); - tx28_get_ethaddr(); add_generic_device("imx28-fec", 0, NULL, IMX_FEC0_BASE, 0x4000, diff --git a/arch/arm/mach-mxs/soc-imx28.c b/arch/arm/mach-mxs/soc-imx28.c index 4f0d89508c..b4ec38d912 100644 --- a/arch/arm/mach-mxs/soc-imx28.c +++ b/arch/arm/mach-mxs/soc-imx28.c @@ -66,6 +66,7 @@ static int imx28_devices_init(void) add_generic_device("imx28-gpio", 2, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL); add_generic_device("imx28-gpio", 3, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL); add_generic_device("imx28-gpio", 4, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL); + add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000, IORESOURCE_MEM, NULL); return 0; } |