Commit 575966e0 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:
 "I've been sitting on these longer than I meant, so the patch count is
  a bit higher than ideal for this part of the release. There's also
  some reverts of double-applied patches that brings the diffstat up a
  bit.

  With that said, the biggest changes are:

   - Revert of duplicate i2c device addition on two Aspeed (BMC)
     Devicetrees.

   - Move of two device nodes that got applied to the wrong part of the
     tree on ASpeed G6.

   - Regulator fix for Beaglebone X15 (adding 12/5V supplies)

   - Use interrupts for keys on Amlogic SM1 to avoid missed polls

  In addition to that, there is a collection of smaller DT fixes:

   - Power supply assignment fixes for i.MX6

   - Fix of interrupt line for magnetometer on i.MX8 Librem5 devkit

   - Build fixlets (selects) for davinci/omap2+

   - More interrupt number fixes for Stratix10, Amlogic SM1, etc.

   - ... and more similar fixes across different platforms

  And some non-DT stuff:

   - optee fix to register multiple shared pages properly

   - Clock calculation fixes for MMP3

   - Clock fixes for OMAP as well"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits)
  MAINTAINERS: Add myself as the co-maintainer for Actions Semi platforms
  ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support
  ARM: dts: imx6sll-evk: Remove incorrect power supply assignment
  ARM: dts: imx6sl-evk: Remove incorrect power supply assignment
  ARM: dts: imx6sx-sdb: Remove incorrect power supply assignment
  ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment
  ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL
  ARM: omap2plus: select RESET_CONTROLLER
  ARM: davinci: select CONFIG_RESET_CONTROLLER
  ARM: dts: aspeed: rainier: Fix fan fault and presence
  ARM: dts: aspeed: rainier: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
  ARM: dts: aspeed: tacoma: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Fix fsi master node
  ARM: dts: aspeed-g6: Fix FSI master location
  ARM: dts: mmp3: Fix the TWSI ranges
  clk: mmp2: Fix the order of timer mux parents
  ARM: mmp: do not divide the clock rate
  arm64: dts: rockchip: Fix IR on Beelink A1
  optee: Fix multi page dynamic shm pool alloc
  ...
parents ef64753c 70db729f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git 














ARM/ACTIONS SEMI ARCHITECTURE















M:	Andreas Färber <afaerber@suse.de>













R:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>













M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>















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















S:	Maintained















N:	owl

































arch/arm/boot/dts/am571x-idk.dts



+1
−5






























Original line number
Diff line number
Diff line








@@ -167,11 +167,7 @@





























&pcie1_rc {















	status = "okay";













	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;













};



























&pcie1_ep {













	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;













	gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;















};































&mmc1 {

































arch/arm/boot/dts/am572x-idk-common.dtsi



+0
−4






























Original line number
Diff line number
Diff line








@@ -147,10 +147,6 @@













	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;















};





























&pcie1_ep {













	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;













};





























