tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 350d0f012c 1ec2362084
commit 35e834e812
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/mach-imx/mach-imx6sx.c
-22
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();
}
arch/arm/mach-imx/mach-imx7d.c
+1 -1
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();