diff options
Diffstat (limited to 'drivers/reset/reset-simple.c')
| -rw-r--r-- | drivers/reset/reset-simple.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c index a91107fc9e27..77fbba3100c8 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c | |||
| @@ -109,7 +109,7 @@ struct reset_simple_devdata { | |||
| 109 | #define SOCFPGA_NR_BANKS 8 | 109 | #define SOCFPGA_NR_BANKS 8 |
| 110 | 110 | ||
| 111 | static const struct reset_simple_devdata reset_simple_socfpga = { | 111 | static const struct reset_simple_devdata reset_simple_socfpga = { |
| 112 | .reg_offset = 0x10, | 112 | .reg_offset = 0x20, |
| 113 | .nr_resets = SOCFPGA_NR_BANKS * 32, | 113 | .nr_resets = SOCFPGA_NR_BANKS * 32, |
| 114 | .status_active_low = true, | 114 | .status_active_low = true, |
| 115 | }; | 115 | }; |
| @@ -120,7 +120,8 @@ static const struct reset_simple_devdata reset_simple_active_low = { | |||
| 120 | }; | 120 | }; |
| 121 | 121 | ||
| 122 | static const struct of_device_id reset_simple_dt_ids[] = { | 122 | static const struct of_device_id reset_simple_dt_ids[] = { |
| 123 | { .compatible = "altr,rst-mgr", .data = &reset_simple_socfpga }, | 123 | { .compatible = "altr,stratix10-rst-mgr", |
| 124 | .data = &reset_simple_socfpga }, | ||
| 124 | { .compatible = "st,stm32-rcc", }, | 125 | { .compatible = "st,stm32-rcc", }, |
| 125 | { .compatible = "allwinner,sun6i-a31-clock-reset", | 126 | { .compatible = "allwinner,sun6i-a31-clock-reset", |
| 126 | .data = &reset_simple_active_low }, | 127 | .data = &reset_simple_active_low }, |
| @@ -166,14 +167,6 @@ static int reset_simple_probe(struct platform_device *pdev) | |||
| 166 | data->status_active_low = devdata->status_active_low; | 167 | data->status_active_low = devdata->status_active_low; |
| 167 | } | 168 | } |
| 168 | 169 | ||
| 169 | if (of_device_is_compatible(dev->of_node, "altr,rst-mgr") && | ||
| 170 | of_property_read_u32(dev->of_node, "altr,modrst-offset", | ||
| 171 | ®_offset)) { | ||
| 172 | dev_warn(dev, | ||
| 173 | "missing altr,modrst-offset property, assuming 0x%x!\n", | ||
| 174 | reg_offset); | ||
| 175 | } | ||
| 176 | |||
| 177 | data->membase += reg_offset; | 170 | data->membase += reg_offset; |
| 178 | 171 | ||
| 179 | return devm_reset_controller_register(dev, &data->rcdev); | 172 | return devm_reset_controller_register(dev, &data->rcdev); |
