Commit 3e899c72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This is a larger than normal update for Arm SoC specific code, most of
  it in device trees, but also drivers and the omap and at91/sama7
  platforms:

   - There are four new entries to the MAINTAINERS file: Sven Peter and
     Alyssa Rosenzweig for Apple M1, Romain Perier for Mstar/sigmastar,
     and Vignesh Raghavendra for TI K3

   - Build fixes to address randconfig warnings in sharpsl, dove, omap1,
     and qcom platforms as well as the scmi and op-tee subsystems

   - Regression fixes for missing CONFIG_FB and other options for
     several defconfigs

   - Several bug fixes for the newly added Microchip SAMA7 platform,
     mostly regarding power management

   - Missing SMP barriers to protect accesses to SCMI virtio device

   - Regression fixes for TI OMAP, including a boot-time hang on am335x.

   - Lots of bug fixes for NXP i.MX, mostly addressing incorrect
     settings in devicetree files, and one revert for broken suspend.

   - Fixes for ARM Juno/Vexpress devicetree files, addressing a couple
     of schema warnings.

   - Regression fixes for qualcomm SoC specific drivers and devicetree
     files, reverting an mdt_loader change and at least pastially
     reverting some of the 5.15 DTS changes, plus some minor bugfixes"

* tag 'armsoc-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (64 commits)
  MAINTAINERS: Add Sven Peter as ARM/APPLE MACHINE maintainer
  MAINTAINERS: Add Alyssa Rosenzweig as M1 reviewer
  firmware: arm_scmi: Add proper barriers to scmi virtio device
  firmware: arm_scmi: Simplify spinlocks in virtio transport
  ARM: dts: omap3430-sdp: Fix NAND device node
  bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
  ARM: sharpsl_param: work around -Wstringop-overread warning
  ARM: defconfig: gemini: Restore framebuffer
  ARM: dove: mark 'putc' as inline
  ARM: omap1: move omap15xx local bus handling to usb.c
  MAINTAINERS: Add Vignesh to TI K3 platform maintainership
  arm64: dts: imx8m*-venice-gw7902: fix M2_RST# gpio
  ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
  arm64: dts: ls1028a: fix eSDHC2 node
  arm64: dts: imx8mm-kontron-n801x-som: do not allow to switch off buck2
  ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins
  ARM: dts: at91: sama7g5ek: use proper slew-rate settings for GMACs
  ARM: at91: pm: preload base address of controllers in tlb
  ARM: at91: pm: group constants and addresses loading
  ARM: dts: at91: sama7g5ek: add suspend voltage for ddr3l rail
  ...
parents 7041503d 897c2e74

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ F: drivers/input/mouse/bcm5974.c 








APPLE DART IOMMU DRIVER









M:	Sven Peter <sven@svenpeter.dev>









R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>









L:	iommu@lists.linux-foundation.org









S:	Maintained









F:	Documentation/devicetree/bindings/iommu/apple,dart.yaml








