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

Merge tag 'imx-fixes-5.15' of... 

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

i.MX fixes for 5.15:

- Revert cc8870bf to fix the regression on i.MX6 that suspend
  support becomes broken.
- Add `qca,clk-out-frequency` property to fix Ethernet support on
  imx6qdl-pico board.
- Re-enable FB support in imx_v6_v7_defconfig.  It gets lost due to
  f611b1e7 ("drm: Avoid circular dependencies for CONFIG_FB").
- Fix LP5562 LED support on imx6dl-yapp4 board.
- Add missing pinctrl-names for panel on M53Menlo board.
- Fix USB host power regulator polarity on M53Menlo board.

* tag 'imx-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable fb
  ARM: dts: imx6qdl-pico: Fix Ethernet support
  ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo
  ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo
  Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
  ARM: dts: imx6dl-yapp4: Fix lp5562 LED driver probe

Link: https://lore.kernel.org/r/20210923063356.GK13480@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a6949059 c5446748

arch/arm/boot/dts/imx53-m53menlo.dts

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
	panel {

		compatible = "edt,etm0700g0dh6";

		pinctrl-0 = <&pinctrl_display_gpio>;

		pinctrl-names = "default";

		enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;



		port {
@@ -76,8 +77,7 @@ 
		regulator-name = "vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		gpio = <&gpio1 2 0>;

	};

};

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

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

#include <dt-bindings/leds/common.h>

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



/ {
@@ -277,6 +278,7 @@ 
			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			reg = <0>;

			color = <LED_COLOR_ID_RED>;

		};



		chan@1 {
@@ -284,6 +286,7 @@ 
			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			reg = <1>;

			color = <LED_COLOR_ID_GREEN>;

		};



		chan@2 {
@@ -291,6 +294,7 @@ 
			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			reg = <2>;

			color = <LED_COLOR_ID_BLUE>;

		};



		chan@3 {
@@ -298,6 +302,7 @@ 
			led-cur = /bits/ 8 <0x0>;

			max-cur = /bits/ 8 <0x0>;

			reg = <3>;

			color = <LED_COLOR_ID_WHITE>;

		};

	};

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

+11 −0
Original line number Diff line number Diff line
@@ -176,7 +176,18 @@ 
	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;

	phy-handle = <&phy>;

	status = "okay";



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;



		phy: ethernet-phy@1 {

			reg = <1>;

			qca,clk-out-frequency = <125000000>;

		};

	};

};



&hdmi {

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ CONFIG_DRM_IMX_LDB=y 
CONFIG_DRM_IMX_HDMI=y

CONFIG_DRM_ETNAVIV=y

CONFIG_DRM_MXSFB=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

arch/arm/mach-imx/mach-imx6q.c

+3 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void) 
				imx_get_soc_revision());



	imx6q_enet_phy_init();



	of_platform_default_populate(NULL, NULL, NULL);



	imx_anatop_init();

	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();

	imx6q_1588_init();