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

Unverified Commit f9adf61e authored by Baolin Wang's avatar Baolin Wang Committed by Mark Brown
Browse files

spi: sprd: adi: Change hwlock to be optional 



Now Spreadtrum ADI controller supplies multiple master accessing channel
to support multiple subsystems accessing, instead of using a hardware
spinlock to synchronize between the multiple subsystems.

To keep backward compatibility, we should change the hardware spinlock
to be optional. Moreover change to use of_hwspin_lock_get_id() function
which return -ENOENT error number to indicate no hwlock support.

Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Link: https://lore.kernel.org/r/2abe7dcf210e4197f8c5ece7fc6d6cc1eda8c655.1564125131.git.baolin.wang@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e6d722ca

drivers/spi/spi-sprd-adi.c

+42 −26
Original line number Diff line number Diff line
@@ -165,8 +165,9 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) 
	int read_timeout = ADI_READ_TIMEOUT;

	unsigned long flags;

	u32 val, rd_addr;

	int ret;

	int ret = 0;



	if (sadi->hwlock) {

		ret = hwspin_lock_timeout_irqsave(sadi->hwlock,

						  ADI_HWSPINLOCK_TIMEOUT,

						  &flags);
@@ -174,6 +175,7 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) 
			dev_err(sadi->dev, "get the hw lock failed\n");

			return ret;

		}

	}



	/*

	 * Set the physical register address need to read into RD_CMD register,
@@ -219,6 +221,7 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) 
	*read_val = val & RD_VALUE_MASK;



out:

	if (sadi->hwlock)

		hwspin_unlock_irqrestore(sadi->hwlock, &flags);

	return ret;

}
@@ -230,6 +233,7 @@ static int sprd_adi_write(struct sprd_adi *sadi, u32 reg_paddr, u32 val) 
	unsigned long flags;

	int ret;



	if (sadi->hwlock) {

		ret = hwspin_lock_timeout_irqsave(sadi->hwlock,

						  ADI_HWSPINLOCK_TIMEOUT,

						  &flags);
@@ -237,6 +241,7 @@ static int sprd_adi_write(struct sprd_adi *sadi, u32 reg_paddr, u32 val) 
			dev_err(sadi->dev, "get the hw lock failed\n");

			return ret;

		}

	}



	ret = sprd_adi_drain_fifo(sadi);

	if (ret < 0)
@@ -261,6 +266,7 @@ static int sprd_adi_write(struct sprd_adi *sadi, u32 reg_paddr, u32 val) 
	}



out:

	if (sadi->hwlock)

		hwspin_unlock_irqrestore(sadi->hwlock, &flags);

	return ret;

}
@@ -476,17 +482,27 @@ static int sprd_adi_probe(struct platform_device *pdev) 
	sadi->slave_pbase = res->start + ADI_SLAVE_OFFSET;

	sadi->ctlr = ctlr;

	sadi->dev = &pdev->dev;

	ret = of_hwspin_lock_get_id_byname(np, "adi");

	if (ret < 0) {

		dev_err(&pdev->dev, "can not get the hardware spinlock\n");

		goto put_ctlr;

	}



	sadi->hwlock = devm_hwspin_lock_request_specific(&pdev->dev, ret);

	ret = of_hwspin_lock_get_id(np, 0);

	if (ret > 0 || (IS_ENABLED(CONFIG_HWSPINLOCK) && ret == 0)) {

		sadi->hwlock =

			devm_hwspin_lock_request_specific(&pdev->dev, ret);

		if (!sadi->hwlock) {

			ret = -ENXIO;

			goto put_ctlr;

		}

	} else {

		switch (ret) {

		case -ENOENT:

			dev_info(&pdev->dev, "no hardware spinlock supplied\n");

			break;

		default:

			dev_err(&pdev->dev,

				"failed to find hwlock id, %d\n", ret);

			/* fall-through */

		case -EPROBE_DEFER:

			goto put_ctlr;

		}

	}



	sprd_adi_hw_init(sadi);

	sprd_adi_set_wdt_rst_mode(sadi);