Correct SPL uses of IMX_MODULE_FUSE

This converts 6 usages of this option to the non-SPL form, since there is
no SPL_IMX_MODULE_FUSE defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h
index a46fc3f1f8e0a988d3cc59984e9fb2c57ca0c9ff..6c92cb40d6d576d62b2233a9ba044718dbd2a749 100644 (file)
--- a/arch/arm/include/asm/mach-imx/module_fuse.h
+++ b/arch/arm/include/asm/mach-imx/module_fuse.h
@@ -74,7 +74,7 @@ struct fuse_entry_desc {
        u32 status;
 };
 
-#if !CONFIG_IS_ENABLED(IMX_MODULE_FUSE)
+#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE)
 static inline u32 check_module_fused(enum fuse_module_type module)
 {
        return 0;

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 9a1599dcd91e4ccf2626b8ed38a139e7d194a133..86b9fb57c832cb78250aabe79b2bbb307650b379 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -744,7 +744,7 @@ void bus_i2c_init(int index, int speed, int unused,
                return;
        }
 
-       if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
+       if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
                if (i2c_fused((ulong)mxc_i2c_buses[index].base)) {
                        printf("SoC fuse indicates I2C@0x%lx is unavailable.\n",
                               (ulong)mxc_i2c_buses[index].base);
@@ -878,7 +878,7 @@ static int mxc_i2c_probe(struct udevice *bus)
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
-       if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
+       if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
                if (i2c_fused((ulong)addr)) {
                        printf("SoC fuse indicates I2C@0x%lx is unavailable.\n",
                               (ulong)addr);

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 8abfdbd5d914426711625313311d42daf8984a7f..1a6c18a441fdebb127040ef4c61dda011b6ae651 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1205,7 +1205,7 @@ static int fecmxc_probe(struct udevice *dev)
        uint32_t start;
        int ret;
 
-       if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
+       if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
                if (enet_fused((ulong)priv->eth)) {
                        printf("SoC fuse indicates Ethernet@0x%lx is unavailable.\n", (ulong)priv->eth);
                        return -ENODEV;

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 0a12db614ff44d3b9c81a49d9294f92968cd0618..91633f013a553ecd25db5f85c422dfaeb1754901 100644 (file)
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -360,7 +360,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
        if (index > 3)
                return -EINVAL;
 
-       if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
+       if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
                if (usb_fused((ulong)ehci)) {
                        printf("SoC fuse indicates USB@0x%lx is unavailable.\n",
                               (ulong)ehci);
@@ -641,7 +641,7 @@ static int ehci_usb_probe(struct udevice *dev)
        struct ehci_hcor *hcor;
        int ret;
 
-       if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
+       if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
                if (usb_fused((ulong)ehci)) {
                        printf("SoC fuse indicates USB@0x%lx is unavailable.\n",
                               (ulong)ehci);