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

Commit 75bda360 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-next-v4.20-2' of... 

Merge tag 'soc-fsl-next-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into next/drivers

NXP/FSL SoC drivers updates for v4.20 take 2

- Update qbman driver to better work with CPU hotplug
- Add Kconfig dependency of 64-bit DMA addressing for qbman driver
- Use last reponse to determine valid bit for qbman driver
- Defer bman_portals probe if bman is not probed
- Add interrupt coalescing APIs to qbman driver

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

:
  soc: fsl: qbman: add interrupt coalesce changing APIs
  soc: fsl: bman_portals: defer probe after bman's probe
  soc: fsl: qbman: Use last response to determine valid bit
  soc: fsl: qbman: Add 64 bit DMA addressing requirement to QBMan
  soc: fsl: qbman: replace CPU 0 with any online CPU in hotplug handlers
  soc: fsl: qbman: Check if CPU is offline when initializing portals
  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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e51e8d5d 6d06009c

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/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig FSL_DPAA

	bool "QorIQ DPAA1 framework support"

	depends on (FSL_SOC_BOOKE || ARCH_LAYERSCAPE)

	depends on ((FSL_SOC_BOOKE || ARCH_LAYERSCAPE) && ARCH_DMA_ADDR_T_64BIT)

	select GENERIC_ALLOCATOR

	help

	  The Freescale Data Path Acceleration Architecture (DPAA) is a set of