Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e2a61fa31382b1ac2b22f76f9c439892e5dc4b86

Authored by Ionut Nicu
Committed by David S. Miller
1 parent a1faa69810
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

fsl_pq_mdio: Fix fsl_pq_mdio to work with modules 

This patch fixes the case when ucc_geth or gianfar are compiled
as modules. Without this patch the call to phy_connect() fails.

Signed-off-by: Ionut Nicu <ionut.nicu@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/net/fsl_pq_mdio.c
Diff comments   View file @ e2a61fa
... ... @@ -188,7 +188,7 @@
188 188 }
189 189  
190 190  
191   -#ifdef CONFIG_GIANFAR
  191 +#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
192 192 static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs)
193 193 {
194 194 struct gfar __iomem *enet_regs;
... ... @@ -206,7 +206,7 @@
206 206 #endif
207 207  
208 208  
209   -#ifdef CONFIG_UCC_GETH
  209 +#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)
210 210 static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
211 211 {
212 212 struct device_node *np = NULL;
... ... @@ -291,7 +291,7 @@
291 291 if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||
292 292 of_device_is_compatible(np, "fsl,gianfar-tbi") ||
293 293 of_device_is_compatible(np, "gianfar")) {
294   -#ifdef CONFIG_GIANFAR
  294 +#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
295 295 tbipa = get_gfar_tbipa(regs);
296 296 #else
297 297 err = -ENODEV;
... ... @@ -299,7 +299,7 @@
299 299 #endif
300 300 } else if (of_device_is_compatible(np, "fsl,ucc-mdio") ||
301 301 of_device_is_compatible(np, "ucc_geth_phy")) {
302   -#ifdef CONFIG_UCC_GETH
  302 +#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)
303 303 u32 id;
304 304 static u32 mii_mng_master;
305 305