summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-12 12:51:34 -0400
committerTom Rini <trini@konsulko.com>2016-06-12 12:51:34 -0400
commit3fc304b8d77ce6646d38ae506e9fae74b9975631 (patch)
treebf632784c6fe22394e60477377b02671ba3ad131 /drivers/misc
parentb57129dbdade13ee152daf15a4221d8582f48387 (diff)
parentd2ba7a6adcef6e6f8c4418c7b0caf9d7ab98a6d4 (diff)
downloadblackbird-obmc-uboot-3fc304b8d77ce6646d38ae506e9fae74b9975631.tar.gz
blackbird-obmc-uboot-3fc304b8d77ce6646d38ae506e9fae74b9975631.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mxc_ocotp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index 65ff8158e5..38344e8090 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -95,9 +95,9 @@ u32 fuse_bank_physical(int index)
{
u32 phy_index;
- if (is_cpu_type(MXC_CPU_MX6SL)) {
+ if (is_mx6sl()) {
phy_index = index;
- } else if (is_cpu_type(MXC_CPU_MX6UL)) {
+ } else if (is_mx6ul()) {
if (index >= 6)
phy_index = fuse_bank_physical(5) + (index - 6) + 3;
else
OpenPOWER on IntegriCloud