diff mbox series

[v4,6/9] power: reset: at91-reset: add at91_reset_data

Message ID 20220608083942.1584087-7-claudiu.beznea@microchip.com (mailing list archive)
State Handled Elsewhere, archived
Headers show
Series power: reset: at91-reset: add support for sama7g5 | expand

Commit Message

Claudiu Beznea June 8, 2022, 8:39 a.m. UTC 
Add struct at91_reset_data to keep per platform related information.
This is a prerequisite for adding reset_controller_dev support.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 drivers/power/reset/at91-reset.c | 38 ++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

Comments

Sebastian Reichel June 9, 2022, 8:33 p.m. UTC | #1 
Hi,

On Wed, Jun 08, 2022 at 11:39:39AM +0300, Claudiu Beznea wrote:
> Add struct at91_reset_data to keep per platform related information.
> This is a prerequisite for adding reset_controller_dev support.
> 
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
>  drivers/power/reset/at91-reset.c | 38 ++++++++++++++++++++++++--------
>  1 file changed, 29 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
> index e62798750b6b..1b2aca3f490d 100644
> --- a/drivers/power/reset/at91-reset.c
> +++ b/drivers/power/reset/at91-reset.c
> @@ -79,6 +79,16 @@ struct at91_reset {
>  	u32 ramc_lpr;
>  };
>  
> +/**
> + * struct at91_reset_data - AT91 reset data
> + * @reset_args:		SoC specific system reset arguments
> + * @n_device_reset:	number of device resets
> + */
> +struct at91_reset_data {
> +	u32 reset_args;
> +	u32 n_device_reset;
> +};
> +
>  /*
>  * unless the SDRAM is cleanly shutdown before we hit the
>  * reset register it can be left driving the data bus and
> @@ -173,29 +183,34 @@ static const struct of_device_id at91_ramc_of_match[] = {
>  	{ /* sentinel */ }
>  };
>  
> +static const struct at91_reset_data sam9260 = {
> +	.reset_args = AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
> +};
> +
> +static const struct at91_reset_data samx7 = {
> +	.reset_args = AT91_RSTC_KEY | AT91_RSTC_PROCRST,
> +};
> +
>  static const struct of_device_id at91_reset_of_match[] = {
>  	{
>  		.compatible = "atmel,at91sam9260-rstc",
> -		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
> -				 AT91_RSTC_PROCRST),
> +		.data = &sam9260,
>  	},
>  	{
>  		.compatible = "atmel,at91sam9g45-rstc",
> -		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
> -				 AT91_RSTC_PROCRST)
> +		.data = &sam9260,
>  	},
>  	{
>  		.compatible = "atmel,sama5d3-rstc",
> -		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
> -				 AT91_RSTC_PROCRST)
> +		.data = &sam9260,
>  	},
>  	{
>  		.compatible = "atmel,samx7-rstc",
> -		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PROCRST)
> +		.data = &samx7,
>  	},
>  	{
>  		.compatible = "microchip,sam9x60-rstc",
> -		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PROCRST)
> +		.data = &samx7,
>  	},
>  	{ /* sentinel */ }
>  };
> @@ -204,6 +219,7 @@ MODULE_DEVICE_TABLE(of, at91_reset_of_match);
>  static int __init at91_reset_probe(struct platform_device *pdev)
>  {
>  	const struct of_device_id *match;
> +	const struct at91_reset_data *data;
>  	struct at91_reset *reset;
>  	struct device_node *np;
>  	int ret, idx = 0;
> @@ -233,9 +249,13 @@ static int __init at91_reset_probe(struct platform_device *pdev)
>  	}
>  
>  	match = of_match_node(at91_reset_of_match, pdev->dev.of_node);
> +	if (!match || !match->data)
> +		return -ENODEV;
> +
> +	data = match->data;

data = device_get_match_data(&pdev->dev);
if (!data)
		return -ENODEV;

Otherwise LGTM.

-- Sebastian

>  	reset->nb.notifier_call = at91_reset;
>  	reset->nb.priority = 192;
> -	reset->args = (u32)match->data;
> +	reset->args = data->reset_args;
>  
>  	reset->sclk = devm_clk_get(&pdev->dev, NULL);
>  	if (IS_ERR(reset->sclk))
> -- 
> 2.33.0
>
diff mbox series

Patch

diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index e62798750b6b..1b2aca3f490d 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -79,6 +79,16 @@  struct at91_reset {
 	u32 ramc_lpr;
 };
 
+/**
+ * struct at91_reset_data - AT91 reset data
+ * @reset_args:		SoC specific system reset arguments
+ * @n_device_reset:	number of device resets
+ */
+struct at91_reset_data {
+	u32 reset_args;
+	u32 n_device_reset;
+};
+
 /*
 * unless the SDRAM is cleanly shutdown before we hit the
 * reset register it can be left driving the data bus and
@@ -173,29 +183,34 @@  static const struct of_device_id at91_ramc_of_match[] = {
 	{ /* sentinel */ }
 };
 
+static const struct at91_reset_data sam9260 = {
+	.reset_args = AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
+};
+
+static const struct at91_reset_data samx7 = {
+	.reset_args = AT91_RSTC_KEY | AT91_RSTC_PROCRST,
+};
+
 static const struct of_device_id at91_reset_of_match[] = {
 	{
 		.compatible = "atmel,at91sam9260-rstc",
-		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
-				 AT91_RSTC_PROCRST),
+		.data = &sam9260,
 	},
 	{
 		.compatible = "atmel,at91sam9g45-rstc",
-		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
-				 AT91_RSTC_PROCRST)
+		.data = &sam9260,
 	},
 	{
 		.compatible = "atmel,sama5d3-rstc",
-		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PERRST |
-				 AT91_RSTC_PROCRST)
+		.data = &sam9260,
 	},
 	{
 		.compatible = "atmel,samx7-rstc",
-		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PROCRST)
+		.data = &samx7,
 	},
 	{
 		.compatible = "microchip,sam9x60-rstc",
-		.data = (void *)(AT91_RSTC_KEY | AT91_RSTC_PROCRST)
+		.data = &samx7,
 	},
 	{ /* sentinel */ }
 };
@@ -204,6 +219,7 @@  MODULE_DEVICE_TABLE(of, at91_reset_of_match);
 static int __init at91_reset_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match;
+	const struct at91_reset_data *data;
 	struct at91_reset *reset;
 	struct device_node *np;
 	int ret, idx = 0;
@@ -233,9 +249,13 @@  static int __init at91_reset_probe(struct platform_device *pdev)
 	}
 
 	match = of_match_node(at91_reset_of_match, pdev->dev.of_node);
+	if (!match || !match->data)
+		return -ENODEV;
+
+	data = match->data;
 	reset->nb.notifier_call = at91_reset;
 	reset->nb.priority = 192;
-	reset->args = (u32)match->data;
+	reset->args = data->reset_args;
 
 	reset->sclk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(reset->sclk))