Commit 5dad6db1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.14-firmware' of... 

Merge tag 'tegra-for-5.14-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

firmware: tegra: Changes for v5.14-rc1

These changes contain two minor fixes for the Tegra BPMP driver.

* tag 'tegra-for-5.14-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  firmware: tegra: bpmp: Fix Tegra234-only builds
  firmware: tegra: Fix error return code in tegra210_bpmp_init()

Link: https://lore.kernel.org/r/20210611164437.3568059-3-thierry.reding@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cda1138f bd778b89

drivers/firmware/tegra/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ tegra-bpmp-y = bpmp.o 
tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC)	+= bpmp-tegra210.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_DEBUG_FS)	+= bpmp-debugfs.o

obj-$(CONFIG_TEGRA_BPMP)	+= tegra-bpmp.o

obj-$(CONFIG_TEGRA_IVC)		+= ivc.o

drivers/firmware/tegra/bpmp-private.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ struct tegra_bpmp_ops { 
};



#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \

    IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)

    IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \

    IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)

extern const struct tegra_bpmp_ops tegra186_bpmp_ops;

#endif

#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/firmware/tegra/bpmp-tegra210.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int tegra210_bpmp_init(struct tegra_bpmp *bpmp) 
	priv->tx_irq_data = irq_get_irq_data(err);

	if (!priv->tx_irq_data) {

		dev_err(&pdev->dev, "failed to get IRQ data for TX IRQ\n");

		return err;

		return -ENOENT;

	}



	err = platform_get_irq_byname(pdev, "rx");

drivers/firmware/tegra/bpmp.c

+2 −1
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = { 
};



#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \

    IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)

    IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \

    IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)

static const struct tegra_bpmp_soc tegra186_soc = {

	.channels = {

		.cpu_tx = {