.finish_io_req = spinand_ondie_ecc_finish_io_req,
 };
 
-static __maybe_unused struct nand_ecc_engine spinand_ondie_ecc_engine = {
+static struct nand_ecc_engine spinand_ondie_ecc_engine = {
        .ops = &spinand_ondie_ecc_engine_ops,
 };
 
        if (ret)
                goto err_manuf_cleanup;
 
+       /* SPI-NAND default ECC engine is on-die */
+       nand->ecc.defaults.engine_type = NAND_ECC_ENGINE_TYPE_ON_DIE;
+       nand->ecc.ondie_engine = &spinand_ondie_ecc_engine;
+
        /*
         * Right now, we don't support ECC, so let the whole oob
         * area available for the user.