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>
80 lines
2.6 KiB
C
80 lines
2.6 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <init.h>
|
|
#include <mach/imx25-regs.h>
|
|
#include <mach/iim.h>
|
|
#include <io.h>
|
|
#include <mach/weim.h>
|
|
#include <mach/generic.h>
|
|
#include <sizes.h>
|
|
|
|
void imx25_setup_weimcs(size_t cs, unsigned upper, unsigned lower,
|
|
unsigned additional)
|
|
{
|
|
writel(upper, MX25_WEIM_BASE_ADDR + (cs * 0x10) + 0x0);
|
|
writel(lower, MX25_WEIM_BASE_ADDR + (cs * 0x10) + 0x4);
|
|
writel(additional, MX25_WEIM_BASE_ADDR + (cs * 0x10) + 0x8);
|
|
}
|
|
|
|
/* IIM fuse definitions */
|
|
#define IIM_BANK0_BASE (MX25_IIM_BASE_ADDR + 0x800)
|
|
#define IIM_BANK1_BASE (MX25_IIM_BASE_ADDR + 0xc00)
|
|
#define IIM_BANK2_BASE (MX25_IIM_BASE_ADDR + 0x1000)
|
|
|
|
#define IIM_UID (IIM_BANK0_BASE + 0x20)
|
|
#define IIM_MAC_ADDR (IIM_BANK0_BASE + 0x68)
|
|
|
|
u64 imx_uid(void)
|
|
{
|
|
u64 uid = 0;
|
|
int i;
|
|
|
|
/*
|
|
* This code assumes that the UID is stored little-endian. The
|
|
* Freescale AN3682 document is silent about the endianess, but
|
|
* experimentation shows that this is the case. All other multi-byte
|
|
* values in IIM are big-endian as per AN3682.
|
|
*/
|
|
for (i = 0; i < 8; i++)
|
|
uid |= (u64)readb(IIM_UID + i*4) << (i*8);
|
|
|
|
return uid;
|
|
}
|
|
|
|
int imx25_init(void)
|
|
{
|
|
imx25_boot_save_loc((void *)MX25_CCM_BASE_ADDR);
|
|
add_generic_device("imx25-esdctl", 0, NULL, MX25_ESDCTL_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int imx25_devices_init(void)
|
|
{
|
|
add_generic_device("imx_iim", 0, NULL, MX25_IIM_BASE_ADDR, SZ_4K,
|
|
IORESOURCE_MEM, NULL);
|
|
|
|
add_generic_device("imx-iomuxv3", 0, NULL, MX25_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx25-ccm", 0, NULL, MX25_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx31-gpt", 0, NULL, MX25_GPT1_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx31-gpio", 0, NULL, MX25_GPIO1_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx31-gpio", 1, NULL, MX25_GPIO2_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx31-gpio", 2, NULL, MX25_GPIO3_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx31-gpio", 3, NULL, MX25_GPIO4_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
add_generic_device("imx21-wdt", 0, NULL, MX25_WDOG_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
|
|
|
|
return 0;
|
|
}
|