mtd: physmap_of: Retire Gemini pad control

Message ID 20170808190510.11496-1-linus.walleij@linaro.org
State Accepted
Delegated to: Boris Brezillon
Headers show

Commit Message

Linus Walleij Aug. 8, 2017, 7:05 p.m.
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>
---
 drivers/mtd/maps/physmap_of_gemini.c | 16 ----------------
 1 file changed, 16 deletions(-)

Comments

Marek Vasut Aug. 8, 2017, 9:44 p.m. | #1
On 08/08/2017 09:05 PM, Linus Walleij wrote:
> 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>

Thanks!

> ---
>  drivers/mtd/maps/physmap_of_gemini.c | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap_of_gemini.c
> index 05b286b5289f..4ed1a6bb4d3c 100644
> --- a/drivers/mtd/maps/physmap_of_gemini.c
> +++ b/drivers/mtd/maps/physmap_of_gemini.c
> @@ -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" },
>  	{ },
> @@ -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;
>
Boris Brezillon Aug. 17, 2017, 1:04 p.m. | #2
Le Tue,  8 Aug 2017 21:05:10 +0200,
Linus Walleij <linus.walleij@linaro.org> a écrit :

> 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.
> 

Applied to l2-mtd/master.

Thanks,

Boris

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  drivers/mtd/maps/physmap_of_gemini.c | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap_of_gemini.c
> index 05b286b5289f..4ed1a6bb4d3c 100644
> --- a/drivers/mtd/maps/physmap_of_gemini.c
> +++ b/drivers/mtd/maps/physmap_of_gemini.c
> @@ -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" },
>  	{ },
> @@ -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;

Patch

diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap_of_gemini.c
index 05b286b5289f..4ed1a6bb4d3c 100644
--- a/drivers/mtd/maps/physmap_of_gemini.c
+++ b/drivers/mtd/maps/physmap_of_gemini.c
@@ -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" },
 	{ },
@@ -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;