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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "One last set of small fixes for the soc tree:

   - Incorrect ethernet phy settings found on i.mx and allwinner
     platforms

   - a revert for a Qualcomm DT change that caused a boot regression

   - four patches for incorrect settings in i.MX DT files

   - new MAINTAINER file entries for dhcom boards

   - a Kconfig fix for a reset driver that became unselectable

   - three more code changes for bugs in reset drivers"

* tag 'arm-soc-fixes-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: Add maintainers for DHCOM i.MX6 and DHCOM/DHCOR STM32MP1
  Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"
  arm64: dts: imx8mm-kontron: Fix connection type for VSC8531 RGMII PHY
  arm64: dts: imx8mm-kontron: Fix CAN SPI clock frequency
  arm64: dts: imx8mm-kontron: Fix polarity of reg_rst_eth2
  arm64: dts: imx8mm-kontron: Set lower limit of VDD_SNVS to 800 mV
  arm64: dts: imx8mm-kontron: Make sure SOC and DRAM supply voltages are correct
  reset: socfpga: add empty driver allowing consumers to probe
  reset: tegra-bpmp: Handle errors in BPMP response
  reset: pistachio: Re-enable driver selection
  reset: brcmstb-rescal: fix incorrect polarity of status bit
  ARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-mode
  arm64: dts: allwinner: h5: NanoPI Neo 2: Fix ethernet node
parents 3906fe9b 05d5da3c

MAINTAINERS

+13 −0
Original line number Original line Diff line number Diff line
@@ -5458,6 +5458,19 @@ F: include/net/devlink.h 
F:	include/uapi/linux/devlink.h

F:	include/uapi/linux/devlink.h

F:	net/core/devlink.c

F:	net/core/devlink.c













DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT










M:	Christoph Niedermaier <cniedermaier@dh-electronics.com>










L:	kernel@dh-electronics.com










S:	Maintained










F:	arch/arm/boot/dts/imx6*-dhcom-*



















DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT










M:	Marek Vasut <marex@denx.de>










L:	kernel@dh-electronics.com










S:	Maintained










F:	arch/arm/boot/dts/stm32mp1*-dhcom-*










F:	arch/arm/boot/dts/stm32mp1*-dhcor-*

















DIALOG SEMICONDUCTOR DRIVERS




DIALOG SEMICONDUCTOR DRIVERS








M:	Support Opensource <support.opensource@diasemi.com>




M:	Support Opensource <support.opensource@diasemi.com>








S:	Supported




S:	Supported
































arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts



+1
−1






























Original line number
Original line
Diff line number
Diff line







@@ -112,7 +112,7 @@






	pinctrl-names = "default";




	pinctrl-names = "default";








	pinctrl-0 = <&gmac_rgmii_pins>;




	pinctrl-0 = <&gmac_rgmii_pins>;








	phy-handle = <&phy1>;




	phy-handle = <&phy1>;








	phy-mode = "rgmii";




	phy-mode = "rgmii-id";








	status = "okay";




	status = "okay";








};




};














































arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts



+1
−1






























Original line number
Original line
Diff line number
Diff line







@@ -75,7 +75,7 @@






	pinctrl-0 = <&emac_rgmii_pins>;




	pinctrl-0 = <&emac_rgmii_pins>;








	phy-supply = <&reg_gmac_3v3>;




	phy-supply = <&reg_gmac_3v3>;








	phy-handle = <&ext_rgmii_phy>;




	phy-handle = <&ext_rgmii_phy>;








	phy-mode = "rgmii";




	phy-mode = "rgmii-id";








	status = "okay";




	status = "okay";








};




};














































arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts



+5
−3






























Original line number
Original line
Diff line number
Diff line







@@ -70,7 +70,9 @@






		regulator-name = "rst-usb-eth2";




		regulator-name = "rst-usb-eth2";








		pinctrl-names = "default";




		pinctrl-names = "default";








		pinctrl-0 = <&pinctrl_usb_eth2>;




		pinctrl-0 = <&pinctrl_usb_eth2>;








		gpio = <&gpio3 2 GPIO_ACTIVE_LOW>;




		gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>;










		enable-active-high;










		regulator-always-on;








	};




	};






















	reg_vdd_5v: regulator-5v {




	reg_vdd_5v: regulator-5v {








@@ -95,7 +97,7 @@






		clocks = <&osc_can>;




		clocks = <&osc_can>;








		interrupt-parent = <&gpio4>;




		interrupt-parent = <&gpio4>;








		interrupts = <28 IRQ_TYPE_EDGE_FALLING>;




		interrupts = <28 IRQ_TYPE_EDGE_FALLING>;








		spi-max-frequency = <100000>;




		spi-max-frequency = <10000000>;








		vdd-supply = <&reg_vdd_3v3>;




		vdd-supply = <&reg_vdd_3v3>;








		xceiver-supply = <&reg_vdd_5v>;




		xceiver-supply = <&reg_vdd_5v>;








	};




	};








@@ -111,7 +113,7 @@






&fec1 {




&fec1 {








	pinctrl-names = "default";




	pinctrl-names = "default";








	pinctrl-0 = <&pinctrl_enet>;




	pinctrl-0 = <&pinctrl_enet>;








	phy-connection-type = "rgmii";




	phy-connection-type = "rgmii-rxid";








	phy-handle = <&ethphy>;




	phy-handle = <&ethphy>;








	status = "okay";




	status = "okay";














































arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi



+5
−3






























Original line number
Original line
Diff line number
Diff line







@@ -91,10 +91,12 @@






			reg_vdd_soc: BUCK1 {




			reg_vdd_soc: BUCK1 {








				regulator-name = "buck1";




				regulator-name = "buck1";








				regulator-min-microvolt = <800000>;




				regulator-min-microvolt = <800000>;








				regulator-max-microvolt = <900000>;




				regulator-max-microvolt = <850000>;








				regulator-boot-on;




				regulator-boot-on;








				regulator-always-on;




				regulator-always-on;








				regulator-ramp-delay = <3125>;




				regulator-ramp-delay = <3125>;










				nxp,dvs-run-voltage = <850000>;










				nxp,dvs-standby-voltage = <800000>;








			};




			};






















			reg_vdd_arm: BUCK2 {




			reg_vdd_arm: BUCK2 {








@@ -111,7 +113,7 @@






			reg_vdd_dram: BUCK3 {




			reg_vdd_dram: BUCK3 {








				regulator-name = "buck3";




				regulator-name = "buck3";








				regulator-min-microvolt = <850000>;




				regulator-min-microvolt = <850000>;








				regulator-max-microvolt = <900000>;




				regulator-max-microvolt = <950000>;








				regulator-boot-on;




				regulator-boot-on;








				regulator-always-on;




				regulator-always-on;








			};




			};








@@ -150,7 +152,7 @@




















			reg_vdd_snvs: LDO2 {




			reg_vdd_snvs: LDO2 {








				regulator-name = "ldo2";




				regulator-name = "ldo2";








				regulator-min-microvolt = <850000>;




				regulator-min-microvolt = <800000>;








				regulator-max-microvolt = <900000>;




				regulator-max-microvolt = <900000>;








				regulator-boot-on;




				regulator-boot-on;








				regulator-always-on;




				regulator-always-on;