Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94bf2758 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

parents d93c333d f539dfed

arch/arm/mach-dove/include/mach/io.h

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#define IO_SPACE_LIMIT		0xffffffff



#define __io(a)  ((void __iomem *)(((a) - DOVE_PCIE0_IO_PHYS_BASE) +\

#define __io(a)  	((void __iomem *)(((a) - DOVE_PCIE0_IO_BUS_BASE) + \

						 DOVE_PCIE0_IO_VIRT_BASE))

#define __mem_pci(a)	(a)

arch/arm/mach-kirkwood/include/mach/kirkwood.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define KIRKWOOD_PCIE1_IO_PHYS_BASE	0xf3000000

#define KIRKWOOD_PCIE1_IO_VIRT_BASE	0xfef00000

#define KIRKWOOD_PCIE1_IO_BUS_BASE	0x00000000

#define KIRKWOOD_PCIE1_IO_BUS_BASE	0x00100000

#define KIRKWOOD_PCIE1_IO_SIZE		SZ_1M



#define KIRKWOOD_PCIE_IO_PHYS_BASE	0xf2000000

arch/arm/mach-kirkwood/pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void __init pcie0_ioresources_init(struct pcie_port *pp) 
	 * IORESOURCE_IO

	 */

	pp->res[0].name = "PCIe 0 I/O Space";

	pp->res[0].start = KIRKWOOD_PCIE_IO_PHYS_BASE;

	pp->res[0].start = KIRKWOOD_PCIE_IO_BUS_BASE;

	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1;

	pp->res[0].flags = IORESOURCE_IO;
@@ -139,7 +139,7 @@ static void __init pcie1_ioresources_init(struct pcie_port *pp) 
	 * IORESOURCE_IO

	 */

	pp->res[0].name = "PCIe 1 I/O Space";

	pp->res[0].start = KIRKWOOD_PCIE1_IO_PHYS_BASE;

	pp->res[0].start = KIRKWOOD_PCIE1_IO_BUS_BASE;

	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE1_IO_SIZE - 1;

	pp->res[0].flags = IORESOURCE_IO;

drivers/dma/mv_xor.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int mv_is_err_intr(u32 intr_cause) 


static void mv_xor_device_clear_eoc_cause(struct mv_xor_chan *chan)

{

	u32 val = (1 << (1 + (chan->idx * 16)));

	u32 val = ~(1 << (chan->idx * 16));

	dev_dbg(chan->device->common.dev, "%s, val 0x%08x\n", __func__, val);

	__raw_writel(val, XOR_INTR_CAUSE(chan));

}

drivers/leds/leds-ns2.c

+5 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int ns2_led_get_mode(struct ns2_led_data *led_dat, 
	int cmd_level;

	int slow_level;



	read_lock(&led_dat->rw_lock);

	read_lock_irq(&led_dat->rw_lock);



	cmd_level = gpio_get_value(led_dat->cmd);

	slow_level = gpio_get_value(led_dat->slow);
@@ -95,7 +95,7 @@ static int ns2_led_get_mode(struct ns2_led_data *led_dat, 
		}

	}



	read_unlock(&led_dat->rw_lock);

	read_unlock_irq(&led_dat->rw_lock);



	return ret;

}
@@ -104,8 +104,9 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat, 
			     enum ns2_led_modes mode)

{

	int i;

	unsigned long flags;



	write_lock(&led_dat->rw_lock);

	write_lock_irqsave(&led_dat->rw_lock, flags);



	for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) {

		if (mode == ns2_led_modval[i].mode) {
@@ -116,7 +117,7 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat, 
		}

	}



	write_unlock(&led_dat->rw_lock);

	write_unlock_irqrestore(&led_dat->rw_lock, flags);

}



static void ns2_led_set(struct led_classdev *led_cdev,