Commit 454a079b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.10/fixes-rc5-signed' of... 

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

Fixes for omaps for various issues noticed during the -rc cycle:

- Earlier omap4 cpuidle fix was incomplete and needs to use a
  configured idle state instead

- Fix am4 cpsw driver compatible to avoid invalid resource error
  for the legacy driver

- Two kconfig fixes for genpd support that we added for for v5.10
  for proper location of the option and adding missing option

- Fix ti-sysc reset status checking on enabling modules to ignore
  quirky modules with reset status only usable when the quirk is
  activated during reset. Also fix bogus resetdone warning for
  cpsw and modules with no sysst register reset status bit

- Suppress a ti-sysc warning for timers reserved as system timers

- Fix the ordering of clocks for dra7 m_can

* tag 'omap-for-v5.10/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra76x: m_can: fix order of clocks
  bus: ti-sysc: suppress err msg for timers used as clockevent/source
  ARM: dts: am437x-l4: fix compatible for cpsw switch dt node
  ARM: OMAP2+: Manage MPU state properly for omap_enter_idle_coupled()
  bus: ti-sysc: Fix bogus resetdone warning on enable for cpsw
  bus: ti-sysc: Fix reset status check for modules with quirks
  ARM: OMAP2+: Fix missing select PM_GENERIC_DOMAINS_OF
  ARM: OMAP2+: Fix location for select PM_GENERIC_DOMAINS

Link: https://lore.kernel.org/r/pull-1606460270-864284@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 06ceddef 05d5de6b

arch/arm/boot/dts/am437x-l4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ 
			ranges = <0x0 0x100000 0x8000>;



			mac_sw: switch@0 {

				compatible = "ti,am4372-cpsw","ti,cpsw-switch";

				compatible = "ti,am4372-cpsw-switch", "ti,cpsw-switch";

				reg = <0x0 0x4000>;

				ranges = <0 0 0x4000>;

				clocks = <&cpsw_125mhz_gclk>, <&dpll_clksel_mac_clk>;

arch/arm/boot/dts/dra76x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "int0", "int1";

				clocks = <&mcan_clk>, <&l3_iclk_div>;

				clock-names = "cclk", "hclk";

				clocks = <&l3_iclk_div>, <&mcan_clk>;

				clock-names = "hclk", "cclk";

				bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;

			};

		};

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config ARCH_OMAP2 
	depends on ARCH_MULTI_V6

	select ARCH_OMAP2PLUS

	select CPU_V6

	select PM_GENERIC_DOMAINS if PM

	select SOC_HAS_OMAP2_SDRC



config ARCH_OMAP3
@@ -106,6 +105,8 @@ config ARCH_OMAP2PLUS 
	select OMAP_DM_TIMER

	select OMAP_GPMC

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM

	select RESET_CONTROLLER

	select SOC_BUS

	select TI_SYSC

arch/arm/mach-omap2/cpuidle44xx.c

+5 −3
Original line number Diff line number Diff line
@@ -175,8 +175,11 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, 
		if (mpuss_can_lose_context) {

			error = cpu_cluster_pm_enter();

			if (error) {

				omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);

				goto cpu_cluster_pm_out;

				index = 0;

				cx = state_ptr + index;

				pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);

				omap_set_pwrdm_state(mpu_pd, cx->mpu_state);

				mpuss_can_lose_context = 0;

			}

		}

	}
@@ -184,7 +187,6 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, 
	omap4_enter_lowpower(dev->cpu, cx->cpu_state);

	cpu_done[dev->cpu] = true;



cpu_cluster_pm_out:

	/* Wakeup CPU1 only if it is not offlined */

	if (dev->cpu == 0 && cpumask_test_cpu(1, cpu_online_mask)) {

drivers/bus/ti-sysc.c

+19 −10
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ static int sysc_wait_softreset(struct sysc *ddata) 
	u32 sysc_mask, syss_done, rstval;

	int syss_offset, error = 0;



	if (ddata->cap->regbits->srst_shift < 0)

		return 0;



	syss_offset = ddata->offsets[SYSC_SYSSTATUS];

	sysc_mask = BIT(ddata->cap->regbits->srst_shift);
@@ -970,9 +973,15 @@ static int sysc_enable_module(struct device *dev) 
			return error;

		}

	}

	/*

	 * Some modules like i2c and hdq1w have unusable reset status unless

	 * the module reset quirk is enabled. Skip status check on enable.

	 */

	if (!(ddata->cfg.quirks & SYSC_MODULE_QUIRK_ENA_RESETDONE)) {

		error = sysc_wait_softreset(ddata);

		if (error)

			dev_warn(ddata->dev, "OCP softreset timed out\n");

	}

	if (ddata->cfg.quirks & SYSC_QUIRK_OPT_CLKS_IN_RESET)

		sysc_disable_opt_clocks(ddata);
@@ -1373,17 +1382,17 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { 
	SYSC_QUIRK("hdmi", 0, 0, 0x10, -ENODEV, 0x50030200, 0xffffffff,

		   SYSC_QUIRK_OPT_CLKS_NEEDED),

	SYSC_QUIRK("hdq1w", 0, 0, 0x14, 0x18, 0x00000006, 0xffffffff,

		   SYSC_MODULE_QUIRK_HDQ1W),

		   SYSC_MODULE_QUIRK_HDQ1W | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("hdq1w", 0, 0, 0x14, 0x18, 0x0000000a, 0xffffffff,

		   SYSC_MODULE_QUIRK_HDQ1W),

		   SYSC_MODULE_QUIRK_HDQ1W | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x00000036, 0x000000ff,

		   SYSC_MODULE_QUIRK_I2C),

		   SYSC_MODULE_QUIRK_I2C | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x0000003c, 0x000000ff,

		   SYSC_MODULE_QUIRK_I2C),

		   SYSC_MODULE_QUIRK_I2C | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x00000040, 0x000000ff,

		   SYSC_MODULE_QUIRK_I2C),

		   SYSC_MODULE_QUIRK_I2C | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("i2c", 0, 0, 0x10, 0x90, 0x5040000a, 0xfffff0f0,

		   SYSC_MODULE_QUIRK_I2C),

		   SYSC_MODULE_QUIRK_I2C | SYSC_MODULE_QUIRK_ENA_RESETDONE),

	SYSC_QUIRK("gpu", 0x50000000, 0x14, -ENODEV, -ENODEV, 0x00010201, 0xffffffff, 0),

	SYSC_QUIRK("gpu", 0x50000000, 0xfe00, 0xfe10, -ENODEV, 0x40000000 , 0xffffffff,

		   SYSC_MODULE_QUIRK_SGX),
@@ -2880,7 +2889,7 @@ static int sysc_check_active_timer(struct sysc *ddata) 


	if ((ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT) &&

	    (ddata->cfg.quirks & SYSC_QUIRK_NO_IDLE))

		return -EBUSY;

		return -ENXIO;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE