Commit b62e4255 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Olof writes:
  "ARM: SoC fixes

   A handful of fixes that have been coming in the last couple of weeks:

   - Freescale fixes for on-chip accellerators
   - A DT fix for stm32 to avoid fallback to non-DMA SPI mode
   - Fixes for badly specified interrupts on BCM63xx SoCs
   - Allwinner A64 HDMI was incorrectly specified as fully compatble with R40
   - Drive strength fix for SAMA5D2 NAND pins on one board"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: stm32: update SPI6 dmas property on stm32mp157c
  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
parents ef0f2584 082dc55e

MAINTAINERS

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




ARM/Annapurna Labs ALPINE ARCHITECTURE

ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

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)

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

S:	Maintained

S:	Maintained

F:	arch/arm/mach-alpine/

F:	arch/arm/mach-alpine/

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

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

#include "sama5d2-pinfunc.h"

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

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

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

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

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





/ {

/ {

	model = "Atmel SAMA5D2 PTC EK";

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

							 <PIN_PA30__NWE_NANDWE>,

							 <PIN_PB2__NRD_NANDOE>;

							 <PIN_PB2__NRD_NANDOE>;

						bias-pull-up;

						bias-pull-up;

						atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>;

					};

					};





					ale_cle_rdy_cs {

					ale_cle_rdy_cs {

arch/arm/boot/dts/bcm63138.dtsi

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

		global_timer: timer@1e200 {

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

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

			reg = <0x1e200 0x20>;

			reg = <0x1e200 0x20>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&axi_clk>;

			clocks = <&axi_clk>;

		};

		};





		local_timer: local-timer@1e600 {

		local_timer: local-timer@1e600 {

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

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

			reg = <0x1e600 0x20>;

			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>;

			clocks = <&axi_clk>;

		};

		};





		twd_watchdog: watchdog@1e620 {

		twd_watchdog: watchdog@1e620 {

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

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

			reg = <0x1e620 0x20>;

			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 {

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

		serial0: serial@600 {

			compatible = "brcm,bcm6345-uart";

			compatible = "brcm,bcm6345-uart";

			reg = <0x600 0x1b>;

			reg = <0x600 0x1b>;

			interrupts = <GIC_SPI 32 0>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			clock-names = "periph";

			status = "disabled";

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

		serial1: serial@620 {

			compatible = "brcm,bcm6345-uart";

			compatible = "brcm,bcm6345-uart";

			reg = <0x620 0x1b>;

			reg = <0x620 0x1b>;

			interrupts = <GIC_SPI 33 0>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			clock-names = "periph";

			status = "disabled";

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

			reg = <0x2000 0x600>, <0xf0 0x10>;

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

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

			status = "disabled";

			status = "disabled";

			interrupts = <GIC_SPI 38 0>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "nand";

			interrupt-names = "nand";

		};

		};

arch/arm/boot/dts/stm32mp157c.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -1078,8 +1078,8 @@ 
			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&rcc SPI6_K>;

			clocks = <&rcc SPI6_K>;

			resets = <&rcc SPI6_R>;

			resets = <&rcc SPI6_R>;

			dmas = <&mdma1 34 0x0 0x40008 0x0 0x0 0>,

			dmas = <&mdma1 34 0x0 0x40008 0x0 0x0>,

			       <&mdma1 35 0x0 0x40002 0x0 0x0 0>;

			       <&mdma1 35 0x0 0x40002 0x0 0x0>;

			dma-names = "rx", "tx";

			dma-names = "rx", "tx";

			status = "disabled";

			status = "disabled";

		};

		};

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

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

		};





		hdmi_phy: hdmi-phy@1ef0000 {

		hdmi_phy: hdmi-phy@1ef0000 {

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

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

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

			reg = <0x01ef0000 0x10000>;

			reg = <0x01ef0000 0x10000>;

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE