Unverified Commit a425efcb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.3-2' of... 

Merge tag 'imx-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.3, 2nd round:

- Fix 'reg' address length for i.MX8MP LCDIF2 device.
- A couple of changes from Fabio Estevam to fix DTC warnings caused
  unnecessary address/size cells.
- Re-enable PCI driver support in imx_v6_v7_defconfig.
- Fix PMIC clock source property for imx8mm-evk board.
- A couple of fixes from Peng Fan to correct off-on delay property for
  i.MX8 Verdin boards.

* tag 'imx-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI
  ARM: dts: imx6ull-colibri: Remove unnecessary #address-cells/#size-cells
  ARM: dts: imx7d-remarkable2: Remove unnecessary #address-cells/#size-cells
  arm64: dts: imx8mp-verdin: correct off-on-delay
  arm64: dts: imx8mm-verdin: correct off-on-delay
  arm64: dts: imx8mm-evk: correct pmic clock source
  arm64: dts: imx8mp: fix address length for LCDIF2

Link: https://lore.kernel.org/r/20230406021602.GP11367@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3c40af4 86d5b27b

arch/arm/boot/dts/imx6ull-colibri.dtsi

+3 −9
Original line number Diff line number Diff line
@@ -33,18 +33,12 @@ 
		self-powered;

		type = "micro";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

		port {

			usb_dr_connector: endpoint {

				remote-endpoint = <&usb1_drd_sw>;

			};

		};

	};

	};



	gpio-keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/imx7d-remarkable2.dts

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ 
		reg = <0x62>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_epdpmic>;

		#address-cells = <1>;

		#size-cells = <0>;

		#thermal-sensor-cells = <0>;

		epd-pwr-good-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y 
CONFIG_RFKILL_INPUT=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_IMX6=y

CONFIG_PCI_IMX6_HOST=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

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

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 
		rohm,reset-snvs-powered;



		#clock-cells = <0>;

		clocks = <&osc_32k 0>;

		clocks = <&osc_32k>;

		clock-output-names = "clk-32k-out";



		regulators {

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

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */

		off-on-delay = <500000>;

		off-on-delay-us = <500000>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_reg_eth>;

		regulator-always-on;
@@ -139,7 +139,7 @@ 
		enable-active-high;

		/* Verdin SD_1_PWR_EN (SODIMM 76) */

		gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;

		off-on-delay = <100000>;

		off-on-delay-us = <100000>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;

		regulator-max-microvolt = <3300000>;