Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (73efd00d) · Commits · 戴 / test

arch/arm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -547,6 +547,7 @@ config ARCH_KIRKWOOD
	select CPU_FEROCEON		select CPU_FEROCEON
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select PCI		select PCI
			select PCI_QUIRKS
	select PLAT_ORION_LEGACY		select PLAT_ORION_LEGACY
	help		help
	Support for the following Marvell Kirkwood series SoCs:		Support for the following Marvell Kirkwood series SoCs:

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ static inline int pmu_to_irq(int pin)

	static inline int irq_to_pmu(int irq)		static inline int irq_to_pmu(int irq)
	{		{
	if (IRQ_DOVE_PMU_START < irq && irq < NR_IRQS)		if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS)
	return irq - IRQ_DOVE_PMU_START;		return irq - IRQ_DOVE_PMU_START;

	return -EINVAL;		return -EINVAL;

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,8 +46,20 @@ static void pmu_irq_ack(struct irq_data *d)
	int pin = irq_to_pmu(d->irq);		int pin = irq_to_pmu(d->irq);
	u32 u;		u32 u;

			/*
			* The PMU mask register is not RW0C: it is RW. This means that
			* the bits take whatever value is written to them; if you write
			* a '1', you will set the interrupt.
			*
			* Unfortunately this means there is NO race free way to clear
			* these interrupts.
			*
			* So, let's structure the code so that the window is as small as
			* possible.
			*/
	u = ~(1 << (pin & 31));		u = ~(1 << (pin & 31));
	writel(u, PMU_INTERRUPT_CAUSE);		u &= readl_relaxed(PMU_INTERRUPT_CAUSE);
			writel_relaxed(u, PMU_INTERRUPT_CAUSE);
	}		}

	static struct irq_chip pmu_irq_chip = {		static struct irq_chip pmu_irq_chip = {

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -207,14 +207,19 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
	return 1;		return 1;
	}		}

	static void __devinit rc_pci_fixup(struct pci_dev *dev)
	{
	/*		/*
	* Prevent enumeration of root complex.		* The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it
			* is operating as a root complex this needs to be switched to
			* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on
			* the device. Decoding setup is handled by the orion code.
	*/		*/
			static void __devinit rc_pci_fixup(struct pci_dev *dev)
			{
	if (dev->bus->parent == NULL && dev->devfn == 0) {		if (dev->bus->parent == NULL && dev->devfn == 0) {
	int i;		int i;

			dev->class &= 0xff;
			dev->class \|= PCI_CLASS_BRIDGE_HOST << 8;
	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {		for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
	dev->resource[i].start = 0;		dev->resource[i].start = 0;
	dev->resource[i].end = 0;		dev->resource[i].end = 0;

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -473,13 +473,14 @@ int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
	pr_debug("dma%d: %s: buffer %p queued onto non-empty channel\n",		pr_debug("dma%d: %s: buffer %p queued onto non-empty channel\n",
	chan->number, __func__, buf);		chan->number, __func__, buf);

	if (chan->end == NULL)		if (chan->end == NULL) {
	pr_debug("dma%d: %s: %p not empty, and chan->end==NULL?\n",		pr_debug("dma%d: %s: %p not empty, and chan->end==NULL?\n",
	chan->number, __func__, chan);		chan->number, __func__, chan);
			} else {
	chan->end->next = buf;		chan->end->next = buf;
	chan->end = buf;		chan->end = buf;
	}		}
			}

	/* if necessary, update the next buffer field */		/* if necessary, update the next buffer field */
	if (chan->next == NULL)		if (chan->next == NULL)