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

Commit 3f4258bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-fix-v4.19-2' of... 

Merge tag 'soc-fsl-fix-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into fixes

NXP/FSL SoC driver fixes for v4.19 round 2

- Fix crash of qman_portal by deferring its probe if qman is not probed

* tag 'soc-fsl-fix-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux

:
  soc: fsl: qman_portals: defer probe after qman's probe
  soc: fsl: qbman: add APIs to retrieve the probing status
  soc: fsl: qe: Fix copy/paste bug in ucc_get_tdm_sync_shift()
  soc: fsl: qbman: qman: avoid allocating from non existing gen_pool
  ARM: dts: BCM63xx: Fix incorrect interrupt specifiers
  MAINTAINERS: update the Annapurna Labs maintainer email
  ARM: dts: sun8i: drop A64 HDMI PHY fallback compatible from R40 DT
  ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 30a0af88 5a1eb8b9

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ N: meson 


ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

M:	Antoine Tenart <antoine.tenart@bootlin.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-alpine/

arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "sama5d2-pinfunc.h"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/at91.h>



/ {

	model = "Atmel SAMA5D2 PTC EK";
@@ -299,6 +300,7 @@ 
							 <PIN_PA30__NWE_NANDWE>,

							 <PIN_PB2__NRD_NANDOE>;

						bias-pull-up;

						atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>;

					};



					ale_cle_rdy_cs {

arch/arm/boot/dts/bcm63138.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -106,21 +106,23 @@ 
		global_timer: timer@1e200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x1e200 0x20>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&axi_clk>;

		};



		local_timer: local-timer@1e600 {

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x1e600 0x20>;

			interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&axi_clk>;

		};



		twd_watchdog: watchdog@1e620 {

			compatible = "arm,cortex-a9-twd-wdt";

			reg = <0x1e620 0x20>;

			interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

		};



		armpll: armpll {
@@ -158,7 +160,7 @@ 
		serial0: serial@600 {

			compatible = "brcm,bcm6345-uart";

			reg = <0x600 0x1b>;

			interrupts = <GIC_SPI 32 0>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			status = "disabled";
@@ -167,7 +169,7 @@ 
		serial1: serial@620 {

			compatible = "brcm,bcm6345-uart";

			reg = <0x620 0x1b>;

			interrupts = <GIC_SPI 33 0>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			status = "disabled";
@@ -180,7 +182,7 @@ 
			reg = <0x2000 0x600>, <0xf0 0x10>;

			reg-names = "nand", "nand-int-base";

			status = "disabled";

			interrupts = <GIC_SPI 38 0>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "nand";

		};

arch/arm/boot/dts/sun8i-r40.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -800,8 +800,7 @@ 
		};



		hdmi_phy: hdmi-phy@1ef0000 {

			compatible = "allwinner,sun8i-r40-hdmi-phy",

				     "allwinner,sun50i-a64-hdmi-phy";

			compatible = "allwinner,sun8i-r40-hdmi-phy";

			reg = <0x01ef0000 0x10000>;

			clocks = <&ccu CLK_BUS_HDMI1>, <&ccu CLK_HDMI_SLOW>,

				 <&ccu 7>, <&ccu 16>;

drivers/soc/fsl/qbman/bman_ccsr.c

+11 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static void bm_set_memory(u64 ba, u32 size) 
 */

static dma_addr_t fbpr_a;

static size_t fbpr_sz;

static int __bman_probed;



static int bman_fbpr(struct reserved_mem *rmem)

{
@@ -166,6 +167,12 @@ static irqreturn_t bman_isr(int irq, void *ptr) 
	return IRQ_HANDLED;

}



int bman_is_probed(void)

{

	return __bman_probed;

}

EXPORT_SYMBOL_GPL(bman_is_probed);



static int fsl_bman_probe(struct platform_device *pdev)

{

	int ret, err_irq;
@@ -175,6 +182,8 @@ static int fsl_bman_probe(struct platform_device *pdev) 
	u16 id, bm_pool_cnt;

	u8 major, minor;



	__bman_probed = -1;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",
@@ -255,6 +264,8 @@ static int fsl_bman_probe(struct platform_device *pdev) 
		return ret;

	}



	__bman_probed = 1;



	return 0;

};