ARM: uniphier: simplify SoC ID get function

[project/bcm63xx/u-boot.git] / arch / arm / mach-uniphier / debug-uart / debug-uart.c

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index d884785acbbe5f87e3f5f3be5017ba73d3acd7c8..72a514dc0e8170d0a67669e0fc51918630d66e6c 100644 (file)
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@@ -32,45 +32,45 @@ void _debug_uart_init(void)
        void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
        unsigned int divisor;
 
-       switch (uniphier_get_soc_type()) {
+       switch (uniphier_get_soc_id()) {
 #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-       case SOC_UNIPHIER_SLD3:
+       case UNIPHIER_SLD3_ID:
                divisor = uniphier_sld3_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
-       case SOC_UNIPHIER_LD4:
+       case UNIPHIER_LD4_ID:
                divisor = uniphier_ld4_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
-       case SOC_UNIPHIER_PRO4:
+       case UNIPHIER_PRO4_ID:
                divisor = uniphier_pro4_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
-       case SOC_UNIPHIER_SLD8:
+       case UNIPHIER_SLD8_ID:
                divisor = uniphier_sld8_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
-       case SOC_UNIPHIER_PRO5:
+       case UNIPHIER_PRO5_ID:
                divisor = uniphier_pro5_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
-       case SOC_UNIPHIER_PXS2:
+       case UNIPHIER_PXS2_ID:
                divisor = uniphier_pxs2_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
-       case SOC_UNIPHIER_LD6B:
+       case UNIPHIER_LD6B_ID:
                divisor = uniphier_ld6b_debug_uart_init();
                break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD11) || defined(CONFIG_ARCH_UNIPHIER_LD20)
-       case SOC_UNIPHIER_LD11:
-       case SOC_UNIPHIER_LD20:
+       case UNIPHIER_LD11_ID:
+       case UNIPHIER_LD20_ID:
                divisor = uniphier_ld20_debug_uart_init();
                break;
 #endif