Skip to content

Commit d20f2a1

Browse files
committed
Merge tag 'imx-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.8, round 2: - Update MAINTAINERS to use a public mailing list for NXP i.MX development. - Re-enable CONFIG_BACKLIGHT_CLASS_DEVICE in imx_v6_v7_defconfig to fix a backlight regression. - Remove DSI port endpoints from i.MX7 SoC DTSI to fix a display regression. - Fix LDB clocks property for i.MX8MP device tree. - Fix TC9595 reset GPIO on DH i.MX8M Plus DHCOM SoM. * tag 'imx-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8mp: Fix LDB clocks property arm64: dts: imx8mp: Fix TC9595 reset GPIO on DH i.MX8M Plus DHCOM SoM MAINTAINERS: Use a proper mailinglist for NXP i.MX development ARM: dts: imx7: remove DSI port endpoints ARM: imx_v6_v7_defconfig: Restore CONFIG_BACKLIGHT_CLASS_DEVICE Link: https://lore.kernel.org/r/ZdtPJzdenRybI+Bq@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2bb5a9a + 65e3230 commit d20f2a1

5 files changed

Lines changed: 11 additions & 36 deletions

File tree

MAINTAINERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,7 +2157,7 @@ M: Shawn Guo <shawnguo@kernel.org>
21572157
M: Sascha Hauer <s.hauer@pengutronix.de>
21582158
R: Pengutronix Kernel Team <kernel@pengutronix.de>
21592159
R: Fabio Estevam <festevam@gmail.com>
2160-
R: NXP Linux Team <linux-imx@nxp.com>
2160+
L: imx@lists.linux.dev
21612161
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
21622162
S: Maintained
21632163
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -8496,7 +8496,7 @@ FREESCALE IMX / MXC FEC DRIVER
84968496
M: Wei Fang <wei.fang@nxp.com>
84978497
R: Shenwei Wang <shenwei.wang@nxp.com>
84988498
R: Clark Wang <xiaoning.wang@nxp.com>
8499-
R: NXP Linux Team <linux-imx@nxp.com>
8499+
L: imx@lists.linux.dev
85008500
L: netdev@vger.kernel.org
85018501
S: Maintained
85028502
F: Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -8531,7 +8531,7 @@ F: drivers/i2c/busses/i2c-imx.c
85318531
FREESCALE IMX LPI2C DRIVER
85328532
M: Dong Aisheng <aisheng.dong@nxp.com>
85338533
L: linux-i2c@vger.kernel.org
8534-
L: linux-imx@nxp.com
8534+
L: imx@lists.linux.dev
85358535
S: Maintained
85368536
F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
85378537
F: drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -15728,7 +15728,7 @@ F: drivers/iio/gyro/fxas21002c_spi.c
1572815728
NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
1572915729
M: Haibo Chen <haibo.chen@nxp.com>
1573015730
L: linux-iio@vger.kernel.org
15731-
L: linux-imx@nxp.com
15731+
L: imx@lists.linux.dev
1573215732
S: Maintained
1573315733
F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
1573415734
F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@ -15765,15 +15765,15 @@ F: drivers/gpu/drm/imx/dcss/
1576515765
NXP i.MX 8QXP ADC DRIVER
1576615766
M: Cai Huoqing <cai.huoqing@linux.dev>
1576715767
M: Haibo Chen <haibo.chen@nxp.com>
15768-
L: linux-imx@nxp.com
15768+
L: imx@lists.linux.dev
1576915769
L: linux-iio@vger.kernel.org
1577015770
S: Maintained
1577115771
F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
1577215772
F: drivers/iio/adc/imx8qxp-adc.c
1577315773

1577415774
NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
1577515775
M: Mirela Rabulea <mirela.rabulea@nxp.com>
15776-
R: NXP Linux Team <linux-imx@nxp.com>
15776+
L: imx@lists.linux.dev
1577715777
L: linux-media@vger.kernel.org
1577815778
S: Maintained
1577915779
F: Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@ -15783,7 +15783,7 @@ NXP i.MX CLOCK DRIVERS
1578315783
M: Abel Vesa <abelvesa@kernel.org>
1578415784
R: Peng Fan <peng.fan@nxp.com>
1578515785
L: linux-clk@vger.kernel.org
15786-
L: linux-imx@nxp.com
15786+
L: imx@lists.linux.dev
1578715787
S: Maintained
1578815788
T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
1578915789
F: Documentation/devicetree/bindings/clock/imx*
@@ -19655,7 +19655,7 @@ F: drivers/mmc/host/sdhci-of-at91.c
1965519655

1965619656
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
1965719657
M: Haibo Chen <haibo.chen@nxp.com>
19658-
L: linux-imx@nxp.com
19658+
L: imx@lists.linux.dev
1965919659
L: linux-mmc@vger.kernel.org
1966019660
S: Maintained
1966119661
F: drivers/mmc/host/sdhci-esdhc-imx.c

arch/arm/boot/dts/nxp/imx/imx7s.dtsi

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -834,16 +834,6 @@
834834
<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
835835
clock-names = "pix", "axi";
836836
status = "disabled";
837-
838-
port {
839-
#address-cells = <1>;
840-
#size-cells = <0>;
841-
842-
lcdif_out_mipi_dsi: endpoint@0 {
843-
reg = <0>;
844-
remote-endpoint = <&mipi_dsi_in_lcdif>;
845-
};
846-
};
847837
};
848838

849839
mipi_csi: mipi-csi@30750000 {
@@ -895,22 +885,6 @@
895885
samsung,esc-clock-frequency = <20000000>;
896886
samsung,pll-clock-frequency = <24000000>;
897887
status = "disabled";
898-
899-
ports {
900-
#address-cells = <1>;
901-
#size-cells = <0>;
902-
903-
port@0 {
904-
reg = <0>;
905-
#address-cells = <1>;
906-
#size-cells = <0>;
907-
908-
mipi_dsi_in_lcdif: endpoint@0 {
909-
reg = <0>;
910-
remote-endpoint = <&lcdif_out_mipi_dsi>;
911-
};
912-
};
913-
};
914888
};
915889
};
916890

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ CONFIG_FB_MODE_HELPERS=y
297297
CONFIG_LCD_CLASS_DEVICE=y
298298
CONFIG_LCD_L4F00242T03=y
299299
CONFIG_LCD_PLATFORM=y
300+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
300301
CONFIG_BACKLIGHT_PWM=y
301302
CONFIG_BACKLIGHT_GPIO=y
302303
CONFIG_FRAMEBUFFER_CONSOLE=y

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<&clk IMX8MP_AUDIO_PLL2_OUT>;
256256
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
257257
assigned-clock-rates = <13000000>, <13000000>, <156000000>;
258-
reset-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
258+
reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
259259
status = "disabled";
260260

261261
ports {

arch/arm64/boot/dts/freescale/imx8mp.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@
18201820
compatible = "fsl,imx8mp-ldb";
18211821
reg = <0x5c 0x4>, <0x128 0x4>;
18221822
reg-names = "ldb", "lvds";
1823-
clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
1823+
clocks = <&clk IMX8MP_CLK_MEDIA_LDB_ROOT>;
18241824
clock-names = "ldb";
18251825
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
18261826
assigned-clock-parents = <&clk IMX8MP_VIDEO_PLL1_OUT>;

0 commit comments

Comments
 (0)