Am Montag, den 27.07.2015, 13:57 -0500 schrieb
dinguyen@xxxxxxxxxxxxxxxxxxxxx:
> From: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
>
> In order for the Arria10 to be able to re-use the reset driver for SoCFPGA
> Cyclone5/Arria5, we need to read the 'altr,modrst-offset' property from the
> device tree entry. The 'altr,modrst-offset' property is the first register
> into the reset manager that is used for bringing peripherals out of reset.
>
> Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/reset/reset-socfpga.c | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
> index 0a8def3..9074d41 100644
> --- a/drivers/reset/reset-socfpga.c
> +++ b/drivers/reset/reset-socfpga.c
> @@ -24,11 +24,11 @@
> #include <linux/types.h>
>
> #define NR_BANKS 4
> -#define OFFSET_MODRST 0x10
>
> struct socfpga_reset_data {
> spinlock_t lock;
> void __iomem *membase;
> + u32 modrst_offset;
> struct reset_controller_dev rcdev;
> };
>
> @@ -45,8 +45,8 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
>
> spin_lock_irqsave(&data->lock, flags);
>
> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
> - writel(reg | BIT(offset), data->membase + OFFSET_MODRST +
> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
> + writel(reg | BIT(offset), data->membase + data->modrst_offset +
> (bank * NR_BANKS));
> spin_unlock_irqrestore(&data->lock, flags);
>
> @@ -67,8 +67,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
>
> spin_lock_irqsave(&data->lock, flags);
>
> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
> - writel(reg & ~BIT(offset), data->membase + OFFSET_MODRST +
> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
> + writel(reg & ~BIT(offset), data->membase + data->modrst_offset +
> (bank * NR_BANKS));
>
> spin_unlock_irqrestore(&data->lock, flags);
> @@ -85,7 +85,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev,
> int offset = id % BITS_PER_LONG;
> u32 reg;
>
> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
>
> return !(reg & BIT(offset));
> }
> @@ -100,6 +100,8 @@ static int socfpga_reset_probe(struct platform_device *pdev)
> {
> struct socfpga_reset_data *data;
> struct resource *res;
> + struct device *dev = &pdev->dev;
> + struct device_node *np = dev->of_node;
>
> /*
> * The binding was mainlined without the required property.
> @@ -120,6 +122,11 @@ static int socfpga_reset_probe(struct platform_device *pdev)
> if (IS_ERR(data->membase))
> return PTR_ERR(data->membase);
>
> + if (of_property_read_u32(np, "altr,modrst-offset", &data->modrst_offset)) {
> + dev_err(dev, "no altr,modrst-offset specified in device tree\n");
> + return -ENODEV;
> + }
> +
This should fall back to the old value of 0x10 in case the device tree
property doesn't exist. Otherwise you are breaking Cyclone5/Arria5 with
older device trees.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
