Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'add-fec-support-on-s32v234-platform'

Wei Fang says:

====================
Add FEC support on s32v234 platform

This series patches are to add FEC support on s32v234 platfom.
1. Add compatible string and quirks for fsl,s32v234
2. Update Kconfig to also check for ARCH_S32.
====================

Link: https://lore.kernel.org/r/20220907095649.3101484-1-wei.fang@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+16 -3
+1
Documentation/devicetree/bindings/net/fsl,fec.yaml
··· 21 21 - fsl,imx28-fec 22 22 - fsl,imx6q-fec 23 23 - fsl,mvf600-fec 24 + - fsl,s32v234-fec 24 25 - items: 25 26 - enum: 26 27 - fsl,imx53-fec
+3 -3
drivers/net/ethernet/freescale/Kconfig
··· 9 9 depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \ 10 10 M523x || M527x || M5272 || M528x || M520x || M532x || \ 11 11 ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \ 12 - ARCH_LAYERSCAPE || COMPILE_TEST 12 + ARCH_LAYERSCAPE || ARCH_S32 || COMPILE_TEST 13 13 help 14 14 If you have a network (Ethernet) card belonging to this class, say Y. 15 15 ··· 23 23 config FEC 24 24 tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)" 25 25 depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \ 26 - ARCH_MXC || SOC_IMX28 || COMPILE_TEST) 26 + ARCH_MXC || ARCH_S32 || SOC_IMX28 || COMPILE_TEST) 27 27 default ARCH_MXC || SOC_IMX28 if ARM 28 28 depends on PTP_1588_CLOCK_OPTIONAL 29 29 select CRC32 ··· 31 31 imply NET_SELFTESTS 32 32 help 33 33 Say Y here if you want to use the built-in 10/100 Fast ethernet 34 - controller on some Motorola ColdFire and Freescale i.MX processors. 34 + controller on some Motorola ColdFire and Freescale i.MX/S32 processors. 35 35 36 36 config FEC_MPC52xx 37 37 tristate "FEC MPC52xx driver"
+12
drivers/net/ethernet/freescale/fec_main.c
··· 156 156 FEC_QUIRK_DELAYED_CLKS_SUPPORT, 157 157 }; 158 158 159 + static const struct fec_devinfo fec_s32v234_info = { 160 + .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT | 161 + FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM | 162 + FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB | 163 + FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE, 164 + }; 165 + 159 166 static struct platform_device_id fec_devtype[] = { 160 167 { 161 168 /* keep it for coldfire */ ··· 196 189 .name = "imx8qm-fec", 197 190 .driver_data = (kernel_ulong_t)&fec_imx8qm_info, 198 191 }, { 192 + .name = "s32v234-fec", 193 + .driver_data = (kernel_ulong_t)&fec_s32v234_info, 194 + }, { 199 195 /* sentinel */ 200 196 } 201 197 }; ··· 214 204 IMX6UL_FEC, 215 205 IMX8MQ_FEC, 216 206 IMX8QM_FEC, 207 + S32V234_FEC, 217 208 }; 218 209 219 210 static const struct of_device_id fec_dt_ids[] = { ··· 227 216 { .compatible = "fsl,imx6ul-fec", .data = &fec_devtype[IMX6UL_FEC], }, 228 217 { .compatible = "fsl,imx8mq-fec", .data = &fec_devtype[IMX8MQ_FEC], }, 229 218 { .compatible = "fsl,imx8qm-fec", .data = &fec_devtype[IMX8QM_FEC], }, 219 + { .compatible = "fsl,s32v234-fec", .data = &fec_devtype[S32V234_FEC], }, 230 220 { /* sentinel */ } 231 221 }; 232 222 MODULE_DEVICE_TABLE(of, fec_dt_ids);