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

Merge tag 'omap-for-v5.12/fixes-rc1-signed' of... 

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

Fixes for omaps for v5.12-rc cycle

Regression fixes for multiple issues found mostly caused by recent changes
to drop legacy platform data and and starting to use the new prm driver
reset controller:

- Fix ocp interconnect bus access error reporting for omap_l3_noc by
  setting IRQF_NO_THREAD

- Fix changed mmc slot order regression by adding mmc aliases for am335x

- Fix dra7 reboot regression caused by invalid pcie reset map

- Fix smartreflex init regression caused by dropped legacy data

- Fix ti-sysc driver warning on unbind if reset is not deasserted

- Fix flakey reset deassert for dra7 iva

* tag 'omap-for-v5.12/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva
  bus: ti-sysc: Fix warning on unbind if reset is not deasserted
  ARM: OMAP2+: Fix smartreflex init regression after dropping legacy data
  soc: ti: omap-prm: Fix reboot issue with invalid pcie reset map for dra7
  ARM: dts: am33xx: add aliases for mmc interfaces
  bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD

Link: https://lore.kernel.org/r/pull-1614868603-800959@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 01443375 effe89e4

arch/arm/boot/dts/am33xx.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
		ethernet1 = &cpsw_emac1;

		spi0 = &spi0;

		spi1 = &spi1;

		mmc0 = &mmc1;

		mmc1 = &mmc2;

		mmc2 = &mmc3;

	};



	cpus {

arch/arm/mach-omap2/sr_device.c

+58 −17
Original line number Diff line number Diff line
@@ -88,34 +88,26 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data, 


extern struct omap_sr_data omap_sr_pdata[];



static int __init sr_dev_init(struct omap_hwmod *oh, void *user)

static int __init sr_init_by_name(const char *name, const char *voltdm)

{

	struct omap_sr_data *sr_data = NULL;

	struct omap_volt_data *volt_data;

	struct omap_smartreflex_dev_attr *sr_dev_attr;

	static int i;



	if (!strncmp(oh->name, "smartreflex_mpu_iva", 20) ||

	    !strncmp(oh->name, "smartreflex_mpu", 16))

	if (!strncmp(name, "smartreflex_mpu_iva", 20) ||

	    !strncmp(name, "smartreflex_mpu", 16))

		sr_data = &omap_sr_pdata[OMAP_SR_MPU];

	else if (!strncmp(oh->name, "smartreflex_core", 17))

	else if (!strncmp(name, "smartreflex_core", 17))

		sr_data = &omap_sr_pdata[OMAP_SR_CORE];

	else if (!strncmp(oh->name, "smartreflex_iva", 16))

	else if (!strncmp(name, "smartreflex_iva", 16))

		sr_data = &omap_sr_pdata[OMAP_SR_IVA];



	if (!sr_data) {

		pr_err("%s: Unknown instance %s\n", __func__, oh->name);

		pr_err("%s: Unknown instance %s\n", __func__, name);

		return -EINVAL;

	}



	sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr;

	if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) {

		pr_err("%s: No voltage domain specified for %s. Cannot initialize\n",

		       __func__, oh->name);

		goto exit;

	}



	sr_data->name = oh->name;

	sr_data->name = name;

	if (cpu_is_omap343x())

		sr_data->ip_type = 1;

	else
@@ -136,10 +128,10 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) 
		}

	}



	sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name);

	sr_data->voltdm = voltdm_lookup(voltdm);

	if (!sr_data->voltdm) {

		pr_err("%s: Unable to get voltage domain pointer for VDD %s\n",

			__func__, sr_dev_attr->sensor_voltdm_name);

			__func__, voltdm);

		goto exit;

	}
@@ -160,6 +152,20 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) 
	return 0;

}



static int __init sr_dev_init(struct omap_hwmod *oh, void *user)

{

	struct omap_smartreflex_dev_attr *sr_dev_attr;



	sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr;

	if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) {

		pr_err("%s: No voltage domain specified for %s. Cannot initialize\n",

		       __func__, oh->name);

		return 0;

	}



	return sr_init_by_name(oh->name, sr_dev_attr->sensor_voltdm_name);

}



/*

 * API to be called from board files to enable smartreflex

 * autocompensation at init.
@@ -169,7 +175,42 @@ void __init omap_enable_smartreflex_on_init(void) 
	sr_enable_on_init = true;

}



static const char * const omap4_sr_instances[] = {

	"mpu",

	"iva",

	"core",

};



static const char * const dra7_sr_instances[] = {

	"mpu",

	"core",

};



int __init omap_devinit_smartreflex(void)

{

	const char * const *sr_inst;

	int i, nr_sr = 0;



	if (soc_is_omap44xx()) {

		sr_inst = omap4_sr_instances;

		nr_sr = ARRAY_SIZE(omap4_sr_instances);



	} else if (soc_is_dra7xx()) {

		sr_inst = dra7_sr_instances;

		nr_sr = ARRAY_SIZE(dra7_sr_instances);

	}



	if (nr_sr) {

		const char *name, *voltdm;



		for (i = 0; i < nr_sr; i++) {

			name = kasprintf(GFP_KERNEL, "smartreflex_%s", sr_inst[i]);

			voltdm = sr_inst[i];

			sr_init_by_name(name, voltdm);

		}



		return 0;

	}



	return omap_hwmod_for_each_by_class("smartreflex", sr_dev_init, NULL);

}

drivers/bus/omap_l3_noc.c

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int omap_l3_probe(struct platform_device *pdev) 
	 */

	l3->debug_irq = platform_get_irq(pdev, 0);

	ret = devm_request_irq(l3->dev, l3->debug_irq, l3_interrupt_handler,

			       0x0, "l3-dbg-irq", l3);

			       IRQF_NO_THREAD, "l3-dbg-irq", l3);

	if (ret) {

		dev_err(l3->dev, "request_irq failed for %d\n",

			l3->debug_irq);
@@ -294,7 +294,7 @@ static int omap_l3_probe(struct platform_device *pdev) 


	l3->app_irq = platform_get_irq(pdev, 1);

	ret = devm_request_irq(l3->dev, l3->app_irq, l3_interrupt_handler,

			       0x0, "l3-app-irq", l3);

			       IRQF_NO_THREAD, "l3-app-irq", l3);

	if (ret)

		dev_err(l3->dev, "request_irq failed for %d\n", l3->app_irq);

drivers/bus/ti-sysc.c

+3 −1
Original line number Diff line number Diff line
@@ -3053,6 +3053,8 @@ static int sysc_remove(struct platform_device *pdev) 


	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	if (!reset_control_status(ddata->rsts))

		reset_control_assert(ddata->rsts);



unprepare:

drivers/soc/ti/omap_prm.c

+6 −2
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static const struct omap_prm_data dra7_prm_data[] = { 
	{

		.name = "l3init", .base = 0x4ae07300,

		.pwrstctrl = 0x0, .pwrstst = 0x4, .dmap = &omap_prm_alwon,

		.rstctrl = 0x10, .rstst = 0x14, .rstmap = rst_map_012,

		.rstctrl = 0x10, .rstst = 0x14, .rstmap = rst_map_01,

		.clkdm_name = "pcie"

	},

	{
@@ -830,8 +830,12 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, 
		       reset->prm->data->name, id);



exit:

	if (reset->clkdm)

	if (reset->clkdm) {

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

		if (has_rstst)

			udelay(1);

		pdata->clkdm_allow_idle(reset->clkdm);

	}



	return ret;

}