drivers: Use CONFIG_XPL_BUILD instead of CONFIG_SPL_BUILD

[J-u-boot.git] / drivers / power / pmic / rk8xx.c

diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 617bb511e4e050d64a41ba9871d84b039d9de0f5..a14555cf472f80daed70eab174c2e9b980603580 100644 (file)
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -237,7 +237,7 @@ static int rk8xx_bind(struct udevice *dev)
        if (!children)
                debug("%s: %s - no child found\n", __func__, dev->name);
 
-       if (IS_ENABLED(CONFIG_SPL_BUILD) &&
+       if (IS_ENABLED(CONFIG_XPL_BUILD) &&
            IS_ENABLED(CONFIG_ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON))
                dev_or_flags(dev, DM_FLAG_PROBE_AFTER_BIND);
 
@@ -281,6 +281,8 @@ static int rk8xx_probe(struct udevice *dev)
        show_variant = bitfield_extract_by_mask(priv->variant, RK8XX_ID_MSK);
        switch (priv->variant) {
        case RK808_ID:
+               /* RK808 ID is 0x0000, so fix show_variant for that PMIC */
+               show_variant = 0x808;
                break;
        case RK805_ID:
        case RK816_ID:
@@ -329,7 +331,7 @@ static int rk8xx_probe(struct udevice *dev)
                      pmic_reg_read(dev, init_data[i].reg));
        }
 
-       if (!IS_ENABLED(CONFIG_SPL_BUILD)) {
+       if (!IS_ENABLED(CONFIG_XPL_BUILD)) {
                printf("PMIC:  RK%x ", show_variant);
                if (on_source && off_source)
                        printf("(on=0x%02x, off=0x%02x)",