Merge tag 'arm-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into master (fb896c91) · Commits · 戴 / test

Pull ARM SoC DT fixes from Arnd Bergmann: "These are the latest device tree fixes for Arm SoCs: - TI Keystone2 ethernet regressed after a driver change broke with incorrect phy-mode in a board's DT source. - A similar fix is needed for two i.MX boards that were missed in an earlier bugfix. - DT change for Armada 38x allowing to add the register needed to fix NETA lockup when repeatedly switching speed. - One fix on imx6qdl-icore pin muxing to get USB OTG_ID and SD card detect work correctly. - Two fixes for the Allwinner SoCs, one to relax the CMA allocation ranges that were failing on older SoCs and one to fix Cedrus on the H6" * tag 'arm-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2 ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2 arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage ARM: dts sunxi: Relax a bit the CMA pool allocation range

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,9 @@ properties:
		$ref: /schemas/types.yaml#/definitions/phandle-array
		description: Phandle to the device SRAM

		iommus:
		maxItems: 1

		memory-region:
		description:
		CMA pool to use for buffers allocation instead of the default

arch/arm/boot/dts/armada-38x.dtsi

+2 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,8 @@

		comphy: phy@18300 {
		compatible = "marvell,armada-380-comphy";
		reg = <0x18300 0x100>;
		reg-names = "comphy", "conf";
		reg = <0x18300 0x100>, <0x18460 4>;
		#address-cells = <1>;
		#size-cells = <0>;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,7 @@

		pinctrl_usbotg: usbotggrp {
		fsl,pins = <
		MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
		MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
		>;
		};

		@@ -409,6 +409,7 @@
		MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
		MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
		MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
		MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x1b0b0
		>;
		};

arch/arm/boot/dts/imx6sx-sabreauto.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		&fec2 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_enet2>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		phy-handle = <&ethphy0>;
		fsl,magic-packet;
		status = "okay";

arch/arm/boot/dts/imx6sx-sdb.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@
		&fec2 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_enet2>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		phy-handle = <&ethphy2>;
		status = "okay";
		};

Admin message