Commit 65b55d4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This is a fairly large set of bug fixes on top of -rc1, as most of
  them were ready but didn't quite make it into the last-minute pull
  requests for the merge window.

  Allwinner:
   - fix for incorrect CPU overtemperature limit

  Amlogic:
   - multiple smaller DT bugfixes, and missing device nodes

  Marvell EBU:
   - add missing aliases for ethernet switch ports on espressobin board

  Marvell MMP:
   - DTC warning fix
   - bugfix for camera interface power-down

  NXP i.MX:
   - re-enable the GPIO driver on all defconfigs

  ST STM32MP1:
   - fix random crashes from incorrect voltage settings

  Synaptics Berlin:
   - enable the correct hardware timer driver

  Texas Instruments K2G:
   - fix a boot regression in the power domain code

  TEE drivers:
   - fix regression in TEE "login" method

  SCMI drivers:
   - multiple code fixes for corner cases in newly added code

  MAINTAINERS file:
   - move Kukjin Kim and Sangbeom Kim to credits (used to work on
     Samsung Exynos)
   - Masahiro Yamada is stepping down as Uniphier maintainer

  I did not include a series of patches that work around a regression
  caused by a bugfix in an ethernet phy driver that resulted in an
  inadvertent DT binding change. This is still under discussion"

* tag 'arm-soc-fixes-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (31 commits)
  soc: ti: ti_sci_pm_domains: check for proper args count in xlate
  ARM: dts: stm32: Describe Vin power supply on stm32mp157c-edx board
  ARM: dts: stm32: Describe Vin power supply on stm32mp15xx-dkx board
  ARM: multi_v5_defconfig: Select CONFIG_GPIO_MXC
  ARM: imx_v4_v5_defconfig: Select CONFIG_GPIO_MXC
  ARM: dts: mmp2-olpc-xo-1-75: Use plural form of "-gpios"
  ARM: dts: mmp3: Add power domain for the camera
  arm64: berlin: Select DW_APB_TIMER_OF
  dt-bindings: sram: sunxi-sram: add V3s compatible string
  MAINTAINERS: Move Sangbeom Kim to credits
  MAINTAINERS: Move Kukjin Kim to credits
  MAINTAINERS: step down as maintainer of UniPhier SoCs and Denali driver
  ARM: multi_v7_defconfig: Build in CONFIG_GPIO_MXC by default
  ARM: imx_v6_v7_defconfig: Build in CONFIG_GPIO_MXC by default
  arm64: defconfig: Build in CONFIG_GPIO_MXC by default
  arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm
  ARM: dts: meson8: remove two invalid interrupt lines from the GPU node
  arm64: dts: amlogic: add missing ethernet reset ID
  firmware: arm_scmi: Fix duplicate workqueue name
  firmware: arm_scmi: Fix locking in notifications
  ...
parents d2c4d6e8 3d696f42

CREDITS

+9 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,15 @@ S: 660 Harvard Ave. #7 
S: Santa Clara, CA 95051

S: USA



N: Kukjin Kim

E: kgene@kernel.org

D: Samsung S3C, S5P and Exynos ARM architectures



N: Sangbeom Kim

E: sbkim73@samsung.com

D: Samsung SoC Audio (ASoC) drivers

D: Samsung PMIC (RTC, regulators, MFD) drivers



N: Russell King

E: rmk@arm.linux.org.uk

D: Linux/arm integrator, maintainer & hacker

Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ properties: 
          - const: allwinner,sun4i-a10-system-control

      - const: allwinner,sun8i-a23-system-control

      - const: allwinner,sun8i-h3-system-control

      - items:

          - const: allwinner,sun8i-v3s-system-control

          - const: allwinner,sun8i-h3-system-control

      - items:

          - const: allwinner,sun8i-r40-system-control

          - const: allwinner,sun4i-a10-system-control

MAINTAINERS

+2 −9
Original line number Diff line number Diff line
@@ -2375,7 +2375,6 @@ F: sound/soc/rockchip/ 
N:	rockchip















ARM/SAMSUNG EXYNOS ARM ARCHITECTURES













M:	Kukjin Kim <kgene@kernel.org>















M:	Krzysztof Kozlowski <krzk@kernel.org>















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















L:	linux-samsung-soc@vger.kernel.org










@@ -2642,10 +2641,8 @@ F:	drivers/pinctrl/visconti/













N:	visconti





























ARM/UNIPHIER ARCHITECTURE













M:	Masahiro Yamada <yamada.masahiro@socionext.com>















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













S:	Maintained













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git













S:	Orphan















F:	Documentation/devicetree/bindings/arm/socionext/uniphier.yaml















F:	Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml















F:	Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml










@@ -5006,9 +5003,8 @@ T:	git git://linuxtv.org/media_tree.git













F:	drivers/media/platform/sti/delta





























DENALI NAND DRIVER













M:	Masahiro Yamada <yamada.masahiro@socionext.com>















L:	linux-mtd@lists.infradead.org













S:	Supported













S:	Orphan















F:	drivers/mtd/nand/raw/denali*





























DESIGNWARE EDMA CORE IP DRIVER










@@ -15372,7 +15368,6 @@ F:	security/safesetid/



























SAMSUNG AUDIO (ASoC) DRIVERS















M:	Krzysztof Kozlowski <krzk@kernel.org>













M:	Sangbeom Kim <sbkim73@samsung.com>















M:	Sylwester Nawrocki <s.nawrocki@samsung.com>















L:	alsa-devel@alsa-project.org (moderated for non-subscribers)















S:	Supported










@@ -15407,7 +15402,6 @@ S:	Maintained













F:	drivers/platform/x86/samsung-laptop.c





























SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS













M:	Sangbeom Kim <sbkim73@samsung.com>















M:	Krzysztof Kozlowski <krzk@kernel.org>















M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>















L:	linux-kernel@vger.kernel.org










@@ -15489,7 +15483,6 @@ F:	include/linux/clk/samsung.h













F:	include/linux/platform_data/clk-s3c2410.h





























SAMSUNG SPI DRIVERS













M:	Kukjin Kim <kgene@kernel.org>















M:	Krzysztof Kozlowski <krzk@kernel.org>















M:	Andi Shyti <andi@etezian.org>















L:	linux-spi@vger.kernel.org

































arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts



+2
−2






























Original line number
Diff line number
Diff line








@@ -227,12 +227,12 @@













	/delete-property/ #size-cells;















	spi-slave;















	status = "okay";













	ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;













	ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;































	slave {















		compatible = "olpc,xo1.75-ec";















		spi-cpha;













		cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;













		cmd-gpios = <&gpio 155 GPIO_ACTIVE_HIGH>;















	};















};

















































arch/arm/boot/dts/mmp3.dtsi



+2
−0






























Original line number
Diff line number
Diff line








@@ -296,6 +296,7 @@













				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;















				clocks = <&soc_clocks MMP2_CLK_CCIC0>;















				clock-names = "axi";













				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;















				#clock-cells = <0>;















				clock-output-names = "mclk";















				status = "disabled";









@@ -307,6 +308,7 @@













				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;















				clocks = <&soc_clocks MMP2_CLK_CCIC1>;















				clock-names = "axi";













				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;















				#clock-cells = <0>;















				clock-output-names = "mclk";















				status = "disabled";









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE