clk: socfpga: merge ARCH_SOCFPGA and ARCH_STRATIX10

Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
one for both of them.  This the common practice for other platforms.
Additionally, the ARCH_SOCFPGA is too generic as SoCFPGA designs come
from multiple vendors.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 12e46b12e587f08c9f5dd1ddc745d7755dac9462..1e29e5ad107a1e5fc76b27824593eedf5fdd53a2 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -104,10 +104,9 @@ obj-y                                      += renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)            += rockchip/
 obj-$(CONFIG_COMMON_CLK_SAMSUNG)       += samsung/
 obj-$(CONFIG_CLK_SIFIVE)               += sifive/
-obj-$(CONFIG_ARCH_SOCFPGA)             += socfpga/
+obj-$(CONFIG_ARCH_INTEL_SOCFPGA)       += socfpga/
 obj-$(CONFIG_ARCH_AGILEX)              += socfpga/
 obj-$(CONFIG_ARCH_N5X)                 += socfpga/
-obj-$(CONFIG_ARCH_STRATIX10)           += socfpga/
 obj-$(CONFIG_PLAT_SPEAR)               += spear/
 obj-y                                  += sprd/
 obj-$(CONFIG_ARCH_STI)                 += st/