github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 21:15:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX SoC changes for 6.12:

Browse Source 
- One cleanup from Fabio Estevam to remove Ethernet refclock setting
   from i.MX6SX machine code
 - One change from Nathan Chancellor that annotates imx7d_enet_init() as
   __init to clears up a section mismatch seen with the recent LLVM
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmbYRz0UHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM4JzQgAt5DItWMG+lOgAdxkuVpydzgJ4i3i
 x1cxOWxzV+8//JVZoFVNFYtZJlaJ4lnA0zjI/in+rz5r/vz6GOVlsSIUzVn+ayxg
 MBjqvMuPcggZR+dC7ckUHdEXUB1DIbcBTtP/8IqkjXFXz6euej6gDcheU+QX/4PY
 yTGiCj6dXC2AzSYo0SUwVGbkgKOqqyFP2dkgAQ+SgmhbXX3FyMOc1OgoQjVXj+Y0
 FSRe6xjj6Xn7BmUPLbebws0jG8jy7tVKaVcquPnvF1NUZLFT1UzdwDENu9raKobQ
 LbkM0XxuU66pNYPDvH3HhOESzt5l6Yt+t8v1oNRJQ6H6EQkVA3cui9uRbw==
 =8UNt
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbZgpsACgkQYKtH/8kJ
 UifA+hAA2mc+Z8meCTMHCSoM8v9Va5kp3RJuIPKWVz99yoN7+k8N54l1TISilHEm
 o8TDQU5ySXQjLo9eaa8tgoV9mzyIV2JkTKpYzSgFEy0Q1RKsttNaHI3PYKJ3as8M
 CPy2mcupDW9Cwh6lLJ1rzLS/G9fB5vsber0rg0x1DIvXVr3MofkU1OxwOOUa5qTg
 fV/2b1I9B5JjSIzWRR0EY6ws+4l5XE33KD9Q/Ak//bWzTWI25D9w5jkZ7iPiaBtd
 Q+jEwh2eGiG5QNc8AsvMGs9/GBzj8eZfDbbHYBfHnhOV2w+tPgmqzzJEtNd7u/tc
 KhEFEiiXygUIk2uHLHJmMsMUF6/63btXkm6INMVLeKuzgmxkAIqxpub2ich+m/Gm
 gfqBmS5bu6mO7WxTrlxdBOxL1XG/hzN9PUR6tRHgbaIrCn/2vPfmEInlpw3SDWtD
 0Vxpz9dwnZQRCH7/SGH4dRu7xOwjo2ANPG6NnaUo1uP3piqZxaIAAWuz7T6EGfBq
 ny0BOliakXgZ1OmWmcKj/fjxutqk7T+Nr+yKybGyzc1/R7wpkL9jS/eC1w6ijIoU
 jZVRcfZ91HdRUfYK5BECQiA1/kZnM3RZwVffKOp1gjmM+ygvpwGdDYFOWo7R8tPr
 iY3CVRjSVd96EUgtCBsyGuY/XtW9oDww0hM6G9t4S/IvGNsuHVQ=
 =09E6
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm

i.MX SoC changes for 6.12:

- One cleanup from Fabio Estevam to remove Ethernet refclock setting
  from i.MX6SX machine code
- One change from Nathan Chancellor that annotates imx7d_enet_init() as
  __init to clears up a section mismatch seen with the recent LLVM

* tag 'imx-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Annotate imx7d_enet_init() as __init
  ARM: mach-imx: imx6sx: Remove Ethernet refclock setting

Link: https://lore.kernel.org/r/20240904143439.211552-2-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-09-05 10:06:18 +00:00
commit 35e834e812
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-imx/mach-imx6sx.c
View File

@ -7,37 +7,15 @@
#include <linux/of_platform.h>
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "cpuidle.h"
static void __init imx6sx_enet_clk_sel(void)
{
struct regmap *gpr;
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");
if (!IS_ERR(gpr)) {
regmap_update_bits(gpr, IOMUXC_GPR1,
IMX6SX_GPR1_FEC_CLOCK_MUX_SEL_MASK, 0);
regmap_update_bits(gpr, IOMUXC_GPR1,
IMX6SX_GPR1_FEC_CLOCK_PAD_DIR_MASK, 0);
} else {
pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");
}
}
static inline void imx6sx_enet_init(void)
{
imx6sx_enet_clk_sel();
}
static void __init imx6sx_init_machine(void)
{
of_platform_default_populate(NULL, NULL, NULL);
imx6sx_enet_init();
imx_anatop_init();
imx6sx_pm_init();
}

2
arch/arm/mach-imx/mach-imx7d.c
View File

@ -48,7 +48,7 @@ static void __init imx7d_enet_clk_sel(void)
}
}
static inline void imx7d_enet_init(void)
static void __init imx7d_enet_init(void)
{
imx7d_enet_phy_init();
imx7d_enet_clk_sel();