diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-08 15:24:50 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-08 15:24:50 -0500 |
commit | deb287b561233a1a9718ec87360dfa2079144e60 (patch) | |
tree | 2ecce95e6d7203f63ffa8c6dc0d7c2a90f0aefe6 /drivers/misc | |
parent | ce022f2857714e19c6b31a023b8145782ecef5a5 (diff) | |
parent | 028c8c411976c30758ddb5f5ffeef792e4595d8d (diff) | |
download | u-boot-deb287b561233a1a9718ec87360dfa2079144e60.tar.gz |
Merge tag 'u-boot-imx-20200108' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
---------------------------------------------------------------------
Add i.MX8MP SoC and EVK board
Update README for i.MX8MN EVK and fix mmc env
Add pca9450 driver
--------------------------------------------------------------------
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/634211885
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mxc_ocotp.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c index 1b945e9727a..80cd8dcedac 100644 --- a/drivers/misc/mxc_ocotp.c +++ b/drivers/misc/mxc_ocotp.c @@ -35,7 +35,16 @@ #define BM_OUT_STATUS_LOCKED 0x00000800 #define BM_OUT_STATUS_PROGFAIL 0x00001000 #elif defined(CONFIG_IMX8M) +#ifdef CONFIG_IMX8MP +#undef BM_CTRL_ADDR +#undef BM_CTRL_ERROR +#undef BM_CTRL_BUSY +#define BM_CTRL_ADDR 0x000001ff +#define BM_CTRL_ERROR 0x00000400 +#define BM_CTRL_BUSY 0x00000200 +#else #define BM_CTRL_ADDR 0x000000ff +#endif #else #define BM_CTRL_ADDR 0x0000007f #endif @@ -82,7 +91,11 @@ #define FUSE_BANKS 31 #elif defined(CONFIG_IMX8M) #define FUSE_BANK_SIZE 0x40 +#ifdef CONFIG_IMX8MP +#define FUSE_BANKS 96 +#else #define FUSE_BANKS 64 +#endif #else #error "Unsupported architecture\n" #endif |