Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a020e2 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX fixes for 4.19:
 - i.MX display folks decided to switch MXS display driver from legacy
   FB to DRM during 4.19 merge window.  It leads to a fallout on some
   Freescale/NXP development boards with Seiko 43WVF1G panel, because
   this DRM panel driver is not enabled in i.MX defconfig.  Here is
   a series from Fabio to convert i.MX23/28 EVK DT to Seiko 43WVF1G
   panel bindings and enable the panel driver in i.MX defconfig, so that
   users can still get functional LCD on these boards by default.
 - A fix from Leonard to revert incorrect legacy PCI irq mapping in
   i.MX7 device tree, that was caused by document errors.

* tag 'imx-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx_v6_v7_defconfig: Select CONFIG_DRM_PANEL_SEIKO_43WVF1G
  ARM: mxs_defconfig: Select CONFIG_DRM_PANEL_SEIKO_43WVF1G
  ARM: dts: imx23-evk: Convert to the new display bindings
  ARM: dts: imx23-evk: Move regulators outside simple-bus
  ARM: dts: imx28-evk: Convert to the new display bindings
  ARM: dts: imx28-evk: Move regulators outside simple-bus
  Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping"

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5b394b2d b9543a2e

arch/arm/boot/dts/imx23-evk.dts

+41 −49
Original line number Diff line number Diff line
@@ -13,6 +13,43 @@ 
		reg = <0x40000000 0x08000000>;

	};



	reg_vddio_sd0: regulator-vddio-sd0 {

		compatible = "regulator-fixed";

		regulator-name = "vddio-sd0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio1 29 0>;

	};



	reg_lcd_3v3: regulator-lcd-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "lcd-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio1 18 0>;

		enable-active-high;

	};



	reg_lcd_5v: regulator-lcd-5v {

		compatible = "regulator-fixed";

		regulator-name = "lcd-5v";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	panel {

		compatible = "sii,43wvf1g";

		backlight = <&backlight_display>;

		dvdd-supply = <&reg_lcd_3v3>;

		avdd-supply = <&reg_lcd_5v>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&display_out>;

			};

		};

	};



	apb@80000000 {

		apbh@80000000 {

			gpmi-nand@8000c000 {
@@ -52,31 +89,11 @@ 
			lcdif@80030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_24bit_pins_a>;

				lcd-supply = <&reg_lcd_3v3>;

				display = <&display0>;

				status = "okay";



				display0: display0 {

					bits-per-pixel = <32>;

					bus-width = <24>;



					display-timings {

						native-mode = <&timing0>;

						timing0: timing0 {

							clock-frequency = <9200000>;

							hactive = <480>;

							vactive = <272>;

							hback-porch = <15>;

							hfront-porch = <8>;

							vback-porch = <12>;

							vfront-porch = <4>;

							hsync-len = <1>;

							vsync-len = <1>;

							hsync-active = <0>;

							vsync-active = <0>;

							de-active = <1>;

							pixelclk-active = <0>;

						};

				port {

					display_out: endpoint {

						remote-endpoint = <&panel_in>;

					};

				};

			};
@@ -118,32 +135,7 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_vddio_sd0: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "vddio-sd0";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio1 29 0>;

		};



		reg_lcd_3v3: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "lcd-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio1 18 0>;

			enable-active-high;

		};

	};



	backlight {

	backlight_display: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 2 5000000>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

arch/arm/boot/dts/imx28-evk.dts

+85 −98
Original line number Diff line number Diff line
@@ -13,6 +13,87 @@ 
		reg = <0x40000000 0x08000000>;

	};





	reg_3p3v: regulator-3p3v {

		compatible = "regulator-fixed";

		regulator-name = "3P3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	reg_vddio_sd0: regulator-vddio-sd0 {

		compatible = "regulator-fixed";

		regulator-name = "vddio-sd0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio3 28 0>;

	};



	reg_fec_3v3: regulator-fec-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "fec-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio2 15 0>;

	};



	reg_usb0_vbus: regulator-usb0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb0_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio3 9 0>;

		enable-active-high;

	};



	reg_usb1_vbus: regulator-usb1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio3 8 0>;

		enable-active-high;

	};



	reg_lcd_3v3: regulator-lcd-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "lcd-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio3 30 0>;

		enable-active-high;

	};



	reg_can_3v3: regulator-can-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "can-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio2 13 0>;

		enable-active-high;

	};



	reg_lcd_5v: regulator-lcd-5v {

		compatible = "regulator-fixed";

		regulator-name = "lcd-5v";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	panel {

		compatible = "sii,43wvf1g";

		backlight = <&backlight_display>;

		dvdd-supply = <&reg_lcd_3v3>;

		avdd-supply = <&reg_lcd_5v>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&display_out>;

			};

		};

	};



	apb@80000000 {

		apbh@80000000 {

			gpmi-nand@8000c000 {
@@ -116,31 +197,11 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_24bit_pins_a

					     &lcdif_pins_evk>;

				lcd-supply = <&reg_lcd_3v3>;

				display = <&display0>;

				status = "okay";



				display0: display0 {

					bits-per-pixel = <32>;

					bus-width = <24>;



					display-timings {

						native-mode = <&timing0>;

						timing0: timing0 {

							clock-frequency = <33500000>;

							hactive = <800>;

							vactive = <480>;

							hback-porch = <89>;

							hfront-porch = <164>;

							vback-porch = <23>;

							vfront-porch = <10>;

							hsync-len = <10>;

							vsync-len = <10>;

							hsync-active = <0>;

							vsync-active = <0>;

							de-active = <1>;

							pixelclk-active = <0>;

						};

				port {

					display_out: endpoint {

						remote-endpoint = <&panel_in>;

					};

				};

			};
@@ -269,80 +330,6 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_3p3v: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};



		reg_vddio_sd0: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "vddio-sd0";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio3 28 0>;

		};



		reg_fec_3v3: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "fec-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio2 15 0>;

		};



		reg_usb0_vbus: regulator@3 {

			compatible = "regulator-fixed";

			reg = <3>;

			regulator-name = "usb0_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 9 0>;

			enable-active-high;

		};



		reg_usb1_vbus: regulator@4 {

			compatible = "regulator-fixed";

			reg = <4>;

			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 8 0>;

			enable-active-high;

		};



		reg_lcd_3v3: regulator@5 {

			compatible = "regulator-fixed";

			reg = <5>;

			regulator-name = "lcd-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio3 30 0>;

			enable-active-high;

		};



		reg_can_3v3: regulator@6 {

			compatible = "regulator-fixed";

			reg = <6>;

			regulator-name = "can-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio2 13 0>;

			enable-active-high;

		};



	};



	sound {

		compatible = "fsl,imx28-evk-sgtl5000",

			     "fsl,mxs-audio-sgtl5000";
@@ -363,7 +350,7 @@ 
		};

	};



	backlight {

	backlight_display: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 2 5000000>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

arch/arm/boot/dts/imx7d.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -126,10 +126,14 @@ 
		interrupt-names = "msi";

		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0x7>;

		interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;

		/*

		 * Reference manual lists pci irqs incorrectly

		 * Real hardware ordering is same as imx6: D+MSI, C, B, A

		 */

		interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>,

			 <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>,

			 <&clks IMX7D_PCIE_PHY_ROOT_CLK>;

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ CONFIG_IMX_IPUV3_CORE=y 
CONFIG_DRM=y

CONFIG_DRM_PANEL_LVDS=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_SEIKO_43WVF1G=y

CONFIG_DRM_DW_HDMI_AHB_AUDIO=m

CONFIG_DRM_DW_HDMI_CEC=y

CONFIG_DRM_IMX=y

arch/arm/configs/mxs_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ CONFIG_MFD_MXS_LRADC=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_SEIKO_43WVF1G=y

CONFIG_DRM_MXSFB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y