tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Olof Johansson <olof@lixom.net>

Olof Johansson 5dad6db1 cda1138f

+6 -3
+1
drivers/firmware/tegra/Makefile
··· 3 3 tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o 4 4 tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o 5 5 tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o 6 + tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o 6 7 tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o 7 8 obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o 8 9 obj-$(CONFIG_TEGRA_IVC) += ivc.o
+2 -1
drivers/firmware/tegra/bpmp-private.h
··· 24 24 }; 25 25 26 26 #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 27 - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 27 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ 28 + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) 28 29 extern const struct tegra_bpmp_ops tegra186_bpmp_ops; 29 30 #endif 30 31 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
+1 -1
drivers/firmware/tegra/bpmp-tegra210.c
··· 210 210 priv->tx_irq_data = irq_get_irq_data(err); 211 211 if (!priv->tx_irq_data) { 212 212 dev_err(&pdev->dev, "failed to get IRQ data for TX IRQ\n"); 213 - return err; 213 + return -ENOENT; 214 214 } 215 215 216 216 err = platform_get_irq_byname(pdev, "rx");
+2 -1
drivers/firmware/tegra/bpmp.c
··· 809 809 }; 810 810 811 811 #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 812 - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 812 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ 813 + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) 813 814 static const struct tegra_bpmp_soc tegra186_soc = { 814 815 .channels = { 815 816 .cpu_tx = {