Commit 1c49f281 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Most of the contents are bugfixes for the devicetree files:

   - A Qualcomm MSM8974 pin controller regression, caused by a cleanup
     patch that gets partially reverted here.

   - Missing properties for Broadcom BCM49xx to fix timer detection and
     SMP boot.

   - Fix touchscreen pinctrl for imx6ull-colibri board

   - Multiple fixes for Rockchip rk3399 based machines including the vdu
     clock-rate fix, otg port fix on Quartz64-A and ethernet on
     Quartz64-B

   - Fixes for misspelled DT contents causing minor problems on
     imx6qdl-ts7970m, orangepi-zero, sama5d2, kontron-kswitch-d10, and
     ls1028a

  And a couple of changes elsewhere:

   - Fix binding for Allwinner D1 display pipeline

   - Trivial code fixes to the TEE and reset controller driver
     subsystems and the rockchip platform code.

   - Multiple updates to the MAINTAINERS files, marking the Palm Treo
     support as orphaned, and fixing some entries for added or changed
     file names"

* tag 'soc-fixes-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (21 commits)
  arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot
  arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC
  ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero
  ARM: dts: at91: sama5d2: Fix typo in i2s1 node
  tee: tee_get_drvdata(): fix description of return value
  optee: Remove duplicate 'of' in two places.
  ARM: dts: kswitch-d10: use open drain mode for coma-mode pins
  ARM: dts: colibri-imx6ull: fix snvs pinmux group
  optee: smc_abi.c: fix wrong pointer passed to IS_ERR/PTR_ERR()
  MAINTAINERS: add polarfire rng, pci and clock drivers
  MAINTAINERS: mark ARM/PALM TREO SUPPORT orphan
  ARM: dts: imx6qdl-ts7970: Fix ngpio typo and count
  arm64: dts: ls1028a: Update SFP node to include clock
  dt-bindings: display: sun4i: Fix D1 pipeline count
  ARM: dts: qcom: msm8974: re-add missing pinctrl
  reset: Fix devm bulk optional exclusive control getter
  MAINTAINERS: rectify entry for SYNOPSYS AXS10x RESET CONTROLLER DRIVER
  ARM: rockchip: Add missing of_node_put() in rockchip_suspend_init()
  arm64: dts: rockchip: Assign RK3399 VDU clock rate
  arm64: dts: rockchip: Fix Quartz64-A dwc3 otg port behavior
  ...
parents 2a347a06 d332a1f6

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ S: 48287 Sawleaf 
S: Fremont, California 94539

S: USA



N: Tomas Cech

E: sleep_walker@suse.com

D: arm/palm treo support



N: Florent Chabaud

E: florent.chabaud@polytechnique.org

D: software suspend

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ if: 
          - allwinner,sun8i-a83t-display-engine

          - allwinner,sun8i-r40-display-engine

          - allwinner,sun9i-a80-display-engine

          - allwinner,sun20i-d1-display-engine

          - allwinner,sun50i-a64-display-engine



then:

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -2498,10 +2498,8 @@ F: drivers/power/reset/oxnas-restart.c 
N:	oxnas









ARM/PALM TREO SUPPORT









M:	Tomas Cech <sleep_walker@suse.com>









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









S:	Maintained









W:	http://hackndev.com









S:	Orphan









F:	arch/arm/mach-pxa/palmtreo.*

















ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT








@@ -17274,12 +17272,15 @@ N:	riscv







K:	riscv

















RISC-V/MICROCHIP POLARFIRE SOC SUPPORT









M:	Lewis Hanly <lewis.hanly@microchip.com>









M:	Conor Dooley <conor.dooley@microchip.com>









M:	Daire McNamara <daire.mcnamara@microchip.com>









L:	linux-riscv@lists.infradead.org









S:	Supported









F:	arch/riscv/boot/dts/microchip/









F:	drivers/char/hw_random/mpfs-rng.c









F:	drivers/clk/microchip/clk-mpfs.c









F:	drivers/mailbox/mailbox-mpfs.c









F:	drivers/pci/controller/pcie-microchip-host.c









F:	drivers/soc/microchip/









F:	include/soc/microchip/mpfs.h








































arch/arm/boot/dts/imx6qdl-ts7970.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -226,7 +226,7 @@







		reg = <0x28>;









		#gpio-cells = <2>;









		gpio-controller;









		ngpio = <32>;









		ngpios = <62>;









	};



















	sgtl5000: codec@a {
































arch/arm/boot/dts/imx6ull-colibri.dtsi



+7
−2






























Original line number
Diff line number
Diff line







@@ -166,7 +166,7 @@







	atmel_mxt_ts: touchscreen@4a {









		compatible = "atmel,maxtouch";









		pinctrl-names = "default";









		pinctrl-0 = <&pinctrl_atmel_conn>;









		pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;









		reg = <0x4a>;









		interrupt-parent = <&gpio5>;









		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;       /* SODIMM 107 / INT */








@@ -331,7 +331,6 @@







	pinctrl_atmel_conn: atmelconngrp {









		fsl,pins = <









			MX6UL_PAD_JTAG_MOD__GPIO1_IO10          0xb0a0  /* SODIMM 106 */









			MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04     0xb0a0	/* SODIMM 107 */









		>;









	};


















@@ -684,6 +683,12 @@







};



















&iomuxc_snvs {









	pinctrl_atmel_snvs_conn: atmelsnvsconngrp {









		fsl,pins = <









			MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04     0xb0a0	/* SODIMM 107 */









		>;









	};



















	pinctrl_snvs_gpio1: snvsgpio1grp {









		fsl,pins = <









			MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06	0x110a0	/* SODIMM 93 */