@@ -1712,6 +1713,8 @@ F:	drivers/*/*alpine*















ARM/APPLE MACHINE SUPPORT









M:	Hector Martin <marcan@marcan.st>









M:	Sven Peter <sven@svenpeter.dev>









R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>









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









S:	Maintained









W:	https://asahilinux.org








@@ -2237,6 +2240,7 @@ F:	arch/arm/mach-pxa/mioa701.c















ARM/MStar/Sigmastar Armv7 SoC support









M:	Daniel Palmer <daniel@thingy.jp>









M:	Romain Perier <romain.perier@gmail.com>









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









S:	Maintained









W:	http://linux-chenxing.org/








@@ -2713,6 +2717,7 @@ F:	drivers/power/reset/keystone-reset.c















ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE









M:	Nishanth Menon <nm@ti.com>









M:	Vignesh Raghavendra <vigneshr@ti.com>









M:	Tero Kristo <kristo@kernel.org>









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









S:	Supported
































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



+0
−1






























Original line number
Diff line number
Diff line







@@ -71,7 +71,6 @@







			isc: isc@f0008000 {









				pinctrl-names = "default";









				pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;









				status = "okay";









			};



















			qspi1: spi@f0024000 {
































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



+39
−6






























Original line number
Diff line number
Diff line







@@ -196,11 +196,13 @@

















					regulator-state-standby {









						regulator-on-in-suspend;









						regulator-suspend-microvolt = <1350000>;









						regulator-mode = <4>;









					};



















					regulator-state-mem {









						regulator-on-in-suspend;









						regulator-suspend-microvolt = <1350000>;









						regulator-mode = <4>;









					};









				};








@@ -353,7 +355,10 @@







	#address-cells = <1>;









	#size-cells = <0>;









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_gmac0_default &pinctrl_gmac0_txck_default &pinctrl_gmac0_phy_irq>;









	pinctrl-0 = <&pinctrl_gmac0_default









		     &pinctrl_gmac0_mdio_default









		     &pinctrl_gmac0_txck_default









		     &pinctrl_gmac0_phy_irq>;









	phy-mode = "rgmii-id";









	status = "okay";


















@@ -368,7 +373,9 @@







	#address-cells = <1>;









	#size-cells = <0>;









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_gmac1_default &pinctrl_gmac1_phy_irq>;









	pinctrl-0 = <&pinctrl_gmac1_default









		     &pinctrl_gmac1_mdio_default









		     &pinctrl_gmac1_phy_irq>;









	phy-mode = "rmii";









	status = "okay";


















@@ -423,14 +430,20 @@







			 <PIN_PA15__G0_TXEN>,









			 <PIN_PA30__G0_RXCK>,









			 <PIN_PA18__G0_RXDV>,









			 <PIN_PA22__G0_MDC>,









			 <PIN_PA23__G0_MDIO>,









			 <PIN_PA25__G0_125CK>;









		slew-rate = <0>;









		bias-disable;









	};



















	pinctrl_gmac0_mdio_default: gmac0_mdio_default {









		pinmux = <PIN_PA22__G0_MDC>,









			 <PIN_PA23__G0_MDIO>;









		bias-disable;









	};



















	pinctrl_gmac0_txck_default: gmac0_txck_default {









		pinmux = <PIN_PA24__G0_TXCK>;









		slew-rate = <0>;









		bias-pull-up;









	};


















@@ -447,8 +460,13 @@







			 <PIN_PD25__G1_RX0>,









			 <PIN_PD26__G1_RX1>,









			 <PIN_PD27__G1_RXER>,









			 <PIN_PD24__G1_RXDV>,









			 <PIN_PD28__G1_MDC>,









			 <PIN_PD24__G1_RXDV>;









		slew-rate = <0>;









		bias-disable;









	};



















	pinctrl_gmac1_mdio_default: gmac1_mdio_default {









		pinmux = <PIN_PD28__G1_MDC>,









			 <PIN_PD29__G1_MDIO>;









		bias-disable;









	};








@@ -540,6 +558,7 @@







				 <PIN_PA8__SDMMC0_DAT5>,









				 <PIN_PA9__SDMMC0_DAT6>,









				 <PIN_PA10__SDMMC0_DAT7>;









			slew-rate = <0>;









			bias-pull-up;









		};


















@@ -547,6 +566,7 @@







			pinmux = <PIN_PA0__SDMMC0_CK>,









				 <PIN_PA2__SDMMC0_RSTN>,









				 <PIN_PA11__SDMMC0_DS>;









			slew-rate = <0>;









			bias-pull-up;









		};









	};








@@ -558,6 +578,7 @@







				 <PIN_PC0__SDMMC1_DAT1>,









				 <PIN_PC1__SDMMC1_DAT2>,









				 <PIN_PC2__SDMMC1_DAT3>;









			slew-rate = <0>;









			bias-pull-up;









		};


















@@ -566,6 +587,7 @@







				 <PIN_PB28__SDMMC1_RSTN>,









				 <PIN_PC5__SDMMC1_1V8SEL>,









				 <PIN_PC4__SDMMC1_CD>;









			slew-rate = <0>;









			bias-pull-up;









		};









	};








@@ -577,11 +599,13 @@







				 <PIN_PD6__SDMMC2_DAT1>,









				 <PIN_PD7__SDMMC2_DAT2>,









				 <PIN_PD8__SDMMC2_DAT3>;









			slew-rate = <0>;









			bias-pull-up;









		};



















		ck {









			pinmux = <PIN_PD4__SDMMC2_CK>;









			slew-rate = <0>;









			bias-pull-up;









		};









	};








@@ -634,6 +658,15 @@







	pinctrl-0 = <&pinctrl_sdmmc2_default>;









};



















&shdwc {









	atmel,shdwc-debouncer = <976>;









	status = "okay";



















	input@0 {









		reg = <0>;









	};









};



















&spdifrx {









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_spdifrx_default>;
































arch/arm/boot/dts/imx53-m53menlo.dts



+2
−2






























Original line number
Diff line number
Diff line







@@ -56,6 +56,7 @@







	panel {









		compatible = "edt,etm0700g0dh6";









		pinctrl-0 = <&pinctrl_display_gpio>;









		pinctrl-names = "default";









		enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;



















		port {








@@ -76,8 +77,7 @@







		regulator-name = "vbus";









		regulator-min-microvolt = <5000000>;









		regulator-max-microvolt = <5000000>;









		gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;









		enable-active-high;









		gpio = <&gpio1 2 0>;









	};









};










































arch/arm/boot/dts/imx6dl-yapp4-common.dtsi



+5
−0






























Original line number
Diff line number
Diff line







@@ -5,6 +5,7 @@







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









#include <dt-bindings/interrupt-controller/irq.h>









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









#include <dt-bindings/leds/common.h>









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



















/ {








@@ -277,6 +278,7 @@







			led-cur = /bits/ 8 <0x20>;









			max-cur = /bits/ 8 <0x60>;









			reg = <0>;









			color = <LED_COLOR_ID_RED>;









		};



















		chan@1 {








@@ -284,6 +286,7 @@







			led-cur = /bits/ 8 <0x20>;









			max-cur = /bits/ 8 <0x60>;









			reg = <1>;









			color = <LED_COLOR_ID_GREEN>;









		};



















		chan@2 {








@@ -291,6 +294,7 @@







			led-cur = /bits/ 8 <0x20>;









			max-cur = /bits/ 8 <0x60>;









			reg = <2>;









			color = <LED_COLOR_ID_BLUE>;









		};



















		chan@3 {








@@ -298,6 +302,7 @@







			led-cur = /bits/ 8 <0x0>;









			max-cur = /bits/ 8 <0x0>;









			reg = <3>;









			color = <LED_COLOR_ID_WHITE>;









		};









	};