MIPS: Netlogic: Move code common with XLP to common/

- Move code that can be shared with XLP (irq.c, smp.c, time.c and
  xlr_console.c) to arch/mips/netlogic/common
- Add asm/netlogic/haldefs.h and asm/netlogic/common.h for common and
  io functions shared with XLP
- remove type 'nlm_reg_t *' and use uint64_t for mmio offsets
- Move XLR specific code in smp.c to xlr/wakeup.c
- Move XLR specific PCI code from irq.c to mips/pci/pci-xlr.c
- Provide API for pic functions called from common/irq.c

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2964/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 16 insertions, 8 deletions

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index cee25ddd0887..20c280ae7e99 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -39,26 +39,28 @@
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <asm/bootinfo.h>
-#include <asm/smp-ops.h>
 
 #include <asm/netlogic/interrupt.h>
 #include <asm/netlogic/psb-bootinfo.h>
+#include <asm/netlogic/haldefs.h>
+#include <asm/netlogic/common.h>
 
 #include <asm/netlogic/xlr/xlr.h>
 #include <asm/netlogic/xlr/iomap.h>
 #include <asm/netlogic/xlr/pic.h>
 #include <asm/netlogic/xlr/gpio.h>
 
-unsigned long netlogic_io_base = (unsigned long)(DEFAULT_NETLOGIC_IO_BASE);
+uint64_t nlm_io_base = DEFAULT_NETLOGIC_IO_BASE;
+uint64_t nlm_pic_base;
 unsigned long nlm_common_ebase = 0x0;
 struct psb_info nlm_prom_info;
 
 static void __init nlm_early_serial_setup(void)
 {
         struct uart_port s;
-        nlm_reg_t *uart_base;
+        unsigned long uart_base;
 
-        uart_base = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);
+        uart_base = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);
         memset(&s, 0, sizeof(s));
         s.flags         = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
         s.iotype        = UPIO_MEM32;
@@ -67,18 +69,18 @@ static void __init nlm_early_serial_setup(void)
         s.uartclk       = PIC_CLKS_PER_SEC;
         s.serial_in     = nlm_xlr_uart_in;
         s.serial_out    = nlm_xlr_uart_out;
-        s.mapbase       = (unsigned long)uart_base;
+        s.mapbase       = uart_base;
         s.membase       = (unsigned char __iomem *)uart_base;
         early_serial_setup(&s);
 }
 
 static void nlm_linux_exit(void)
 {
-        nlm_reg_t *mmio;
+        uint64_t gpiobase;
 
-        mmio = netlogic_io_mmio(NETLOGIC_IO_GPIO_OFFSET);
+        gpiobase = nlm_mmio_base(NETLOGIC_IO_GPIO_OFFSET);
         /* trigger a chip reset by writing 1 to GPIO_SWRESET_REG */
-        netlogic_write_reg(mmio, NETLOGIC_GPIO_SWRESET_REG, 1);
+        nlm_write_reg(gpiobase, NETLOGIC_GPIO_SWRESET_REG, 1);
         for ( ; ; )
                 cpu_wait();
 }
@@ -96,6 +98,11 @@ const char *get_system_type(void)
         return "Netlogic XLR/XLS Series";
 }
 
+unsigned int nlm_get_cpu_frequency(void)
+{
+        return (unsigned int)nlm_prom_info.cpu_frequency;
+}
+
 void __init prom_free_prom_memory(void)
 {
         /* Nothing yet */
@@ -175,6 +182,7 @@ void __init prom_init(void)
         prom_infop = (struct psb_info *)(long)(int)fw_arg3;
 
         nlm_prom_info = *prom_infop;
+        nlm_pic_base = nlm_mmio_base(NETLOGIC_IO_PIC_OFFSET);
 
         nlm_early_serial_setup();
         build_arcs_cmdline(argv);