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

Commit e8294de5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'kumar/next' into next 

A few more fsl updates from Kumar
parents 9aae3412 4d56dec5

arch/powerpc/configs/85xx/p1023rds_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ CONFIG_SND=y 
CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

# CONFIG_SND_SUPPORT_OLD_API is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_FSL=y

CONFIG_USB_STORAGE=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int smp_request_message_ipi(int virq, int msg) 
	}

#endif

	err = request_irq(virq, smp_ipi_action[msg],

			  IRQF_PERCPU | IRQF_NO_THREAD,

			  IRQF_PERCPU | IRQF_NO_THREAD | IRQF_NO_SUSPEND,

			  smp_ipi_name[msg], 0);

	WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",

		virq, smp_ipi_name[msg], err);

arch/powerpc/sysdev/fsl_ifc.c

+8 −12
Original line number Diff line number Diff line
@@ -244,12 +244,6 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev) 
	/* get the nand machine irq */

	fsl_ifc_ctrl_dev->nand_irq =

			irq_of_parse_and_map(dev->dev.of_node, 1);

	if (fsl_ifc_ctrl_dev->nand_irq == NO_IRQ) {

		dev_err(&dev->dev, "failed to get irq resource "

						"for NAND Machine\n");

		ret = -ENODEV;

		goto err;

	}



	fsl_ifc_ctrl_dev->dev = &dev->dev;
@@ -267,13 +261,15 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev) 
		goto err_irq;

	}



	ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, 0,

			  "fsl-ifc-nand", fsl_ifc_ctrl_dev);

	if (fsl_ifc_ctrl_dev->nand_irq) {

		ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq,

				0, "fsl-ifc-nand", fsl_ifc_ctrl_dev);

		if (ret != 0) {

			dev_err(&dev->dev, "failed to install irq (%d)\n",

				fsl_ifc_ctrl_dev->nand_irq);

			goto err_nandirq;

		}

	}



	return 0;

arch/powerpc/sysdev/fsl_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -864,7 +864,9 @@ static int __devinit fsl_pci_probe(struct platform_device *pdev) 
{

	int ret;

	struct device_node *node;

#ifdef CONFIG_SWIOTLB

	struct pci_controller *hose;

#endif



	node = pdev->dev.of_node;

	ret = fsl_add_bridge(node, fsl_pci_primary == node);