diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-27 21:12:07 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-27 21:14:11 +0200 |
| commit | 193b9b200224dab4eaec407eb2955303a521f5b6 (patch) | |
| tree | 95366182cc2871667a60613a921f7bfae0b9e2c7 /arch/arm/boot | |
| parent | Merge branch 'series-to-deliver-ethernet-for-stm32mp25' (diff) | |
| parent | Merge tag 'wireless-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-193b9b200224dab4eaec407eb2955303a521f5b6.tar.xz linux-193b9b200224dab4eaec407eb2955303a521f5b6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
e3f02f32a050 ("ionic: fix kernel panic due to multi-buffer handling")
d9c04209990b ("ionic: Mark error paths in the data path as unlikely")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi index d80440446473..05d7a462ea25 100644 --- a/arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi @@ -85,7 +85,7 @@ }; }; - panel { + panel_dpi: panel { compatible = "sii,43wvf1g"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_display_power>; diff --git a/arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso b/arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso index c84e9b052527..151e9cee3c87 100644 --- a/arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso +++ b/arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso @@ -10,8 +10,6 @@ /plugin/; &{/} { - /delete-node/ panel; - hdmi: connector-hdmi { compatible = "hdmi-connector"; label = "hdmi"; @@ -82,6 +80,10 @@ }; }; +&panel_dpi { + status = "disabled"; +}; + &tve { status = "disabled"; }; |