Commit 90bc1a65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (32 commits)
  MIPS: Wire up accept4 syscall.
  MIPS: VPE: Delete unused function get_tc_unused().
  MIPS: VPE: Fix bogus indentation.
  MIPS: VPE: Make various functions static.
  MIPS: VPE: Free relocation chain on error.
  MIPS: VPE: Fix compiler warning.
  MIPS: Module: Make error messages unique.
  MIPS: Octeon: Run IPI code with interrupts disabled.
  MIPS: Jazz: Fix read buffer overflow
  MIPS: Use DIV_ROUND_CLOSEST
  MIPS: MTX-1: Request button GPIO before setting its direction
  MIPS: AR7: Override CFLAGS with -Werror
  MIPS: AR7: Remove unused tnetd7200_get_clock function
  MIPS: AR7: Use DMA_BIT_MASK(nn) instead of deprecated DMA_nnBIT_MASK
  MIPS: AR7: Fix build failures when CONFIG_SERIAL_8250 is not enabled
  MIPS: Fix read buffer overflow
  MIPS: AR7: Fix build warning on memory.c
  MIPS: Octeon PCIe: Make hardware and software bus numbers match.
  MIPS: RBTX4939: Fix IOC pin-enable register updating
  MIPS: Simplify and correct interrupt handling for MSP4200
  ...
parents 6ce90c43 54822de7

arch/mips/alchemy/mtx-1/platform.c

+12 −2
Original line number Diff line number Diff line 
/*

 * MTX-1 platform devices registration

 *

 * Copyright (C) 2007, Florian Fainelli <florian@openwrt.org>

 * Copyright (C) 2007-2009, Florian Fainelli <florian@openwrt.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -142,7 +142,17 @@ static struct __initdata platform_device * mtx1_devs[] = { 


static int __init mtx1_register_devices(void)

{

	gpio_direction_input(207);

	int rc;



	rc = gpio_request(mtx1_gpio_button[0].gpio,

					mtx1_gpio_button[0].desc);

	if (rc < 0) {

		printk(KERN_INFO "mtx1: failed to request %d\n",

					mtx1_gpio_button[0].gpio);

		goto out;

	}

	gpio_direction_input(mtx1_gpio_button[0].gpio);

out:

	return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));

}

arch/mips/ar7/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-y := \ 
	platform.o \

	gpio.o \

	clock.o

EXTRA_CFLAGS += -Werror

arch/mips/ar7/clock.c

+0 −13
Original line number Diff line number Diff line
@@ -264,19 +264,6 @@ static void __init tnetd7300_init_clocks(void) 
	iounmap(bootcr);

}



static int tnetd7200_get_clock(int base, struct tnetd7200_clock *clock,

	u32 *bootcr, u32 bus_clock)

{

	int divisor = ((readl(&clock->prediv) & 0x1f) + 1) *

		((readl(&clock->postdiv) & 0x1f) + 1);



	if (*bootcr & BOOT_PLL_BYPASS)

		return base / divisor;



	return base * ((readl(&clock->mul) & 0xf) + 1) / divisor;

}





static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock,

	int prediv, int postdiv, int postdiv2, int mul, u32 frequency)

{

arch/mips/ar7/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int __init memsize(void) 
		size <<= 1;

	} while (size < (64 << 20));



	writel(tmpaddr, &addr);

	writel((u32)tmpaddr, &addr);



	return size;

}

arch/mips/ar7/platform.c

+5 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/serial_8250.h>

#include <linux/ioport.h>

#include <linux/io.h>

#include <linux/version.h>

#include <linux/vlynq.h>

#include <linux/leds.h>

#include <linux/string.h>
@@ -243,13 +242,13 @@ static struct platform_device physmap_flash = { 
	.num_resources = 1,

};



static u64 cpmac_dma_mask = DMA_32BIT_MASK;

static u64 cpmac_dma_mask = DMA_BIT_MASK(32);

static struct platform_device cpmac_low = {

	.id = 0,

	.name = "cpmac",

	.dev = {

		.dma_mask = &cpmac_dma_mask,

		.coherent_dma_mask = DMA_32BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &cpmac_low_data,

	},

	.resource = cpmac_low_res,
@@ -261,7 +260,7 @@ static struct platform_device cpmac_high = { 
	.name = "cpmac",

	.dev = {

		.dma_mask = &cpmac_dma_mask,

		.coherent_dma_mask = DMA_32BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &cpmac_high_data,

	},

	.resource = cpmac_high_res,
@@ -481,6 +480,7 @@ static void __init detect_leds(void) 
static int __init ar7_register_devices(void)

{

	int res;

#ifdef CONFIG_SERIAL_8250

	static struct uart_port uart_port[2];



	memset(uart_port, 0, sizeof(struct uart_port) * 2);
@@ -512,7 +512,7 @@ static int __init ar7_register_devices(void) 
		if (res)

			return res;

	}



#endif /* CONFIG_SERIAL_8250 */

	res = platform_device_register(&physmap_flash);

	if (res)

		return res;

CRA Git | Maintained and supported by SUSTech CRA and CCSE