Commit 56bf7334 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SoC fixes from Arnd Bergmann:
 "There are seven oneline patches that each address a distinct problem
  on the NXP i.MX platform, mostly the popular i.MX8M variant.

  The only other two fixes are for error handling on the psci firmware
  driver and SD card support on the milkv duo riscv board"

* tag 'arm-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  firmware: psci: Fix return value from psci_system_suspend()
  riscv: dts: sophgo: disable write-protection for milkv duo
  arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc
  arm64: dts: freescale: imx8mm-verdin: enable hysteresis on slow input pin
  arm64: dts: imx93-11x11-evk: Remove the 'no-sdio' property
  arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix BT shutdown GPIO
  arm: dts: imx53-qsb-hdmi: Disable panel instead of deleting node
  arm64: dts: imx8mp: Fix TC9595 input clock on DH i.MX8M Plus DHCOM SoM
  arm64: dts: freescale: imx8mm-verdin: Fix GPU speed
parents d4ba3313 e7c3696d

arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ led-user { 
		};

	};



	panel {

	panel_dpi: panel {

		compatible = "sii,43wvf1g";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_display_power>;

arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso

+4 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
/plugin/;



&{/} {

	/delete-node/ panel;



	hdmi: connector-hdmi {

		compatible = "hdmi-connector";

		label = "hdmi";
@@ -82,6 +80,10 @@ sii9022_out: endpoint { 
	};

};



&panel_dpi {

	status = "disabled";

};



&tve {

	status = "disabled";

};

arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <dt-bindings/phy/phy-imx8-pcie.h>

#include <dt-bindings/pwm/pwm.h>

#include "imx8mm.dtsi"

#include "imx8mm-overdrive.dtsi"



/ {

	chosen {
@@ -935,7 +936,7 @@ pinctrl_gpio8: gpio8grp { 
	/* Verdin GPIO_9_DSI (pulled-up as active-low) */

	pinctrl_gpio_9_dsi: gpio9dsigrp {

		fsl,pins =

			<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15		0x146>;	/* SODIMM 17 */

			<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15		0x1c6>;	/* SODIMM 17 */

	};



	/* Verdin GPIO_10_DSI (pulled-up as active-low) */

arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ tc_bridge: bridge@f { 
				  <&clk IMX8MP_CLK_CLKOUT2>,

				  <&clk IMX8MP_AUDIO_PLL2_OUT>;

		assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;

		assigned-clock-rates = <13000000>, <13000000>, <156000000>;

		assigned-clock-rates = <13000000>, <13000000>, <208000000>;

		reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;

		status = "disabled";

arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ &uart3 { 


	bluetooth {

		compatible = "brcm,bcm4330-bt";

		shutdown-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;

	};

};