Re: linux-next: manual merge of the arm-soc tree with the devicetree tree
Stephen,
Glad to see you're back at it! Nice meeting you and your wife in
Edinburgh.
Adding Thomas Petazzoni to the Cc.
On Thu, Oct 31, 2013 at 07:23:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/pci/host/pci-mvebu.c between commit 16b84e5a505c ("of/irq: Create
> of_irq_parse_and_map_pci() to consolidate arch code.") from the
> devicetree tree and commit e5615c30c1c9 ("PCI: mvebu: remove
> subsys_initcall") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This looks fine by me.
thx,
Jason.
> diff --cc drivers/pci/host/pci-mvebu.c
> index 07ddb3a13c6e,80b2250ea19a..
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@@ -693,9 -732,10 +719,10 @@@ static void mvebu_pcie_enable(struct mv
> hw.private_data = (void **)&pcie;
> hw.setup = mvebu_pcie_setup;
> hw.scan = mvebu_pcie_scan_bus;
> -hw.map_irq= mvebu_pcie_map_irq;
> +hw.map_irq= of_irq_parse_and_map_pci;
> hw.ops= &mvebu_pcie_ops;
> hw.align_resource = mvebu_pcie_align_resource;
> + hw.add_bus= mvebu_pcie_add_bus;
>
> pci_common_init(&hw);
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the arm-soc tree with the devicetree tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pci/host/pci-mvebu.c between commit 16b84e5a505c ("of/irq: Create
of_irq_parse_and_map_pci() to consolidate arch code.") from the
devicetree tree and commit e5615c30c1c9 ("PCI: mvebu: remove
subsys_initcall") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/pci/host/pci-mvebu.c
index 07ddb3a13c6e,80b2250ea19a..
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@@ -693,9 -732,10 +719,10 @@@ static void mvebu_pcie_enable(struct mv
hw.private_data = (void **)&pcie;
hw.setup = mvebu_pcie_setup;
hw.scan = mvebu_pcie_scan_bus;
- hw.map_irq= mvebu_pcie_map_irq;
+ hw.map_irq= of_irq_parse_and_map_pci;
hw.ops= &mvebu_pcie_ops;
hw.align_resource = mvebu_pcie_align_resource;
+ hw.add_bus= mvebu_pcie_add_bus;
pci_common_init(&hw);
}
pgp24u9KQIJ7K.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the devicetree tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-integrator/pci_v3.c between commit 16b84e5a505c ("of/irq:
Create of_irq_parse_and_map_pci() to consolidate arch code") from the
devicetree tree and commit d7057e1de8d6 ("ARM: integrator: delete
non-devicetree boot path") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-integrator/pci_v3.c
index a87e510fe0c4,c9c5a33bc802..
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@@ -809,21 -808,22 +808,6 @@@ static u8 __init pci_v3_swizzle(struct
return pci_common_swizzle(dev, pinp);
}
- static int irq_tab[4] __initdata = {
- IRQ_AP_PCIINT0, IRQ_AP_PCIINT1, IRQ_AP_PCIINT2, IRQ_AP_PCIINT3
- };
-
- /*
- * map the specified device/slot/pin to an IRQ. This works out such
- * that slot 9 pin 1 is INT0, pin 2 is INT1, and slot 10 pin 1 is INT1.
- */
- static int __init pci_v3_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-static int __init pci_v3_map_irq_dt(const struct pci_dev *dev, u8 slot, u8
pin)
--{
- int intnr = ((slot - 9) + (pin - 1)) & 3;
- struct of_irq oirq;
- int ret;
--
- return irq_tab[intnr];
- ret = of_irq_map_pci(dev, &oirq);
- if (ret) {
- dev_err(&dev->dev, "of_irq_map_pci() %d\n", ret);
- /* Proper return code 0 == NO_IRQ */
- return 0;
- }
-
- return irq_create_of_mapping(oirq.controller, oirq.specifier,
- oirq.size);
--}
--
static struct hw_pci pci_v3 __initdata = {
.swizzle= pci_v3_swizzle,
.setup = pci_v3_setup,
pgptXrQhLK_9t.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the devicetree tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-vexpress/v2m.c between commit 465aac6d496a ("Fix build when
CONFIG_W1_MASTER_GPIO=m b exporting "allnodes"") from the devicetree tree
and commit 0891642cf117 ("ARM: vexpress: Start using new Versatile
Express infrastructure") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-vexpress/v2m.c
index 359f782,4e168e8..000
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -580,20 -420,13 +420,13 @@@ void __init v2m_dt_map_io(void
void __init v2m_dt_init_early(void)
{
- struct device_node *node;
u32 dt_hbi;
- node = of_find_compatible_node(NULL, NULL, "arm,vexpress-sysreg");
- v2m_sysreg_base = of_iomap(node, 0);
- if (WARN_ON(!v2m_sysreg_base))
- return;
+ vexpress_sysreg_of_early_init();
/* Confirm board type against DT property, if available */
- if (of_property_read_u32(allnodes, "arm,hbi", &dt_hbi) == 0) {
+ if (of_property_read_u32(of_allnodes, "arm,hbi", &dt_hbi) == 0) {
- int site = v2m_get_master_site();
- u32 id = readl(v2m_sysreg_base + (site == SYS_CFG_SITE_DB2 ?
- V2M_SYS_PROCID1 : V2M_SYS_PROCID0));
- u32 hbi = id & SYS_PROCIDx_HBI_MASK;
+ u32 hbi = vexpress_get_hbi(VEXPRESS_SITE_MASTER);
if (WARN_ON(dt_hbi != hbi))
pr_warning("vexpress: DT HBI (%x) is not matching "
pgpWa88GhAU4f.pgp
Description: PGP signature
