Unverified Commit 3c7f58b3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.15/fixes-rc4' of... 

Merge tag 'omap-for-v5.15/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Fixes for omaps for v5.15

Few regression fixes for omaps for the v5.15-rc cycle. There is a fix
for boot time hangs that can happen on some am335x devices that started
when the pruss devicetree nodes were added. The other fixes are less
critical:

- Fix compiler warning for sysc_init_soc() that got recently introduced

- Fix external abort for am335x pruss as otherwise some am335x will hang

- Use CLKDM_NOAUTO quirk also for dra7 dcan1

- Fix older NAND device node regression for omap3-sdp

* tag 'omap-for-v5.15/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap3430-sdp: Fix NAND device node
  bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
  soc: ti: omap-prm: Fix external abort for am335x pruss
  bus: ti-sysc: Add break in switch statement in sysc_init_soc()

Link: https://lore.kernel.org/r/pull-1633609552-789682@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 22505963 80d680fd

arch/arm/boot/dts/omap3430-sdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 


	nand@1,0 {

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		reg = <1 0 4>; /* CS1, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

arch/arm/mach-omap2/omap_hwmod.c

+2 −0
Original line number Diff line number Diff line
@@ -3614,6 +3614,8 @@ int omap_hwmod_init_module(struct device *dev, 
		oh->flags |= HWMOD_SWSUP_SIDLE_ACT;

	if (data->cfg->quirks & SYSC_QUIRK_SWSUP_MSTANDBY)

		oh->flags |= HWMOD_SWSUP_MSTANDBY;

	if (data->cfg->quirks & SYSC_QUIRK_CLKDM_NOAUTO)

		oh->flags |= HWMOD_CLKDM_NOAUTO;



	error = omap_hwmod_check_module(dev, oh, data, sysc_fields,

					rev_offs, sysc_offs, syss_offs,

drivers/bus/ti-sysc.c

+4 −0
Original line number Diff line number Diff line
@@ -1464,6 +1464,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { 
	/* Quirks that need to be set based on detected module */

	SYSC_QUIRK("aess", 0, 0, 0x10, -ENODEV, 0x40000000, 0xffffffff,

		   SYSC_MODULE_QUIRK_AESS),

	/* Errata i893 handling for dra7 dcan1 and 2 */

	SYSC_QUIRK("dcan", 0x4ae3c000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,

		   SYSC_QUIRK_CLKDM_NOAUTO),

	SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,

		   SYSC_QUIRK_CLKDM_NOAUTO),

	SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff,
@@ -2954,6 +2957,7 @@ static int sysc_init_soc(struct sysc *ddata) 
			break;

		case SOC_AM3:

			sysc_add_disabled(0x48310000);  /* rng */

			break;

		default:

			break;

		}

drivers/soc/ti/omap_prm.c

+15 −12
Original line number Diff line number Diff line
@@ -825,10 +825,17 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, 
	writel_relaxed(v, reset->prm->base + reset->prm->data->rstctrl);

	spin_unlock_irqrestore(&reset->lock, flags);



	if (!has_rstst)

		goto exit;

	/* wait for the reset bit to clear */

	ret = readl_relaxed_poll_timeout_atomic(reset->prm->base +

						reset->prm->data->rstctrl,

						v, !(v & BIT(id)), 1,

						OMAP_RESET_MAX_WAIT);

	if (ret)

		pr_err("%s: timedout waiting for %s:%lu\n", __func__,

		       reset->prm->data->name, id);



	/* wait for the status to be set */

	if (has_rstst) {

		ret = readl_relaxed_poll_timeout_atomic(reset->prm->base +

						 reset->prm->data->rstst,

						 v, v & BIT(st_bit), 1,
@@ -836,14 +843,10 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, 
		if (ret)

			pr_err("%s: timedout waiting for %s:%lu\n", __func__,

			       reset->prm->data->name, id);

	}



exit:

	if (reset->clkdm) {

		/* At least dra7 iva needs a delay before clkdm idle */

		if (has_rstst)

			udelay(1);

	if (reset->clkdm)

		pdata->clkdm_allow_idle(reset->clkdm);

	}



	return ret;

}