Merge branch 'master' of git://1984.lsi.us.es/nf

[cascardo/linux.git] / arch / mips / netlogic / xlr / platform.c

diff --git a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c
index 507230e..7b96a91 100644 (file)
--- a/arch/mips/netlogic/xlr/platform.c
+++ b/arch/mips/netlogic/xlr/platform.c
@@ -64,7 +64,7 @@ void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)
                .iotype         = UPIO_MEM32,           \
                .flags          = (UPF_SKIP_TEST |      \
                         UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF),\
-               .uartclk        = PIC_CLKS_PER_SEC,     \
+               .uartclk        = PIC_CLK_HZ,           \
                .type           = PORT_16550A,          \
                .serial_in      = nlm_xlr_uart_in,      \
                .serial_out     = nlm_xlr_uart_out,     \
@@ -162,18 +162,18 @@ int xls_platform_usb_init(void)
        nlm_write_reg(usb_mmio, 50, 0x1f000000);
 
        /* Enable ports */
-       nlm_write_reg(usb_mmio,  1, 0x07000500);
+       nlm_write_reg(usb_mmio,  1, 0x07000500);
 
        val = nlm_read_reg(gpio_mmio, 21);
        if (((val >> 22) & 0x01) == 0) {
                pr_info("Detected USB Device mode - Not supported!\n");
-               nlm_write_reg(usb_mmio,  0, 0x01000000);
+               nlm_write_reg(usb_mmio,  0, 0x01000000);
                return 0;
        }
 
        pr_info("Detected USB Host mode - Adding XLS USB devices.\n");
        /* Clear reset, host mode */
-       nlm_write_reg(usb_mmio,  0, 0x02000000);
+       nlm_write_reg(usb_mmio,  0, 0x02000000);
 
        /* Memory resource for various XLS usb ports */
        usb_mmio = nlm_mmio_base(NETLOGIC_IO_USB_0_OFFSET);
@@ -221,8 +221,8 @@ static struct resource i2c_resources[] = {
 };
 
 static struct platform_device nlm_xlr_i2c_1 = {
-       .name           = "xlr-i2cbus",
-       .id             = 1,
+       .name           = "xlr-i2cbus",
+       .id             = 1,
        .num_resources  = 1,
        .resource       = i2c_resources,
 };