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

Commit e8d6766f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "The majority of the fixes this time are for OMAP hardware, here is a
  breakdown of the significant changes:

  Various device tree bug fixes:
   - TI am57xx boards need a voltage level fix to avoid damaging SD
     cards
   - vf610-bk4 fails to detect its flash due to an incorrect description
   - meson-g12a USB phy configuration fails
   - meson-g12b reboot should not power off the SD card
   - Some corrections for apparently harmless differences from the
     documentation.

  Regression fixes:
   - ams-delta FIQ interrupts broke in 5.3
   - TI am3/am4 mmc controllers broke in 5.2

  The logic_pio driver (used on some Huawei ARM servers) got a few bug
  fixes for reliability.

  And a couple of compile-time warning fixes"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (26 commits)
  soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TEST
  soc: ti: pm33xx: Make two symbols static
  soc: ti: pm33xx: Fix static checker warnings
  ARM: OMAP: dma: Mark expected switch fall-throughs
  ARM: dts: Fix incomplete dts data for am3 and am4 mmc
  bus: ti-sysc: Simplify cleanup upon failures in sysc_probe()
  ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack
  ARM: dts: dra74x: Fix iodelay configuration for mmc3
  ARM: dts: am335x: Fix UARTs length
  ARM: OMAP2+: Fix omap4 errata warning on other SoCs
  bus: hisi_lpc: Add .remove method to avoid driver unbind crash
  bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free
  lib: logic_pio: Add logic_pio_unregister_range()
  lib: logic_pio: Avoid possible overlap for unregistering regions
  lib: logic_pio: Fix RCU usage
  arm64: dts: amlogic: odroid-n2: keep SD card regulator always on
  arm64: dts: meson-g12a-sei510: enable IR controller
  arm64: dts: meson-g12a: add missing dwc2 phy-names
  ARM: dts: vf610-bk4: Fix qspi node description
  ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7
  ...
parents 8fb8e9e4 7a6c9dbb

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co 
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ S: Maintained 
F:	drivers/crypto/sunxi-ss/



ALLWINNER VPU DRIVER

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Maxime Ripard <mripard@kernel.org>

M:	Paul Kocialkowski <paul.kocialkowski@bootlin.com>

L:	linux-media@vger.kernel.org

S:	Maintained
@@ -1408,7 +1408,7 @@ S: Maintained 
F:	drivers/clk/sunxi/



ARM/Allwinner sunXi SoC support

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Maxime Ripard <mripard@kernel.org>

M:	Chen-Yu Tsai <wens@csie.org>

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

S:	Maintained
@@ -3577,7 +3577,7 @@ F: Documentation/filesystems/caching/cachefiles.txt 
F:	fs/cachefiles/



CADENCE MIPI-CSI2 BRIDGES

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Maxime Ripard <mripard@kernel.org>

L:	linux-media@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/media/cdns,*.txt
@@ -5295,7 +5295,7 @@ F: include/linux/vga* 


DRM DRIVERS AND MISC GPU PATCHES

M:	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Maxime Ripard <mripard@kernel.org>

M:	Sean Paul <sean@poorly.run>

W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html

S:	Maintained
@@ -5308,7 +5308,7 @@ F: include/uapi/drm/drm* 
F:	include/linux/vga*



DRM DRIVERS FOR ALLWINNER A10

M:	Maxime Ripard  <maxime.ripard@bootlin.com>

M:	Maxime Ripard <mripard@kernel.org>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/sun4i/

arch/arm/boot/dts/am33xx-l4.dtsi

+10 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 
			uart0: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <72>;

				status = "disabled";

				dmas = <&edma 26 0>, <&edma 27 0>;
@@ -934,7 +934,7 @@ 
			uart1: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <73>;

				status = "disabled";

				dmas = <&edma 28 0>, <&edma 29 0>;
@@ -966,7 +966,7 @@ 
			uart2: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <74>;

				status = "disabled";

				dmas = <&edma 30 0>, <&edma 31 0>;
@@ -1614,7 +1614,7 @@ 
			uart3: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <44>;

				status = "disabled";

			};
@@ -1644,7 +1644,7 @@ 
			uart4: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <45>;

				status = "disabled";

			};
@@ -1674,7 +1674,7 @@ 
			uart5: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x2000>;

				reg = <0x0 0x1000>;

				interrupts = <46>;

				status = "disabled";

			};
@@ -1758,6 +1758,8 @@ 


		target-module@cc000 {			/* 0x481cc000, ap 60 46.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xcc020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can0";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
@@ -1780,6 +1782,8 @@ 


		target-module@d0000 {			/* 0x481d0000, ap 62 42.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xd0020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can1";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,

arch/arm/boot/dts/am33xx.dtsi

+26 −6
Original line number Diff line number Diff line
@@ -234,13 +234,33 @@ 
			interrupt-names = "edma3_tcerrint";

		};



		mmc3: mmc@47810000 {

			compatible = "ti,omap4-hsmmc";

		target-module@47810000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "mmc3";

			reg = <0x478102fc 0x4>,

			      <0x47810110 0x4>,

			      <0x47810114 0x4>;

			reg-names = "rev", "sysc", "syss";

			ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |

					 SYSC_OMAP2_ENAWAKEUP |

					 SYSC_OMAP2_SOFTRESET |

					 SYSC_OMAP2_AUTOIDLE)>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			ti,syss-mask = <1>;

			clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x47810000 0x1000>;



			mmc3: mmc@0 {

				compatible = "ti,omap4-hsmmc";

				ti,needs-special-reset;

				interrupts = <29>;

			reg = <0x47810000 0x1000>;

			status = "disabled";

				reg = <0x0 0x1000>;

			};

		};



		usb: usb@47400000 {

arch/arm/boot/dts/am4372.dtsi

+26 −6
Original line number Diff line number Diff line
@@ -228,13 +228,33 @@ 
			interrupt-names = "edma3_tcerrint";

		};



		mmc3: mmc@47810000 {

			compatible = "ti,omap4-hsmmc";

			reg = <0x47810000 0x1000>;

		target-module@47810000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "mmc3";

			reg = <0x478102fc 0x4>,

			      <0x47810110 0x4>,

			      <0x47810114 0x4>;

			reg-names = "rev", "sysc", "syss";

			ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |

					 SYSC_OMAP2_ENAWAKEUP |

					 SYSC_OMAP2_SOFTRESET |

					 SYSC_OMAP2_AUTOIDLE)>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			ti,syss-mask = <1>;

			clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x47810000 0x1000>;



			mmc3: mmc@0 {

				compatible = "ti,omap4-hsmmc";

				ti,needs-special-reset;

				interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

				reg = <0x0 0x1000>;

			};

		};



		sham: sham@53100000 {