Commit 28de978b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rproc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc 

Pull remoteproc updates from Bjorn Andersson:
 "This exposes the remoteproc's name in sysfs, allows stm32 to enter
  platform standby and provides bug fixes for stm32 and Qualcomm's modem
  remoteproc drivers. Finally it updates MAINTAINERS to reflect the move
  to kernel.org"

* tag 'rproc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  MAINTAINERS: remoteproc: update git tree location
  remoteproc: Remove dev_err() usage after platform_get_irq()
  remoteproc: stm32: manage the get_irq probe defer case
  remoteproc: stm32: clear MCU PDDS at firmware start
  remoteproc: qcom: q6v5-mss: fixup q6v5_pds_enable error handling
  remoteproc: Add a sysfs interface for name
  remoteproc: qcom: Move glink_ssr notification after stop
parents 8d7ead5c 150997fa

Documentation/ABI/testing/sysfs-class-remoteproc

+10 −0
Original line number Diff line number Diff line
@@ -48,3 +48,13 @@ Description: Remote processor state 


		Writing "stop" will attempt to halt the remote processor and

		return it to the "offline" state.



What:		/sys/class/remoteproc/.../name

Date:		August 2019

KernelVersion:	5.4

Contact:	Suman Anna <s-anna@ti.com>

Description:	Remote processor name



		Reports the name of the remote processor. This can be used by

		userspace in exactly identifying a remote processor and ease

		up the usage in modifying the 'firmware' or 'state' files.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13748,7 +13748,7 @@ REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM 
M:	Ohad Ben-Cohen <ohad@wizery.com>

M:	Bjorn Andersson <bjorn.andersson@linaro.org>

L:	linux-remoteproc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next

S:	Maintained

F:	Documentation/devicetree/bindings/remoteproc/

F:	Documentation/ABI/testing/sysfs-class-remoteproc

drivers/remoteproc/da8xx_remoteproc.c

+1 −3
Original line number Diff line number Diff line
@@ -249,10 +249,8 @@ static int da8xx_rproc_probe(struct platform_device *pdev) 
	int ret;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "platform_get_irq(pdev, 0) error: %d\n", irq);

	if (irq < 0)

		return irq;

	}



	irq_data = irq_get_irq_data(irq);

	if (!irq_data) {

drivers/remoteproc/keystone_remoteproc.c

+0 −4
Original line number Diff line number Diff line
@@ -424,16 +424,12 @@ static int keystone_rproc_probe(struct platform_device *pdev) 
	ksproc->irq_ring = platform_get_irq_byname(pdev, "vring");

	if (ksproc->irq_ring < 0) {

		ret = ksproc->irq_ring;

		dev_err(dev, "failed to get vring interrupt, status = %d\n",

			ret);

		goto disable_clk;

	}



	ksproc->irq_fault = platform_get_irq_byname(pdev, "exception");

	if (ksproc->irq_fault < 0) {

		ret = ksproc->irq_fault;

		dev_err(dev, "failed to get exception interrupt, status = %d\n",

			ret);

		goto disable_clk;

	}

drivers/remoteproc/qcom_common.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void qcom_unregister_ssr_notifier(struct notifier_block *nb) 
}

EXPORT_SYMBOL_GPL(qcom_unregister_ssr_notifier);



static void ssr_notify_stop(struct rproc_subdev *subdev, bool crashed)

static void ssr_notify_unprepare(struct rproc_subdev *subdev)

{

	struct qcom_rproc_ssr *ssr = to_ssr_subdev(subdev);
@@ -220,7 +220,7 @@ void qcom_add_ssr_subdev(struct rproc *rproc, struct qcom_rproc_ssr *ssr, 
			 const char *ssr_name)

{

	ssr->name = ssr_name;

	ssr->subdev.stop = ssr_notify_stop;

	ssr->subdev.unprepare = ssr_notify_unprepare;



	rproc_add_subdev(rproc, &ssr->subdev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE