diff options
| -rw-r--r-- | arch/riscv/Kconfig.socs | 8 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/starfive/Makefile | 2 | ||||
| -rw-r--r-- | drivers/clk/Makefile | 2 | ||||
| -rw-r--r-- | drivers/clk/starfive/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 | ||||
| -rwxr-xr-x | drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c | 4 | ||||
| -rwxr-xr-x | drivers/pinctrl/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/reset/starfive/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 2 |
9 files changed, 12 insertions, 20 deletions
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index c0c05d5e9f4b..e17bd5a97b36 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -68,14 +68,6 @@ config USB_CDNS3_HOST_FLUSH_DMA endmenu -config SOC_STARFIVE - bool "StarFive SoCs" - select PINCTRL - select RESET_CONTROLLER - select SIFIVE_PLIC - help - This enables support for StarFive SoC platform hardware. - config SOC_VIRT bool "QEMU Virt Machine" select CLINT_TIMER if RISCV_M_MODE diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile index 058ea584aae4..abfa4ecd2434 100644 --- a/arch/riscv/boot/dts/starfive/Makefile +++ b/arch/riscv/boot/dts/starfive/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight-a1.dtb jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb +dtb-$(CONFIG_SOC_STARFIVE_VIC7100) += jh7100-beaglev-starlight-a1.dtb jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index f5ab7752aa74..7f517ef2c9dc 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -111,7 +111,7 @@ obj-$(CONFIG_ARCH_STRATIX10) += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-y += sprd/ obj-$(CONFIG_ARCH_STI) += st/ -obj-$(CONFIG_SOC_STARFIVE) += starfive/ +obj-$(CONFIG_SOC_STARFIVE_VIC7100) += starfive/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_SUNXI_CCU) += sunxi-ng/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig index c0fa9d5e641f..dff0737746d5 100644 --- a/drivers/clk/starfive/Kconfig +++ b/drivers/clk/starfive/Kconfig @@ -2,8 +2,8 @@ config CLK_STARFIVE_JH7100 bool "StarFive JH7100 clock support" - depends on SOC_STARFIVE || COMPILE_TEST - default SOC_STARFIVE + depends on SOC_STARFIVE_VIC7100 || COMPILE_TEST + default SOC_STARFIVE_VIC7100 help Say yes here to support the clock controller on the StarFive JH7100 SoC. diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index d6b2d66738d7..92b9fcc1c08d 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1701,7 +1701,7 @@ config SENSORS_STTS751 config SENSORS_SFCTEMP tristate "Starfive JH7100 temperature sensor" - depends on SOC_STARFIVE || COMPILE_TEST + depends on SOC_STARFIVE_VIC7100 || COMPILE_TEST help If you say yes here you get support for temperature sensor on the Starfive JH7100 SoC. diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c index ffd197de2f5e..e82153c00612 100755 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c @@ -29,7 +29,7 @@ * 100M: gtxclk为25M， 分频值为500/25 = 0x14 * 10M: gtxclk为2.5M，分频值为500/2.5 = 0xc8 */ -#ifdef CONFIG_SOC_STARFIVE +#ifdef CONFIG_SOC_STARFIVE_VIC7100 #define CLKGEN_BASE 0x11800000 #define CLKGEN_GMAC_GTXCLK_OFFSET 0x1EC #define CLKGEN_GMAC_GTXCLK_ADDR (CLKGEN_BASE + CLKGEN_GMAC_GTXCLK_OFFSET) @@ -96,7 +96,7 @@ static int dwmac_generic_probe(struct platform_device *pdev) if (ret) goto err_remove_config_dt; } -#ifdef CONFIG_SOC_STARFIVE +#ifdef CONFIG_SOC_STARFIVE_VIC7100 plat_dat->fix_mac_speed = dwmac_fixed_speed; #endif diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 6f3d3c43bfc3..0e69afe6b138 100755 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -266,9 +266,9 @@ config PINCTRL_ST config PINCTRL_STARFIVE tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC" - depends on SOC_STARFIVE || COMPILE_TEST + depends on SOC_STARFIVE_VIC7100 || COMPILE_TEST depends on OF - default SOC_STARFIVE + default SOC_STARFIVE_VIC7100 select GENERIC_PINCTRL_GROUPS select GENERIC_PINMUX_FUNCTIONS select GENERIC_PINCONF diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig index cddebdba7177..802e52d5384e 100644 --- a/drivers/reset/starfive/Kconfig +++ b/drivers/reset/starfive/Kconfig @@ -2,7 +2,7 @@ config RESET_STARFIVE_JH7100 bool "StarFive JH7100 Reset Driver" - depends on SOC_STARFIVE || COMPILE_TEST - default SOC_STARFIVE + depends on SOC_STARFIVE_VIC7100 || COMPILE_TEST + default SOC_STARFIVE_VIC7100 help This enables the reset controller driver for the StarFive JH7100 SoC. diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index eb696d09372c..608bafb4bf6e 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -73,7 +73,7 @@ static const struct serial8250_config uart_config[] = { }, [PORT_16550] = { .name = "16550", -#ifdef CONFIG_SOC_STARFIVE +#ifdef CONFIG_SOC_STARFIVE_VIC7100 .fifo_size = 16, .tx_loadsz = 16, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00, |