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

Commit 0f873d5f 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:
  [SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices
  [MIPS] BCM47xx: Fix build error due to missing PCI functions
  [MIPS] IP27: Switch to dynamic interrupt routing avoding panic on error.
  [MIPS] au1000: Make sure GPIO value is zero or one
parents df45eddc ac82da33

arch/mips/au1000/common/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void au1xxx_gpio2_write(unsigned gpio, int value) 
{

	gpio -= AU1XXX_GPIO_BASE;



	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);

	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | ((!!value) << gpio);

}



static int au1xxx_gpio2_direction_input(unsigned gpio)
@@ -62,7 +62,7 @@ static int au1xxx_gpio2_direction_output(unsigned gpio, int value) 
{

	gpio -= AU1XXX_GPIO_BASE;

	gpio2->dir |= 0x01 << gpio;

	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);

	gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | ((!!value) << gpio);

	return 0;

}

arch/mips/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o 
obj-$(CONFIG_PCI_VR41XX)	+= ops-vr41xx.o pci-vr41xx.o

obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o

obj-$(CONFIG_PCI_TX4927)	+= ops-tx4927.o

obj-$(CONFIG_BCM47XX)		+= pci-bcm47xx.o



#

# These are still pretty much in the old state, watch, go blind.

arch/mips/pci/pci-bcm47xx.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2008 Aurelien Jarno <aurelien@aurel32.net>

 *

 *  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 the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED

 *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF

 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

 *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,

 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF

 *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT

 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *  You should have received a copy of the  GNU General Public License along

 *  with this program; if not, write  to the Free Software Foundation, Inc.,

 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/types.h>

#include <linux/pci.h>

#include <linux/ssb/ssb.h>



int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	return 0;

}



int pcibios_plat_dev_init(struct pci_dev *dev)

{

	int res;

	u8 slot, pin;



	res = ssb_pcibios_plat_dev_init(dev);

	if (res < 0) {

		printk(KERN_ALERT "PCI: Failed to init device %s\n",

		       pci_name(dev));

		return res;

	}



	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);

	slot = PCI_SLOT(dev->devfn);

	res = ssb_pcibios_map_irq(dev, slot, pin);



	/* IRQ-0 and IRQ-1 are software interrupts. */

	if (res < 2) {

		printk(KERN_ALERT "PCI: Failed to map IRQ of device %s\n",

		       pci_name(dev));

		return res;

	}



	dev->irq = res;

	return 0;

}

arch/mips/pci/pci-ip27.c

+31 −9
Original line number Diff line number Diff line
@@ -142,26 +142,48 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) 
 * on any one of the hubs connected to its xbow.

 */

int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	return 0;

}



/* Most MIPS systems have straight-forward swizzling needs.  */

static inline u8 bridge_swizzle(u8 pin, u8 slot)

{

	return (((pin - 1) + slot) % 4) + 1;

}



static inline struct pci_dev *bridge_root_dev(struct pci_dev *dev)

{

	while (dev->bus->parent) {

		/* Move up the chain of bridges. */

		dev = dev->bus->self;

	}



	return dev;

}



/* Do platform specific device initialization at pci_enable_device() time */

int pcibios_plat_dev_init(struct pci_dev *dev)

{

	struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus);

	int irq = bc->pci_int[slot];

	struct pci_dev *rdev = bridge_root_dev(dev);

	int slot = PCI_SLOT(rdev->devfn);

	int irq;



	irq = bc->pci_int[slot];

	if (irq == -1) {

		irq = bc->pci_int[slot] = request_bridge_irq(bc);

		irq = request_bridge_irq(bc);

		if (irq < 0)

			panic("Can't allocate interrupt for PCI device %s\n",

			      pci_name(dev));

			return irq;



		bc->pci_int[slot] = irq;

	}



	irq_to_bridge[irq] = bc;

	irq_to_slot[irq] = slot;



	return irq;

}

	dev->irq = irq;



/* Do platform specific device initialization at pci_enable_device() time */

int pcibios_plat_dev_init(struct pci_dev *dev)

{

	return 0;

}

drivers/ssb/main.c

+1 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ static int ssb_devices_register(struct ssb_bus *bus) 
#endif

			break;

		case SSB_BUSTYPE_SSB:

			dev->dma_mask = &dev->coherent_dma_mask;

			break;

		}