Skip to content

Commit

Permalink
mtd: physmap_of: Retire Gemini pad control
Browse files Browse the repository at this point in the history
I wrote a proper pin control driver for the Gemini. Retire this
SoC-specific pad control and rely on the pin controller to manage
this.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  • Loading branch information
Linus Walleij authored and Boris Brezillon committed Aug 15, 2017
1 parent 871e7c0 commit 2acc717
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions drivers/mtd/maps/physmap_of_gemini.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@

#define FLASH_PARALLEL_HIGH_PIN_CNT (1 << 20) /* else low pin cnt */

/* Miscellaneous Control Register */
#define GLOBAL_MISC_CTRL 0x30
#define FLASH_PADS_MASK 0x07
#define NAND_PADS_DISABLE BIT(2)
#define PFLASH_PADS_DISABLE BIT(1)
#define SFLASH_PADS_DISABLE BIT(0)

static const struct of_device_id syscon_match[] = {
{ .compatible = "cortina,gemini-syscon" },
{ },
Expand Down Expand Up @@ -102,15 +95,6 @@ int of_flash_probe_gemini(struct platform_device *pdev,
map->bankwidth * 8);
}

/* Activate parallel (NOR flash) mode */
ret = regmap_update_bits(rmap, GLOBAL_MISC_CTRL,
FLASH_PADS_MASK,
SFLASH_PADS_DISABLE | NAND_PADS_DISABLE);
if (ret) {
dev_err(dev, "unable to set up physmap pads\n");
return -ENODEV;
}

dev_info(&pdev->dev, "initialized Gemini-specific physmap control\n");

return 0;
Expand Down

0 comments on commit 2acc717

Please sign in to comment.