Commit 44866956 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A set of fixes that have trickled in over the last couple of weeks:

   - MAINTAINER update for Cavium/Marvell ThunderX2

   - stm32 tweaks to pinmux for Joystick/Camera, and RAM allocation for
     CAN interfaces

   - i.MX fixes for voltage regulator GPIO mappings, fixes voltage
     scaling issues

   - More i.MX fixes for various issues on i.MX eval boards: interrupt
     storm due to u-boot leaving pins in new states, fixing power button
     config, a couple of compatible-string corrections.

   - Powerdown and Suspend/Resume fixes for Allwinner A83-based tablets

   - A few documentation tweaks and a fix of a memory leak in the reset
     subsystem"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: update Cavium ThunderX2 maintainers
  ARM: dts: stm32: change joystick pinctrl definition on stm32mp157c-ev1
  ARM: dts: stm32: remove OV5640 pinctrl definition on stm32mp157c-ev1
  ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c
  ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157
  arm64: dts: zii-ultra: fix ARM regulator GPIO handle
  ARM: sunxi: Fix CPU powerdown on A83T
  ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend
  arm64: dts: imx8mn: fix compatible string for sdma
  arm64: dts: imx8mm: fix compatible string for sdma
  reset: fix reset_control_ops kerneldoc comment
  ARM: dts: imx6-logicpd: Re-enable SNVS power key
  soc: imx: gpc: fix initialiser format
  ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts
  arm64: dts: ls1028a: fix a compatible issue
  reset: fix reset_control_get_exclusive kerneldoc comment
  reset: fix reset_control_lookup kerneldoc comment
  reset: fix of_reset_control_get_count kerneldoc comment
  reset: fix of_reset_simple_xlate kerneldoc comment
  reset: Fix memory leak in reset_control_array_put()
parents dd892625 002d3c65

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com> 
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>

Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>

Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>

Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>

Jean Tourrilhes <jt@hpl.hp.com>

<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -3738,7 +3738,6 @@ F: drivers/crypto/cavium/cpt/ 














CAVIUM THUNDERX2 ARM64 SOC















M:	Robert Richter <rrichter@cavium.com>













M:	Jayachandran C <jnair@caviumnetworks.com>















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















S:	Maintained















F:	arch/arm64/boot/dts/cavium/thunder2-99xx*

































arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi



+4
−0






























Original line number
Diff line number
Diff line








@@ -328,6 +328,10 @@













	pinctrl-0 = <&pinctrl_pwm3>;















};





























&snvs_pwrkey {













	status = "okay";













};





























&ssi2 {















	status = "okay";















};

































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



+8
−0






























Original line number
Diff line number
Diff line








@@ -230,6 +230,8 @@













			accelerometer@1c {















				compatible = "fsl,mma8451";















				reg = <0x1c>;













				pinctrl-names = "default";













				pinctrl-0 = <&pinctrl_mma8451_int>;















				interrupt-parent = <&gpio6>;















				interrupts = <31 IRQ_TYPE_LEVEL_LOW>;















			};










@@ -628,6 +630,12 @@













			>;















		};





























		pinctrl_mma8451_int: mma8451intgrp {













			fsl,pins = <













				MX6QDL_PAD_EIM_BCLK__GPIO6_IO31		0xb0b1













			>;













		};





























		pinctrl_pwm3: pwm1grp {















			fsl,pins = <















				MX6QDL_PAD_SD4_DAT1__PWM3_OUT		0x1b0b1

































arch/arm/boot/dts/stm32mp157c-ev1.dts



+2
−11






























Original line number
Diff line number
Diff line








@@ -183,14 +183,12 @@





























	ov5640: camera@3c {















		compatible = "ovti,ov5640";













		pinctrl-names = "default";













		pinctrl-0 = <&ov5640_pins>;















		reg = <0x3c>;















		clocks = <&clk_ext_camera>;















		clock-names = "xclk";















		DOVDD-supply = <&v2v8>;













		powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>;













		reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>;













		powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>;













		reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>;















		rotation = <180>;















		status = "okay";


























@@ -223,15 +221,8 @@





























			joystick_pins: joystick {















				pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";













				drive-push-pull;















				bias-pull-down;















			};



























			ov5640_pins: camera {













				pins = "agpio2", "agpio3"; /* stmfx pins 18 & 19 */













				drive-push-pull;













				output-low;













			};















		};















	};















};









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE