diff mbox series

[5.10,054/129] ARM: dts: Fix mmc order for omap3-gta04

Message ID	20220504153025.338409370@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "H. Nikolaus Schaller" <hns@goldelico.com>, Tony Lindgren <tony@atomide.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 054/129] ARM: dts: Fix mmc order for omap3-gta04 Date: Wed, 4 May 2022 18:44:06 +0200 Message-Id: <20220504153025.338409370@linuxfoundation.org> In-Reply-To: <20220504153021.299025455@linuxfoundation.org> References: <20220504153021.299025455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/129] lightnvm: disable the subsystem [5.10,003/129] usb: mtu3: fix USB 3.0 dual-role-switch from device to host [5.10,005/129] USB: quirks: add STRING quirk for VCOM device [5.10,006/129] USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS [5.10,009/129] USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions [5.10,013/129] iio: dac: ad5592r: Fix the missing return value. [5.10,016/129] iio: imu: inv_icm42600: Fix I2C init possible nack [5.10,018/129] usb: typec: ucsi: Fix reuse of completion structure [5.10,024/129] usb: dwc3: core: Only handle soft-reset in DCTL [5.10,026/129] usb: cdns3: Fix issue for clear halt endpoint [5.10,028/129] serial: imx: fix overrun interrupts in DMA mode [5.10,029/129] serial: 8250: Also set sticky MCR bits in console restoration [5.10,030/129] serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device [5.10,031/129] arch_topology: Do not set llc_sibling if llc_id is invalid [5.10,036/129] x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests [5.10,038/129] video: fbdev: udlfb: properly check endpoint type [5.10,039/129] arm64: dts: meson: remove CPU opps below 1GHz for G12B boards [5.10,042/129] mtd: rawnand: fix ecc parameters for mt7622 [5.10,044/129] ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue [5.10,045/129] phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe [5.10,046/129] phy: samsung: exynos5250-sata: fix missing device put in probe error paths [5.10,047/129] ARM: OMAP2+: Fix refcount leak in omap_gic_of_init [5.10,048/129] bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific [5.10,051/129] ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name [5.10,053/129] phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe [5.10,054/129] ARM: dts: Fix mmc order for omap3-gta04 [5.10,055/129] ARM: dts: am3517-evm: Fix misc pinmuxing [5.10,056/129] ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 [5.10,057/129] ipvs: correctly print the memory size of ip_vs_conn_tab [5.10,060/129] mtd: fix part field data corruption in mtd_info [5.10,061/129] pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI [5.10,062/129] memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode [5.10,065/129] bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook [5.10,066/129] pinctrl: rockchip: fix RK3308 pinmux bits [5.10,069/129] tcp: ensure to use the most recently sent skb when filling the rate sample [5.10,070/129] wireguard: device: check for metadata_dst with skb_valid_dst() [5.10,071/129] sctp: check asoc strreset_chunk in sctp_generate_reconf_event [5.10,072/129] ARM: dts: imx6ull-colibri: fix vqmmc regulator [5.10,076/129] net: hns3: modify the return code of hclge_get_ring_chain_from_mbx [5.10,077/129] net: hns3: add validity check for message data length [5.10,078/129] net: hns3: add return value for mailbox handling in PF [5.10,081/129] ip6_gre: Make o_seqno start from 0 in native mode [5.10,083/129] tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT [5.10,087/129] net: bcmgenet: hide status block before TX timestamping [5.10,089/129] net: dsa: lantiq_gswip: Dont set GSWIP_MII_CFG_RMII_CLK [5.10,092/129] tls: Skip tls_append_frag on zero copy size [5.10,093/129] bnx2x: fix napi API usage sequence [5.10,094/129] net: fec: add missing of_node_put() in fec_enet_init_stop_mode() [5.10,096/129] ibmvnic: fix miscellaneous checks [5.10,097/129] Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" [5.10,098/129] tcp: fix F-RTO may not work correctly when receiving DSACK [5.10,099/129] ASoC: Intel: soc-acpi: correct device endpoints for max98373 [5.10,106/129] zonefs: Fix management of open zones [5.10,108/129] kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur a... [5.10,111/129] thermal: int340x: Fix attr.show callback prototype [5.10,113/129] perf symbol: Pass is_kallsyms to symbols__fixup_end() [5.10,115/129] tty: n_gsm: fix restart handling via CLD command [5.10,116/129] tty: n_gsm: fix decoupled mux resource [5.10,118/129] tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 [5.10,121/129] tty: n_gsm: fix insufficient txframe size [5.10,123/129] tty: n_gsm: fix missing explicit ldisc flush [5.10,126/129] tty: n_gsm: fix reset fifo race condition [5.10,127/129] tty: n_gsm: fix incorrect UA handling [5.10,128/129] tty: n_gsm: fix software flow control handling [5.10,129/129] perf symbol: Remove arch__symbols__fixup_end()

Commit Message

gregkh@linuxfoundation.org May 4, 2022, 4:44 p.m. UTC

From: H. Nikolaus Schaller <hns@goldelico.com>

[ Upstream commit 09269dd050094593fc747f2a5853d189fefcb6b5 ]

Commit a1ebdb374199 ("ARM: dts: Fix swapped mmc order for omap3")
introduces general mmc aliases. Let's tailor them to the need
of the GTA04 board which does not make use of mmc2 and mmc3 interfaces.

Fixes: a1ebdb374199 ("ARM: dts: Fix swapped mmc order for omap3")
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Message-Id: <dc9173ee3d391d9e92b7ab8ed4f84b29f0a21c83.1646744420.git.hns@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/arm/boot/dts/omap3-gta04.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff mbox series

Patch

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 80c9e5e34136..cc8a378dd076 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -31,6 +31,8 @@  chosen {
 	aliases {
 		display0 = &lcd;
 		display1 = &tv0;
+		/delete-property/ mmc2;
+		/delete-property/ mmc3;
 	};
 
 	ldo_3v3: fixedregulator {