Commit 54fe3ffe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "The code fixes in this round are all for the Texas Instruments OMAP
  platform, addressing several regressions related to the ti-sysc
  interconnect changes that was merged in linux-5.11 and one recently
  introduced RCU usage warning.

  Tero Kristo updates his maintainer file entries as he is changing to a
  new employer.

  The other changes are for devicetree files across eight different
  platforms:

  TI OMAP:
   - multiple gpio related one-line fixes

  Allwinner/sunxi:
   - ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
   - soc: sunxi: mbus: Remove DE2 display engine compatibles

  NXP lpc32xx:
   - ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL

  STMicroelectronics stm32
   - multiple minor fixes for DHCOM/DHCOR boards

  NXP Layerscape:
   - Fix DCFG address range on LS1046A SoC

  Amlogic meson:
   - fix reboot issue on odroid C4
   - revert an ethernet change that caused a regression
   - meson-g12: Set FL-adj property value

  Rockchip:
   - multiple minor fixes on 64-bit rockchip machines

  Qualcomm:
   - Regression fixes for Lenovo Yoga touchpad and for interconnect
     configuration
   - Boot fixes for 'LPASS' clock configuration on two machines"

* tag 'arm-soc-fixes-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (31 commits)
  ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL
  ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
  arm64: dts: ls1046a: fix dcfg address range
  soc: sunxi: mbus: Remove DE2 display engine compatibles
  arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
  Revert "arm64: dts: amlogic: add missing ethernet reset ID"
  arm64: dts: rockchip: Disable display for NanoPi R2S
  ARM: dts: omap4-droid4: Fix lost keypad slide interrupts for droid4
  arm64: dts: rockchip: remove interrupt-names property from rk3399 vdec node
  drivers: bus: simple-pm-bus: Fix compatibility with simple-bus for auxdata
  ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus
  ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM PicoITX
  ARM: dts: stm32: Fix GPIO hog names on DHCOM
  ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
  ARM: dts: stm32: Disable WP on DHCOM uSD slot
  ARM: dts: stm32: Connect card-detect signal on DHCOM
  ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect
  arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc
  ...
parents 40615974 459630a3

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -2616,8 +2616,8 @@ S: Maintained 
F:	drivers/power/reset/keystone-reset.c









ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE









M:	Tero Kristo <t-kristo@ti.com>









M:	Nishanth Menon <nm@ti.com>









M:	Tero Kristo <kristo@kernel.org>









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









S:	Supported









F:	Documentation/devicetree/bindings/arm/ti/k3.yaml








@@ -6474,9 +6474,9 @@ S:	Maintained







F:	drivers/edac/skx_*.[ch]

















EDAC-TI









M:	Tero Kristo <t-kristo@ti.com>









M:	Tero Kristo <kristo@kernel.org>









L:	linux-edac@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/edac/ti_edac.c

















EDIROL UA-101/UA-1000 DRIVER








@@ -17572,7 +17572,7 @@ F:	include/linux/dma/k3-psil.h















TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER









M:	Nishanth Menon <nm@ti.com>









M:	Tero Kristo <t-kristo@ti.com>









M:	Tero Kristo <kristo@kernel.org>









M:	Santosh Shilimkar <ssantosh@kernel.org>









L:	linux-arm-kernel@lists.infradead.org









S:	Maintained








@@ -17716,9 +17716,9 @@ S:	Maintained







F:	drivers/clk/clk-cdce706.c

















TI CLOCK DRIVER









M:	Tero Kristo <t-kristo@ti.com>









M:	Tero Kristo <kristo@kernel.org>









L:	linux-omap@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/clk/ti/









F:	include/linux/clk/ti.h

































arch/arm/boot/dts/lpc32xx.dtsi



+0
−3






























Original line number
Diff line number
Diff line







@@ -326,9 +326,6 @@

















					clocks = <&xtal_32k>, <&xtal>;









					clock-names = "xtal_32k", "xtal";



















					assigned-clocks = <&clk LPC32XX_CLK_HCLK_PLL>;









					assigned-clock-rates = <208000000>;









				};









			};










































arch/arm/boot/dts/omap3-gta04.dtsi



+1
−2






























Original line number
Diff line number
Diff line







@@ -114,7 +114,7 @@







		gpio-sck = <&gpio1 12 GPIO_ACTIVE_HIGH>;









		gpio-miso = <&gpio1 18 GPIO_ACTIVE_HIGH>;









		gpio-mosi = <&gpio1 20 GPIO_ACTIVE_HIGH>;









		cs-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;









		cs-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;









		num-chipselects = <1>;



















		/* lcd panel */








@@ -124,7 +124,6 @@







			spi-max-frequency = <100000>;









			spi-cpol;









			spi-cpha;









			spi-cs-high;



















			backlight= <&backlight>;









			label = "lcd";
































arch/arm/boot/dts/omap4-droid4-xt894.dts



+5
−0






























Original line number
Diff line number
Diff line







@@ -16,8 +16,13 @@







			debounce-interval = <10>;









		};



















		/*









		 * We use pad 0x4a100116 abe_dmic_din3.gpio_122 as the irq instead









		 * of the gpio interrupt to avoid lost events in deeper idle states.









		*/









		slider {









			label = "Keypad Slide";









			interrupts-extended = <&omap4_pmx_core 0xd6>;









			gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */









			linux,input-type = <EV_SW>;









			linux,code = <SW_KEYPAD_SLIDE>;
































arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi



+11
−5






























Original line number
Diff line number
Diff line







@@ -33,9 +33,9 @@







	 * during TX anyway and that it only controls drive enable DE









	 * line. Hence, the RX is always enabled here.









	 */









	rs485-rx-en {









	rs485-rx-en-hog {









		gpio-hog;









		gpios = <8 GPIO_ACTIVE_HIGH>;









		gpios = <8 0>;









		output-low;









		line-name = "rs485-rx-en";









	};








@@ -61,9 +61,9 @@







	 * order to reset the Hub when USB bus is powered down, but









	 * so far there is no such functionality.









	 */









	usb-hub {









	usb-hub-hog {









		gpio-hog;









		gpios = <2 GPIO_ACTIVE_HIGH>;









		gpios = <2 0>;









		output-high;









		line-name = "usb-hub-reset";









	};








@@ -87,6 +87,12 @@







	};









};



















&i2c4 {









	touchscreen@49 {









		status = "disabled";









	};









};



















&i2c5 {	/* TP7/TP8 */









	pinctrl-names = "default";









	pinctrl-0 = <&i2c5_pins_a>;








@@ -104,7 +110,7 @@







	 * are used for on-board microSD slot instead.









	 */









	/delete-property/broken-cd;









	cd-gpios = <&gpioi 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;









	cd-gpios = <&gpioi 10 GPIO_ACTIVE_HIGH>;









	disable-wp;









};