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

Commit 240d3b54 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:
  tc35815: Use irq number for tc35815-mac platform device id
  [MIPS] Malta: Fix reading the PCI clock frequency on big-endian
  [MIPS] SMTC: Fix build error.
parents a6dbb1ef 06675e6f

arch/mips/mips-boards/malta/malta_setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ void __init plat_mem_setup(void) 
	/* Check PCI clock */

	/* Check PCI clock */

	{

	{

		unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));

		unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));

		int jmpr = (readw(jmpr_p) >> 2) & 0x07;

		int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;

		static const int pciclocks[] __initdata = {

		static const int pciclocks[] __initdata = {

			33, 20, 25, 30, 12, 16, 37, 10

			33, 20, 25, 30, 12, 16, 37, 10

		};

		};

arch/mips/tx4938/toshiba_rbtx4938/setup.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -598,8 +598,8 @@ static int __init rbtx4938_ethaddr_init(void) 
			printk(KERN_WARNING "seeprom: bad checksum.\n");

			printk(KERN_WARNING "seeprom: bad checksum.\n");

	}

	}

	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {

		unsigned int slot = TX4938_PCIC_IDSEL_AD_TO_SLOT(31 - i);

		unsigned int id =

		unsigned int id = (1 << 8) | PCI_DEVFN(slot, 0); /* bus 1 */

			TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);

		struct platform_device *pdev;

		struct platform_device *pdev;

		if (!(tx4938_ccfgptr->pcfg &

		if (!(tx4938_ccfgptr->pcfg &

		      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))

		      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))

drivers/net/tc35815.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data) 
{

{

	struct platform_device *plat_dev = to_platform_device(dev);

	struct platform_device *plat_dev = to_platform_device(dev);

	struct pci_dev *pci_dev = data;

	struct pci_dev *pci_dev = data;

	unsigned int id = (pci_dev->bus->number << 8) | pci_dev->devfn;

	unsigned int id = pci_dev->irq;

	return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id;

	return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id;

}

}

include/asm-mips/smtc_ipi.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ struct smtc_ipi_q { 




static inline void smtc_ipi_nq(struct smtc_ipi_q *q, struct smtc_ipi *p)

static inline void smtc_ipi_nq(struct smtc_ipi_q *q, struct smtc_ipi *p)

{

{

	long flags;

	unsigned long flags;





	spin_lock_irqsave(&q->lock, flags);

	spin_lock_irqsave(&q->lock, flags);

	if (q->head == NULL)

	if (q->head == NULL)
@@ -98,7 +98,7 @@ static inline struct smtc_ipi *smtc_ipi_dq(struct smtc_ipi_q *q) 




static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p)

static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p)

{

{

	long flags;

	unsigned long flags;





	spin_lock_irqsave(&q->lock, flags);

	spin_lock_irqsave(&q->lock, flags);

	if (q->head == NULL) {

	if (q->head == NULL) {
@@ -114,7 +114,7 @@ static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p) 




static inline int smtc_ipi_qdepth(struct smtc_ipi_q *q)

static inline int smtc_ipi_qdepth(struct smtc_ipi_q *q)

{

{

	long flags;

	unsigned long flags;

	int retval;

	int retval;





	spin_lock_irqsave(&q->lock, flags);

	spin_lock_irqsave(&q->lock, flags);