diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-11 15:43:16 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-11 15:43:49 +0400 |
| commit | 998052b74574699bdd1e451b6556e4d7667a7a4e (patch) | |
| tree | 3124898e873cdec28f724106e60d1bff760505f1 /arch/arm/mach-omap2/gpmc.c | |
| parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| download | linux-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.xz | |
Merge branch 'for-linus' into for-next
Merging for-linus branch for syncing the latest STAC/IDT codec
changes to be affected by the upcoming hda-jack rewrites.
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 8bc13380f0a0..9f42d5437fcc 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1403,8 +1403,11 @@ static int gpmc_probe_nand_child(struct platform_device *pdev, pr_err("%s: ti,nand-ecc-opt not found\n", __func__); return -ENODEV; } - if (!strcmp(s, "ham1") || !strcmp(s, "sw") || - !strcmp(s, "hw") || !strcmp(s, "hw-romcode")) + + if (!strcmp(s, "sw")) + gpmc_nand_data->ecc_opt = OMAP_ECC_HAM1_CODE_SW; + else if (!strcmp(s, "ham1") || + !strcmp(s, "hw") || !strcmp(s, "hw-romcode")) gpmc_nand_data->ecc_opt = OMAP_ECC_HAM1_CODE_HW; else if (!strcmp(s, "bch4")) |