Commit 9c87c9f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Around one third of the fixes this time are for dts files that list
  their ethernet controller as using 'phy-mode="rgmii"' but are changed
  to 'phy-mode="rgmii-id"' now, because the PHY drivers (realtek,
  ksz9031, dp83867, ...) now configure the internal delay based on that
  when they used to stay on the hardware default.

  The long story is archived at

    https://lore.kernel.org/netdev/CAMj1kXEEF_Un-4NTaD5iUN0NoZYaJQn-rPediX0S6oRiuVuW-A@mail.gmail.com/

  I was trying to hold off on the bugfixes until there was a solution
  that would avoid breaking all boards, but that does not seem to be
  happening any time soon, so I am now sending the correct version of
  the dts files to ensure that at least these machines can use their
  network devices again.

  The other changes this time are:

   - Updating the MAINTAINER lists for Allwinner and Samsung SoCs

   - Multiple i.MX8MN machines get updates for their CPU operating
     points to match the data sheet

   - A revert for a dts patch that caused a regression in USB support on
     Odroid U3

   - Two fixes for the AMD Tee driver, addressing a memory leak and
     missing locking

   - Mark the network subsystem on qoriq-fman3 as cache coherent for
     correctness as better performance.

   - Minor dts fixes elsewhere, addressing dtc warnings and similar
     problems"

* tag 'arm-soc-fixes-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (48 commits)
  ARM: dts: exynos: revert "add input clock to CMU in Exynos4412 Odroid"
  ARM: dts: imx50-evk: Fix the chip select 1 IOMUX
  arm64: dts: imx8mm: fix voltage for 1.6GHz CPU operating point
  ARM: dts: stm32: Keep VDDA LDO1 always on on DHCOM
  ARM: dts: stm32: Enable thermal sensor support on stm32mp15xx-dhcor
  ARM: dts: stm32: Define VIO regulator supply on DHCOM
  ARM: dts: stm32: Fix LED5 on STM32MP1 DHCOM PDK2
  ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2
  arm64: dts: renesas: r8a774e1: Add missing audio_clk_b
  tee: amdtee: synchronize access to shm list
  tee: amdtee: fix memory leak due to reset of global shm list
  arm64: dts: agilex/stratix10: Fix qspi node compatible
  ARM: dts: imx6q-prti6q: fix PHY address
  ARM: dts: vf610-zii-dev-rev-b: Fix MDIO over clocking
  arm: dts: imx6qdl-udoo: fix rgmii phy-mode for ksz9031 phy
  arm64: dts imx8mn: Remove non-existent USB OTG2
  arm64: dts: imx8mm-beacon-som: Fix Choppy BT audio
  arm64: dts: fsl: DPAA FMan DMA operations are coherent
  arm64: dts: fsl: fix endianness issue of rcpm
  arm64: dts: imx8mn-evk: fix missing PMIC's interrupt line pull-up
  ...
parents a5698b38 cc05af8e
Loading
Loading
Loading
Loading
+36 −26
Original line number Diff line number Diff line
@@ -849,6 +849,12 @@ D: trivial hack to add variable address length routing to Rose.
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
D: ax25-utils maintainer.

N: Kamil Debski
E: kamil@wypas.org
D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
D: Samsung USB2 phy drivers
D: PWM fan driver

N: Helge Deller
E: deller@gmx.de
W: http://www.parisc-linux.org/
@@ -2852,6 +2858,10 @@ D: IPX development and support
N: Venkatesh Pallipadi (Venki)
D: x86/HPET

N: Kyungmin Park
E: kyungmin.park@samsung.com
D: Samsung S5Pv210 and Exynos4210 mobile platforms

N: David Parsons
E: orc@pell.chi.il.us
D: improved memory detection code.
+2 −17
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ F: drivers/clk/sunxi/
ARM/Allwinner sunXi SoC support
M:	Maxime Ripard <mripard@kernel.org>
M:	Chen-Yu Tsai <wens@csie.org>
R:	Jernej Skrabec <jernej.skrabec@siol.net>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@ -2374,7 +2375,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
F:	sound/soc/rockchip/
N:	rockchip
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
M:	Krzysztof Kozlowski <krzk@kernel.org>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-samsung-soc@vger.kernel.org
@@ -2403,15 +2404,7 @@ N: s3c2410
N:	s3c64xx
N:	s5pv210
ARM/SAMSUNG MOBILE MACHINE SUPPORT
M:	Kyungmin Park <kyungmin.park@samsung.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm/mach-s5pv210/
ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
M:	Kyungmin Park <kyungmin.park@samsung.com>
M:	Kamil Debski <kamil@wypas.org>
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-media@vger.kernel.org
@@ -2436,9 +2429,6 @@ S: Maintained
F:	drivers/media/platform/s5p-jpeg/
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
M:	Kyungmin Park <kyungmin.park@samsung.com>
M:	Kamil Debski <kamil@wypas.org>
M:	Jeongtae Park <jtp.park@samsung.com>
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-media@vger.kernel.org
@@ -14211,7 +14201,6 @@ F: drivers/media/usb/pwc/*
F:	include/trace/events/pwc.h
PWM FAN DRIVER
M:	Kamil Debski <kamil@wypas.org>
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L:	linux-hwmon@vger.kernel.org
S:	Supported
@@ -15425,14 +15414,12 @@ F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
F:	drivers/nfc/s3fwrn5
SAMSUNG S5C73M3 CAMERA DRIVER
M:	Kyungmin Park <kyungmin.park@samsung.com>
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-media@vger.kernel.org
S:	Supported
F:	drivers/media/i2c/s5c73m3/*
SAMSUNG S5K5BAF CAMERA DRIVER
M:	Kyungmin Park <kyungmin.park@samsung.com>
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-media@vger.kernel.org
S:	Supported
@@ -15450,7 +15437,6 @@ F: Documentation/devicetree/bindings/crypto/samsung-sss.yaml
F:	drivers/crypto/s5p-sss.c
SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
M:	Kyungmin Park <kyungmin.park@samsung.com>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
L:	linux-media@vger.kernel.org
S:	Supported
@@ -15498,7 +15484,6 @@ T: git https://github.com/lmajewski/linux-samsung-thermal.git
F:	drivers/thermal/samsung/
SAMSUNG USB2 PHY DRIVER
M:	Kamil Debski <kamil@wypas.org>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
L:	linux-kernel@vger.kernel.org
S:	Supported
+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@
};

&clock {
	clocks = <&clock CLK_XUSBXTI>;
	assigned-clocks = <&clock CLK_FOUT_EPLL>;
	assigned-clock-rates = <45158401>;
};
+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
				MX50_PAD_CSPI_MISO__CSPI_MISO		0x00
				MX50_PAD_CSPI_MOSI__CSPI_MOSI		0x00
				MX50_PAD_CSPI_SS0__GPIO4_11		0xc4
				MX50_PAD_ECSPI1_MOSI__CSPI_SS1		0xf4
				MX50_PAD_ECSPI1_MOSI__GPIO4_13		0x84
			>;
		};

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@
		#size-cells = <0>;

		/* Microchip KSZ9031RNX PHY */
		rgmii_phy: ethernet-phy@4 {
			reg = <4>;
		rgmii_phy: ethernet-phy@0 {
			reg = <0>;
			interrupts-extended = <&gpio1 28 IRQ_TYPE_LEVEL_LOW>;
			reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
			reset-assert-us = <10000>;
Loading