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

Commit f7eeb8a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rproc-v4.6-rc1' of git://github.com/andersson/remoteproc 

Pull remoteproc fix from Bjorn Andersson:
 "Fix incorrect error check in the ST remoteproc driver and advertise
  the newly created linux-remoteproc mailing list"

* tag 'rproc-v4.6-rc1' of git://github.com/andersson/remoteproc:
  MAINTAINERS: Add mailing list for remote processor subsystems
  remoteproc: st: fix check of syscon_regmap_lookup_by_phandle() return value
parents d6c24df0 d7586849

MAINTAINERS

+3 −0
Original line number Original line Diff line number Diff line
@@ -5042,6 +5042,7 @@ F: include/linux/hw_random.h 
HARDWARE SPINLOCK CORE

HARDWARE SPINLOCK CORE

M:	Ohad Ben-Cohen <ohad@wizery.com>

M:	Ohad Ben-Cohen <ohad@wizery.com>

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

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

L:	linux-remoteproc@vger.kernel.org

S:	Maintained

S:	Maintained

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

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

F:	Documentation/hwspinlock.txt

F:	Documentation/hwspinlock.txt
@@ -9314,6 +9315,7 @@ F: include/linux/regmap.h 
REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM

REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM

M:	Ohad Ben-Cohen <ohad@wizery.com>

M:	Ohad Ben-Cohen <ohad@wizery.com>

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

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/ohad/remoteproc.git

S:	Maintained

S:	Maintained

F:	drivers/remoteproc/

F:	drivers/remoteproc/
@@ -9323,6 +9325,7 @@ F: include/linux/remoteproc.h 
REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM

REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM

M:	Ohad Ben-Cohen <ohad@wizery.com>

M:	Ohad Ben-Cohen <ohad@wizery.com>

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

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/rpmsg.git

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

S:	Maintained

S:	Maintained

F:	drivers/rpmsg/

F:	drivers/rpmsg/

drivers/remoteproc/st_remoteproc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -189,9 +189,9 @@ static int st_rproc_parse_dt(struct platform_device *pdev) 
	}

	}





	ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");

	ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");

	if (!ddata->boot_base) {

	if (IS_ERR(ddata->boot_base)) {

		dev_err(dev, "Boot base not found\n");

		dev_err(dev, "Boot base not found\n");

		return -EINVAL;

		return PTR_ERR(ddata->boot_base);

	}

	}





	err = of_property_read_u32_index(np, "st,syscfg", 1,

	err = of_property_read_u32_index(np, "st,syscfg", 1,