diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 12:47:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 12:47:29 +0100 |
| commit | d5ffed5a8e3daecdeecc2e18bfa04a2253d84f60 (patch) | |
| tree | 40df117b456007261f68c826e833963e84278cbf /include/linux | |
| parent | 4d80b22865cc3e453aab4777948408c32f150483 (diff) | |
| parent | 5d034f17b24642b2a764c0e3a68b4c6937c9ba75 (diff) | |
| download | linux-next-d5ffed5a8e3daecdeecc2e18bfa04a2253d84f60.tar.gz linux-next-d5ffed5a8e3daecdeecc2e18bfa04a2253d84f60.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/firmware/imx/se_api.h | 14 | ||||
| -rw-r--r-- | include/linux/micrel_phy.h | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/include/linux/firmware/imx/se_api.h b/include/linux/firmware/imx/se_api.h new file mode 100644 index 000000000000..b1c4c9115d7b --- /dev/null +++ b/include/linux/firmware/imx/se_api.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2025 NXP + */ + +#ifndef __SE_API_H__ +#define __SE_API_H__ + +#include <linux/types.h> + +#define SOC_ID_OF_IMX8ULP 0x084d +#define SOC_ID_OF_IMX93 0x9300 + +#endif /* __SE_API_H__ */ diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h index 9c6f9817383f..bb71b2510c2c 100644 --- a/include/linux/micrel_phy.h +++ b/include/linux/micrel_phy.h @@ -47,11 +47,6 @@ #define MICREL_PHY_FXEN BIT(1) #define MICREL_KSZ8_P1_ERRATA BIT(2) -#define MICREL_KSZ9021_EXTREG_CTRL 0xB -#define MICREL_KSZ9021_EXTREG_DATA_WRITE 0xC -#define MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW 0x104 -#define MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW 0x105 - /* Device specific MII_BMCR (Reg 0) bits */ /* 1 = HP Auto MDI/MDI-X mode, 0 = Microchip Auto MDI/MDI-X mode */ #define KSZ886X_BMCR_HP_MDIX BIT(5) |