&mailbox5 {















	status = "okay";















	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {

































arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi



+21
−4






























Original line number
Diff line number
Diff line








@@ -29,6 +29,27 @@













		reg = <0x0 0x80000000 0x0 0x80000000>;















	};





























	main_12v0: fixedregulator-main_12v0 {













		/* main supply */













		compatible = "regulator-fixed";













		regulator-name = "main_12v0";













		regulator-min-microvolt = <12000000>;













		regulator-max-microvolt = <12000000>;













		regulator-always-on;













		regulator-boot-on;













	};



























	evm_5v0: fixedregulator-evm_5v0 {













		/* Output of TPS54531D */













		compatible = "regulator-fixed";













		regulator-name = "evm_5v0";













		regulator-min-microvolt = <5000000>;













		regulator-max-microvolt = <5000000>;













		vin-supply = <&main_12v0>;













		regulator-always-on;













		regulator-boot-on;













	};





























	vdd_3v3: fixedregulator-vdd_3v3 {















		compatible = "regulator-fixed";















		regulator-name = "vdd_3v3";










@@ -547,10 +568,6 @@













	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;















};





























&pcie1_ep {













	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;













};





























&mcasp3 {















	#sound-dai-cells = <0>;















	assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;

































arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts



+2
−367






























Original line number
Diff line number
Diff line








@@ -258,9 +258,9 @@













		};















	};





























	pca0: pca9552@60 {













	pca0: pca9552@61 {















		compatible = "nxp,pca9552";













		reg = <0x60>;













		reg = <0x61>;















		#address-cells = <1>;















		#size-cells = <0>;


























@@ -519,371 +519,6 @@













	status = "okay";















};





























&i2c13 {













	status = "okay";













};



























&i2c14 {













	status = "okay";













};



























&i2c15 {













	status = "okay";













};



























&i2c0 {













	status = "okay";













};



























&i2c1 {













	status = "okay";













};



























&i2c2 {













	status = "okay";













};



























&i2c3 {













	status = "okay";



























	power-supply@68 {













		compatible = "ibm,cffps2";













		reg = <0x68>;













	};



























	power-supply@69 {













		compatible = "ibm,cffps2";













		reg = <0x69>;













	};



























	power-supply@6a {













		compatible = "ibm,cffps2";













		reg = <0x6a>;













	};



























	power-supply@6b {













		compatible = "ibm,cffps2";













		reg = <0x6b>;













	};













};



























&i2c4 {













	status = "okay";



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	tmp275@49 {













		compatible = "ti,tmp275";













		reg = <0x49>;













	};



























	tmp275@4a {













		compatible = "ti,tmp275";













		reg = <0x4a>;













	};













};



























&i2c5 {













	status = "okay";



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	tmp275@49 {













		compatible = "ti,tmp275";













		reg = <0x49>;













	};













};



























&i2c6 {













	status = "okay";



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	tmp275@4a {













		compatible = "ti,tmp275";













		reg = <0x4a>;













	};



























	tmp275@4b {













		compatible = "ti,tmp275";













		reg = <0x4b>;













	};













};



























&i2c7 {













	status = "okay";



























	si7021-a20@20 {













		compatible = "silabs,si7020";













		reg = <0x20>;













	};



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	max31785@52 {













		compatible = "maxim,max31785a";













		reg = <0x52>;













		#address-cells = <1>;













		#size-cells = <0>;



























		fan@0 {













			compatible = "pmbus-fan";













			reg = <0>;













			tach-pulses = <2>;













		};



























		fan@1 {













			compatible = "pmbus-fan";













			reg = <1>;













			tach-pulses = <2>;













		};



























		fan@2 {













			compatible = "pmbus-fan";













			reg = <2>;













			tach-pulses = <2>;













		};



























		fan@3 {













			compatible = "pmbus-fan";













			reg = <3>;













			tach-pulses = <2>;













		};













	};



























	pca0: pca9552@60 {













		compatible = "nxp,pca9552";













		reg = <0x60>;













		#address-cells = <1>;













		#size-cells = <0>;



























		gpio-controller;













		#gpio-cells = <2>;



























		gpio@0 {













			reg = <0>;













		};



























		gpio@1 {













			reg = <1>;













		};



























		gpio@2 {













			reg = <2>;













		};



























		gpio@3 {













			reg = <3>;













		};



























		gpio@4 {













			reg = <4>;













		};



























		gpio@5 {













			reg = <5>;













		};



























		gpio@6 {













			reg = <6>;













		};



























		gpio@7 {













			reg = <7>;













		};



























		gpio@8 {













			reg = <8>;













		};



























		gpio@9 {













			reg = <9>;













		};



























		gpio@10 {













			reg = <10>;













		};



























		gpio@11 {













			reg = <11>;













		};



























		gpio@12 {













			reg = <12>;













		};



























		gpio@13 {













			reg = <13>;













		};



























		gpio@14 {













			reg = <14>;













		};



























		gpio@15 {













			reg = <15>;













		};













	};



























	dps: dps310@76 {













		compatible = "infineon,dps310";













		reg = <0x76>;













		#io-channel-cells = <0>;













	};













};



























&i2c8 {













	status = "okay";



























	ucd90320@b {













		compatible = "ti,ucd90160";













		reg = <0x0b>;













	};



























	ucd90320@c {













		compatible = "ti,ucd90160";













		reg = <0x0c>;













	};



























	ucd90320@11 {













		compatible = "ti,ucd90160";













		reg = <0x11>;













	};



























	rtc@32 {













		compatible = "epson,rx8900";













		reg = <0x32>;













	};



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	tmp275@4a {













		compatible = "ti,tmp275";













		reg = <0x4a>;













	};













};



























&i2c9 {













	status = "okay";



























	ir35221@42 {













		compatible = "infineon,ir35221";













		reg = <0x42>;













	};



























	ir35221@43 {













		compatible = "infineon,ir35221";













		reg = <0x43>;













	};



























	ir35221@44 {













		compatible = "infineon,ir35221";













		reg = <0x44>;













	};



























	tmp423a@4c {













		compatible = "ti,tmp423";













		reg = <0x4c>;













	};



























	tmp423b@4d {













		compatible = "ti,tmp423";













		reg = <0x4d>;













	};



























	ir35221@72 {













		compatible = "infineon,ir35221";













		reg = <0x72>;













	};



























	ir35221@73 {













		compatible = "infineon,ir35221";













		reg = <0x73>;













	};



























	ir35221@74 {













		compatible = "infineon,ir35221";













		reg = <0x74>;













	};













};



























&i2c10 {













	status = "okay";



























	ir35221@42 {













		compatible = "infineon,ir35221";













		reg = <0x42>;













	};



























	ir35221@43 {













		compatible = "infineon,ir35221";













		reg = <0x43>;













	};



























	ir35221@44 {













		compatible = "infineon,ir35221";













		reg = <0x44>;













	};



























	tmp423a@4c {













		compatible = "ti,tmp423";













		reg = <0x4c>;













	};



























	tmp423b@4d {













		compatible = "ti,tmp423";













		reg = <0x4d>;













	};



























	ir35221@72 {













		compatible = "infineon,ir35221";













		reg = <0x72>;













	};



























	ir35221@73 {













		compatible = "infineon,ir35221";













		reg = <0x73>;













	};



























	ir35221@74 {













		compatible = "infineon,ir35221";













		reg = <0x74>;













	};













};



























&i2c11 {













	status = "okay";



























	tmp275@48 {













		compatible = "ti,tmp275";













		reg = <0x48>;













	};



























	tmp275@49 {













		compatible = "ti,tmp275";













		reg = <0x49>;













	};













};



























&i2c12 {













	status = "okay";













};





























&i2c13 {















	status = "okay";

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE