Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2f9d36 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'reset-fixes-for-4.14-2' of git://git.pengutronix.de/git/pza/linux into fixes 

Pull "Reset controller fixes for v4.14" from Philipp Zabel:

Fix SoCFPGA reset controller for 64-bit systems. This patch removes the
assumption that BITS_PER_LONG is 32, which is not the case on Stratix10.

* tag 'reset-fixes-for-4.14-2' of git://git.pengutronix.de/git/pza/linux:
  reset: socfpga: fix for 64-bit compilation
parents 611e91e1 f450f28e

drivers/reset/reset-socfpga.c

+10 −7
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev, 
	struct socfpga_reset_data *data = container_of(rcdev,

						     struct socfpga_reset_data,

						     rcdev);

	int bank = id / BITS_PER_LONG;

	int offset = id % BITS_PER_LONG;

	int reg_width = sizeof(u32);

	int bank = id / (reg_width * BITS_PER_BYTE);

	int offset = id % (reg_width * BITS_PER_BYTE);

	unsigned long flags;

	u32 reg;
@@ -61,8 +62,9 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev, 
						     struct socfpga_reset_data,

						     rcdev);



	int bank = id / BITS_PER_LONG;

	int offset = id % BITS_PER_LONG;

	int reg_width = sizeof(u32);

	int bank = id / (reg_width * BITS_PER_BYTE);

	int offset = id % (reg_width * BITS_PER_BYTE);

	unsigned long flags;

	u32 reg;
@@ -81,8 +83,9 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev, 
{

	struct socfpga_reset_data *data = container_of(rcdev,

						struct socfpga_reset_data, rcdev);

	int bank = id / BITS_PER_LONG;

	int offset = id % BITS_PER_LONG;

	int reg_width = sizeof(u32);

	int bank = id / (reg_width * BITS_PER_BYTE);

	int offset = id % (reg_width * BITS_PER_BYTE);

	u32 reg;



	reg = readl(data->membase + (bank * BANK_INCREMENT));
@@ -132,7 +135,7 @@ static int socfpga_reset_probe(struct platform_device *pdev) 
	spin_lock_init(&data->lock);



	data->rcdev.owner = THIS_MODULE;

	data->rcdev.nr_resets = NR_BANKS * BITS_PER_LONG;

	data->rcdev.nr_resets = NR_BANKS * (sizeof(u32) * BITS_PER_BYTE);

	data->rcdev.ops = &socfpga_reset_ops;

	data->rcdev.of_node = pdev->dev.of_node;