[PATCH v7 07/12] board: starfive: spl: Drop the unneeded DT modification code
Hal Feng
hal.feng at starfivetech.com
Tue Dec 3 04:04:25 CET 2024
As OF_UPSTREAM is implemented, these code are redundant.
Tested-by: Anand Moon <linux.amoon at gmail.com>
Tested-by: E Shattow <lucent at gmail.com>
Signed-off-by: Hal Feng <hal.feng at starfivetech.com>
---
board/starfive/visionfive2/spl.c | 356 -------------------------------
1 file changed, 356 deletions(-)
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 3fd535e7cf..38132ecccd 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -20,364 +20,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define JH7110_CLK_CPU_ROOT_SHIFT 24
#define JH7110_CLK_CPU_ROOT_MASK GENMASK(29, 24)
-struct starfive_vf2_pro {
- const char *path;
- const char *name;
- const char *value;
-};
-
-static const struct starfive_vf2_pro milk_v_mars[] = {
- {"/soc/ethernet at 16030000", "starfive,tx-use-rgmii-clk", NULL},
- {"/soc/ethernet at 16040000", "starfive,tx-use-rgmii-clk", NULL},
-
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-adj-enabled", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-100-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-1000-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-clk-drv-microamp", "3970"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-data-drv-microamp", "2910"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "rx-internal-delay-ps", "1500"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "tx-internal-delay-ps", "1500"},
-};
-
-static const struct starfive_vf2_pro starfive_vera[] = {
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0", "rx-internal-delay-ps",
- "1900"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0", "tx-internal-delay-ps",
- "1350"}
-};
-
-static const struct starfive_vf2_pro starfive_verb[] = {
- {"/soc/ethernet at 16030000", "starfive,tx-use-rgmii-clk", NULL},
- {"/soc/ethernet at 16040000", "starfive,tx-use-rgmii-clk", NULL},
-
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-adj-enabled", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-100-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-1000-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-clk-drv-microamp", "3970"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-data-drv-microamp", "2910"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "rx-internal-delay-ps", "1500"},
-
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,tx-clk-adj-enabled", NULL},
- { "/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,tx-clk-100-inverted", NULL},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,rx-clk-drv-microamp", "3970"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,rx-data-drv-microamp", "2910"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "rx-internal-delay-ps", "0"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "tx-internal-delay-ps", "0"},
-};
-
-static const struct starfive_vf2_pro star64_pine64[] = {
- {"/soc/ethernet at 16030000", "starfive,tx-use-rgmii-clk", NULL},
- {"/soc/ethernet at 16040000", "starfive,tx-use-rgmii-clk", NULL},
-
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-adj-enabled", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-10-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-100-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,tx-clk-1000-inverted", NULL},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-clk-drv-microamp", "2910"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "motorcomm,rx-data-drv-microamp", "2910"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "rx-internal-delay-ps", "1900"},
- {"/soc/ethernet at 16030000/mdio/ethernet-phy at 0",
- "tx-internal-delay-ps", "1500"},
-
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,tx-clk-adj-enabled", NULL},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,tx-clk-10-inverted", NULL},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,tx-clk-100-inverted", NULL},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,rx-clk-drv-microamp", "2910"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "motorcomm,rx-data-drv-microamp", "2910"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "rx-internal-delay-ps", "0"},
- {"/soc/ethernet at 16040000/mdio/ethernet-phy at 1",
- "tx-internal-delay-ps", "300"},
-};
-
-void spl_fdt_fixup_mars(void *fdt)
-{
- static const char compat[] = "milkv,mars\0starfive,jh7110";
- u32 phandle;
- u8 i;
- int offset;
- int ret;
-
- fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat));
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model",
- "Milk-V Mars");
-
- /* gmac0 */
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 17000000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16030000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX);
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_AONCLK_GMAC0_RMII_RTX);
-
- /* gmac1 */
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/soc/ethernet at 16040000"),
- "status", "disabled");
-
- for (i = 0; i < ARRAY_SIZE(milk_v_mars); i++) {
- offset = fdt_path_offset(fdt, milk_v_mars[i].path);
-
- if (milk_v_mars[i].value)
- ret = fdt_setprop_u32(fdt, offset, milk_v_mars[i].name,
- dectoul(milk_v_mars[i].value, NULL));
- else
- ret = fdt_setprop_empty(fdt, offset, milk_v_mars[i].name);
-
- if (ret) {
- pr_err("%s set prop %s fail.\n", __func__, milk_v_mars[i].name);
- break;
- }
- }
-}
-
-void spl_fdt_fixup_mars_cm(void *fdt)
-{
- const char *compat;
- const char *model;
- int compat_size;
-
- spl_fdt_fixup_mars(fdt);
-
- if (!get_mmc_size_from_eeprom()) {
- int offset;
- static const char
- compat_cm_lite[] = "milkv,mars-cm-lite\0starfive,jh7110";
-
- model = "Milk-V Mars CM Lite";
- compat = compat_cm_lite;
- compat_size = sizeof(compat_cm_lite);
-
- offset = fdt_path_offset(fdt, "/soc/pinctrl/mmc0-pins/mmc0-pins-rest");
- /* GPIOMUX(22, GPOUT_SYS_SDIO0_RST, GPOEN_ENABLE, GPI_NONE) */
- fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016);
- } else {
- static const char
- compat_cm[] = "milkv,mars-cm\0starfive,jh7110";
-
- model = "Milk-V Mars CM";
- compat = compat_cm;
- compat_size = sizeof(compat_cm);
- }
- fdt_setprop(fdt, fdt_path_offset(fdt, "/"),
- "compatible", compat, compat_size);
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model);
-}
-
-void spl_fdt_fixup_version_a(void *fdt)
-{
- static const char compat[] = "starfive,visionfive-2-v1.2a\0starfive,jh7110";
- u32 phandle;
- u8 i;
- int offset;
- int ret;
-
- fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat));
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model",
- "StarFive VisionFive 2 v1.2A");
-
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 13020000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16040000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_RX);
-
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_SYSCLK_GMAC1_RMII_RTX);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_SYSCLK_GMAC1_RMII_RTX);
-
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/soc/ethernet at 16040000"),
- "phy-mode", "rmii");
-
- for (i = 0; i < ARRAY_SIZE(starfive_vera); i++) {
- offset = fdt_path_offset(fdt, starfive_vera[i].path);
-
- if (starfive_vera[i].value)
- ret = fdt_setprop_u32(fdt, offset, starfive_vera[i].name,
- dectoul(starfive_vera[i].value, NULL));
- else
- ret = fdt_setprop_empty(fdt, offset, starfive_vera[i].name);
-
- if (ret) {
- pr_err("%s set prop %s fail.\n", __func__, starfive_vera[i].name);
- break;
- }
- }
-}
-
-void spl_fdt_fixup_version_b(void *fdt)
-{
- static const char compat[] = "starfive,visionfive-2-v1.3b\0starfive,jh7110";
- u32 phandle;
- u8 i;
- int offset;
- int ret;
-
- fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat));
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model",
- "StarFive VisionFive 2 v1.3B");
-
- /* gmac0 */
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 17000000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16030000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX);
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_AONCLK_GMAC0_RMII_RTX);
-
- /* gmac1 */
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 13020000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16040000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX);
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_SYSCLK_GMAC1_RMII_RTX);
-
- for (i = 0; i < ARRAY_SIZE(starfive_verb); i++) {
- offset = fdt_path_offset(fdt, starfive_verb[i].path);
-
- if (starfive_verb[i].value)
- ret = fdt_setprop_u32(fdt, offset, starfive_verb[i].name,
- dectoul(starfive_verb[i].value, NULL));
- else
- ret = fdt_setprop_empty(fdt, offset, starfive_verb[i].name);
-
- if (ret) {
- pr_err("%s set prop %s fail.\n", __func__, starfive_verb[i].name);
- break;
- }
- }
-}
-
-void spl_fdt_fixup_star64(void *fdt)
-{
- static const char compat[] = "pine64,star64\0starfive,jh7110";
- u32 phandle;
- u8 i;
- int offset;
- int ret;
-
- fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat));
- fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model",
- "Pine64 Star64");
-
- /* gmac0 */
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 17000000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16030000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX);
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_AONCLK_GMAC0_RMII_RTX);
-
- /* gmac1 */
- offset = fdt_path_offset(fdt, "/soc/clock-controller at 13020000");
- phandle = fdt_get_phandle(fdt, offset);
- offset = fdt_path_offset(fdt, "/soc/ethernet at 16040000");
-
- fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX);
- fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle);
- fdt_appendprop_u32(fdt, offset, "assigned-clock-parents",
- JH7110_SYSCLK_GMAC1_RMII_RTX);
-
- for (i = 0; i < ARRAY_SIZE(star64_pine64); i++) {
- offset = fdt_path_offset(fdt, star64_pine64[i].path);
-
- if (star64_pine64[i].value)
- ret = fdt_setprop_u32(fdt, offset, star64_pine64[i].name,
- dectoul(star64_pine64[i].value, NULL));
- else
- ret = fdt_setprop_empty(fdt, offset, star64_pine64[i].name);
-
- if (ret) {
- pr_err("%s set prop %s fail.\n", __func__, star64_pine64[i].name);
- break;
- }
- }
-}
-
void spl_perform_fixups(struct spl_image_info *spl_image)
{
- u8 version;
- const char *product_id;
-
- product_id = get_product_id_from_eeprom();
- if (!product_id) {
- pr_err("Can't read EEPROM\n");
- return;
- }
- if (!strncmp(product_id, "MARC", 4)) {
- spl_fdt_fixup_mars_cm(spl_image->fdt_addr);
- } else if (!strncmp(product_id, "MARS", 4)) {
- spl_fdt_fixup_mars(spl_image->fdt_addr);
- } else if (!strncmp(product_id, "VF7110", 6)) {
- version = get_pcb_revision_from_eeprom();
- switch (version) {
- case 'a':
- case 'A':
- spl_fdt_fixup_version_a(spl_image->fdt_addr);
- break;
-
- case 'b':
- case 'B':
- default:
- spl_fdt_fixup_version_b(spl_image->fdt_addr);
- break;
- };
- } else if (!strncmp(product_id, "STAR64", 6)) {
- spl_fdt_fixup_star64(spl_image->fdt_addr);
- } else {
- pr_err("Unknown product %s\n", product_id);
- };
-
/* Update the memory size which read from eeprom or DT */
fdt_fixup_memory(spl_image->fdt_addr, 0x40000000, gd->ram_size);
}
--
2.43.2
More information about the U-Boot
mailing list