ARM: rmobile: Drop CPU type ifdef from salvator-x

We can now use rmobile_get_cpu_type() to check the CPU ID rather
than using a macro, make it so.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index debd1db7214973ad607c77323b911560c1313f0e..1b8ae574c573bc311fec454ccaa8ddc362201b24 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -79,17 +79,19 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
+       u32 cpu_type = rmobile_get_cpu_type();
+
        /* adress of boot parameters */
        gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
 
-#if defined(CONFIG_R8A7795)
-       /* GSX: force power and clock supply */
-       writel(0x0000001F, SYSC_PWRONCR2);
-       while (readl(SYSC_PWRSR2) != 0x000003E0)
-               mdelay(20);
+       if (cpu_type == RMOBILE_CPU_TYPE_R8A7795) {
+               /* GSX: force power and clock supply */
+               writel(0x0000001F, SYSC_PWRONCR2);
+               while (readl(SYSC_PWRSR2) != 0x000003E0)
+                       mdelay(20);
 
-       mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
-#endif
+               mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
+       }
 
        /* USB1 pull-up */
        setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);