diff mbox series

[5.6,084/106] net: stmmac: socfpga: Allow all RGMII modes

Message ID	20200501131553.749935441@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=1/SS=6P=vger.kernel.org=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, Atsushi Nemoto <atsushi.nemoto@sord.co.jp>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.6 084/106] net: stmmac: socfpga: Allow all RGMII modes Date: Fri, 1 May 2020 15:23:57 +0200 Message-Id: <20200501131553.749935441@linuxfoundation.org> In-Reply-To: <20200501131543.421333643@linuxfoundation.org> References: <20200501131543.421333643@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.6,003/106] ASoC: stm32: sai: fix sai probe [5.6,004/106] usb: dwc3: gadget: Do link recovery for SS and SSP [5.6,007/106] usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete [5.6,010/106] afs: Fix to actually set AFS_SERVER_FL_HAVE_EPOCH [5.6,013/106] iio: imu: st_lsm6dsx: specify slave odr in slv_odr [5.6,014/106] propagate_one(): mnt_set_mountpoint() needs mount_lock [5.6,015/106] counter: 104-quad-8: Add lock guards - generic interface [5.6,016/106] s390/ftrace: fix potential crashes when switching tracers [5.6,019/106] ASoC: samsung: s3c24xx-i2s: Fix build after removal of DAI suspend/resume [5.6,020/106] ASoC: tas571x: disable regulators on failed probe [5.6,021/106] ASoC: meson: axg-card: fix codec-to-codec link setup [5.6,025/106] ARM: dts: OMAP3: disable RNG on N950/N9 [5.6,027/106] brcmfmac: add stub for monitor interface xmit [5.6,028/106] i2c: altera: use proper variable to hold errno [5.6,030/106] clk: asm9260: fix __clk_hw_register_fixed_rate_with_accuracy typo [5.6,031/106] rtw88: avoid unused function warnings [5.6,032/106] hwmon: (drivetemp) Return -ENODATA for invalid temperatures [5.6,034/106] netfilter: nf_tables: reintroduce the NFT_SET_CONCAT flag [5.6,036/106] net/cxgb4: Check the return from t4_query_params properly [5.6,038/106] xfs: acquire superblock freeze protection on eofblocks scans [5.6,042/106] net/mlx5e: Get the latest values from counters in switchdev mode [5.6,044/106] PCI: Add Zhaoxin Vendor ID [5.6,047/106] PCI: Move Apex Edge TPU class quirk to fix BAR assignment [5.6,049/106] cpumap: Avoid warning when CONFIG_DEBUG_PER_CPU_MAPS is enabled [5.6,051/106] remoteproc: mtk_scp: use dma_addr_t for DMA API [5.6,052/106] net/mlx5: Fix failing fw tracer allocation on s390 [5.6,054/106] perf/core: fix parent pid/tid in task exit events [5.6,056/106] PM: sleep: core: Switch back to async_schedule_dev() [5.6,058/106] um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/ [5.6,062/106] bpf, x86_32: Fix clobbering of dst for BPF_JSET [5.6,063/106] bpf, x86_32: Fix logic error in BPF_LDX zero-extension [5.6,065/106] selftests/bpf: Fix a couple of broken test_btf cases [5.6,067/106] xfs: clear PF_MEMALLOC before exiting xfsaild thread [5.6,069/106] net: fec: set GPR bit on suspend by DT configuration. [5.6,072/106] afs: Fix length of dump of bad YFSFetchStatus record [5.6,075/106] ALSA: hda: Keep the controller initialization even if no codecs found [5.6,078/106] scsi: target: fix PR IN / READ FULL STATUS for FC [5.6,079/106] scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN [5.6,080/106] objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings [5.6,082/106] xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status [5.6,084/106] net: stmmac: socfpga: Allow all RGMII modes [5.6,085/106] mac80211: fix channel switch trigger from unknown mesh peer [5.6,088/106] arm64: Delete the space separator in __emit_inst [5.6,091/106] ext4: convert BUG_ONs to WARN_ONs in mballoc.c [5.6,092/106] irqchip/gic-v4.1: Add support for VPENDBASERs Dirty+Valid signaling [5.6,095/106] hwmon: (jc42) Fix name to have no illegal characters [5.6,097/106] taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions [5.6,098/106] tipc: Add a missing case of TIPC_DIRECT_MSG type [5.6,099/106] qed: Fix race condition between scheduling and destroying the slowpath workqueue [5.6,101/106] net: use indirect call wrappers for skb_copy_datagram_iter() [5.6,102/106] qed: Fix use after free in qed_chain_free [5.6,105/106] ASoC: soc-core: disable route checks for legacy devices

Commit Message

Greg Kroah-Hartman May 1, 2020, 1:23 p.m. UTC

From: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>

[ Upstream commit a7a0d6269652846671312b29992143f56e2866b8 ]

Allow all the RGMII modes to be used.  (Not only "rgmii", "rgmii-id"
but "rgmii-txid", "rgmii-rxid")

Signed-off-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 ++
 1 file changed, 2 insertions(+)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index e0212d2fc2a12..fa32cd5b418ef 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -241,6 +241,8 @@  static int socfpga_set_phy_mode_common(int phymode, u32 *val)
 	switch (phymode) {
 	case PHY_INTERFACE_MODE_RGMII:
 	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
+	case PHY_INTERFACE_MODE_RGMII_TXID:
 		*val = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII;
 		break;
 	case PHY_INTERFACE_MODE_MII: