| Message ID | 1311065631-3429-14-git-send-email-dbaryshkov@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kumar Gala |
| Headers | show |
On Jul 19, 2011, at 3:53 AM, Dmitry Eremin-Solenikov wrote: > 85xx board files have a lot of duplication in *_publish_devices()/ > *_declare_of_platform_devices() functions. Merge that into a single > function common to most of the boards. > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > --- > arch/powerpc/platforms/85xx/Makefile | 2 + > arch/powerpc/platforms/85xx/ksi8560.c | 18 +--------- > arch/powerpc/platforms/85xx/mpc8536_ds.c | 16 ++------- > arch/powerpc/platforms/85xx/mpc85xx.h | 4 ++ > arch/powerpc/platforms/85xx/mpc85xx_ads.c | 20 ++--------- > arch/powerpc/platforms/85xx/mpc85xx_cds.c | 16 ++------- > arch/powerpc/platforms/85xx/mpc85xx_common.c | 26 ++++++++++++++ > arch/powerpc/platforms/85xx/mpc85xx_ds.c | 20 +++-------- > arch/powerpc/platforms/85xx/mpc85xx_mds.c | 46 ++----------------------- > arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 16 ++------- > arch/powerpc/platforms/85xx/p1022_ds.c | 7 ++-- > arch/powerpc/platforms/85xx/sbc8548.c | 18 ++-------- > arch/powerpc/platforms/85xx/sbc8560.c | 20 ++--------- > arch/powerpc/platforms/85xx/socrates.c | 13 +------ > arch/powerpc/platforms/85xx/stx_gp3.c | 16 ++------- > arch/powerpc/platforms/85xx/tqm85xx.c | 16 ++------- > arch/powerpc/platforms/85xx/xes_mpc85xx.c | 20 +++-------- > 17 files changed, 77 insertions(+), 217 deletions(-) > create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h > create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_common.c In general this looks ok, can you refactor so its earlier in the patch sequence - k > > diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile > index 43b2162..ca4b1b9 100644 > --- a/arch/powerpc/platforms/85xx/Makefile > +++ b/arch/powerpc/platforms/85xx/Makefile > @@ -3,6 +3,8 @@ > # > obj-$(CONFIG_SMP) += smp.o > > +obj-y += mpc85xx_common.o > + > obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o > obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o > obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o > diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c > index c46f935..7657e1a 100644 > --- a/arch/powerpc/platforms/85xx/ksi8560.c > +++ b/arch/powerpc/platforms/85xx/ksi8560.c > @@ -35,6 +35,7 @@ > #include <asm/cpm2.h> > #include <sysdev/cpm2_pic.h> > > +#include "mpc85xx.h" > > #define KSI8560_CPLD_HVR 0x04 /* Hardware Version Register */ > #define KSI8560_CPLD_PVR 0x08 /* PLD Version Register */ > @@ -215,22 +216,7 @@ static void ksi8560_show_cpuinfo(struct seq_file *m) > seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .type = "soc", }, > - { .type = "simple-bus", }, > - { .name = "cpm", }, > - { .name = "localbus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(ksi8560, declare_of_platform_devices); > +machine_device_initcall(ksi8560, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c > index f79f2f1..9ee6455 100644 > --- a/arch/powerpc/platforms/85xx/mpc8536_ds.c > +++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c > @@ -32,6 +32,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > void __init mpc8536_ds_pic_init(void) > { > struct mpic *mpic; > @@ -104,19 +106,7 @@ static void __init mpc8536_ds_setup_arch(void) > printk("MPC8536 DS board from Freescale Semiconductor\n"); > } > > -static struct of_device_id __initdata mpc8536_ds_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init mpc8536_ds_publish_devices(void) > -{ > - return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL); > -} > -machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices); > +machine_device_initcall(mpc8536_ds, mpc85xx_common_publish_devices); > > machine_arch_initcall(mpc8536_ds, swiotlb_setup_bus_notifier); > > diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h > new file mode 100644 > index 0000000..1a1b4eb > --- /dev/null > +++ b/arch/powerpc/platforms/85xx/mpc85xx.h > @@ -0,0 +1,4 @@ > +#ifndef MPC85xx_H > +#define MPC85xx_H > +extern int mpc85xx_common_publish_devices(void); > +#endif > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c > index 2483929..3bc2acc 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c > @@ -35,6 +35,8 @@ > #include <sysdev/cpm2_pic.h> > #endif > > +#include "mpc85xx.h" > + > #ifdef CONFIG_PCI > static int mpc85xx_exclude_device(struct pci_controller *hose, > u_char bus, u_char devfn) > @@ -219,23 +221,7 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) > seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .name = "soc", }, > - { .type = "soc", }, > - { .name = "cpm", }, > - { .name = "localbus", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(mpc85xx_ads, declare_of_platform_devices); > +machine_device_initcall(mpc85xx_ads, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c > index e209c23..281ecc5 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c > @@ -47,6 +47,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > /* CADMUS info */ > /* xxx - galak, move into device tree */ > #define CADMUS_BASE (0xf8004000) > @@ -328,19 +330,7 @@ static int __init mpc85xx_cds_probe(void) > return of_flat_dt_is_compatible(root, "MPC85xxCDS"); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - return of_platform_bus_probe(NULL, of_bus_ids, NULL); > -} > -machine_device_initcall(mpc85xx_cds, declare_of_platform_devices); > +machine_device_initcall(mpc85xx_cds, mpc85xx_common_publish_devices); > > define_machine(mpc85xx_cds) { > .name = "MPC85xx CDS", > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_common.c b/arch/powerpc/platforms/85xx/mpc85xx_common.c > new file mode 100644 > index 0000000..999567a > --- /dev/null > +++ b/arch/powerpc/platforms/85xx/mpc85xx_common.c > @@ -0,0 +1,26 @@ > +/* > + * Routines common to most mpc85xx-based boards. > + * > + * This is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +#include <linux/kernel.h> > +#include <linux/of_platform.h> > + > +#include "mpc85xx.h" > + > +static struct of_device_id __initdata mpc85xx_common_ids[] = { > + { .type = "soc", }, > + { .compatible = "soc", }, > + { .compatible = "simple-bus", }, > + { .compatible = "gianfar", }, > + { .compatible = "fsl,qe", }, > + { .compatible = "fsl,cpm2", }, > + {}, > +}; > + > +int __init mpc85xx_common_publish_devices(void) > +{ > + return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL); > +} > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c > index 53bf07d..7a0b728 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c > @@ -36,6 +36,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > #undef DEBUG > > #ifdef DEBUG > @@ -216,21 +218,9 @@ static int __init mpc8544_ds_probe(void) > return 0; > } > > -static struct of_device_id __initdata mpc85xxds_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init mpc85xxds_publish_devices(void) > -{ > - return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL); > -} > -machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices); > -machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices); > -machine_device_initcall(p2020_ds, mpc85xxds_publish_devices); > +machine_device_initcall(mpc8544_ds, mpc85xx_common_publish_devices); > +machine_device_initcall(mpc8572_ds, mpc85xx_common_publish_devices); > +machine_device_initcall(p2020_ds, mpc85xx_common_publish_devices); > > machine_arch_initcall(mpc8544_ds, swiotlb_setup_bus_notifier); > machine_arch_initcall(mpc8572_ds, swiotlb_setup_bus_notifier); > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c > index 747d1ee..fde37e5 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c > @@ -53,6 +53,8 @@ > #include <asm/mpic.h> > #include <asm/swiotlb.h> > > +#include "mpc85xx.h" > + > #undef DEBUG > #ifdef DEBUG > #define DBG(fmt...) udbg_printf(fmt) > @@ -159,25 +161,6 @@ extern void __init mpc85xx_smp_init(void); > #endif > > #ifdef CONFIG_QUICC_ENGINE > -static struct of_device_id mpc85xx_qe_ids[] __initdata = { > - { .type = "qe", }, > - { .compatible = "fsl,qe", }, > - { }, > -}; > - > -static void __init mpc85xx_publish_qe_devices(void) > -{ > - struct device_node *np; > - > - np = of_find_compatible_node(NULL, NULL, "fsl,qe"); > - if (!of_device_is_available(np)) { > - of_node_put(np); > - return; > - } > - > - of_platform_bus_probe(NULL, mpc85xx_qe_ids, NULL); > -} > - > static void __init mpc85xx_mds_reset_ucc_phys(void) > { > struct device_node *np; > @@ -348,7 +331,6 @@ static void __init mpc85xx_mds_qeic_init(void) > of_node_put(np); > } > #else > -static void __init mpc85xx_publish_qe_devices(void) { } > static void __init mpc85xx_mds_qe_init(void) { } > static void __init mpc85xx_mds_qeic_init(void) { } > #endif /* CONFIG_QUICC_ENGINE */ > @@ -430,24 +412,12 @@ machine_arch_initcall(mpc8568_mds, board_fixups); > machine_arch_initcall(mpc8569_mds, board_fixups); > > static struct of_device_id mpc85xx_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > { .compatible = "fsl,rapidio-delta", }, > { .compatible = "fsl,mpc8548-guts", }, > { .compatible = "gpio-leds", }, > {}, > }; > > -static struct of_device_id p1021_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > static int __init mpc85xx_publish_devices(void) > { > if (machine_is(mpc8568_mds)) > @@ -455,23 +425,15 @@ static int __init mpc85xx_publish_devices(void) > if (machine_is(mpc8569_mds)) > simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); > > + mpc85xx_common_publish_devices(); > of_platform_bus_probe(NULL, mpc85xx_ids, NULL); > - mpc85xx_publish_qe_devices(); > - > - return 0; > -} > - > -static int __init p1021_publish_devices(void) > -{ > - of_platform_bus_probe(NULL, p1021_ids, NULL); > - mpc85xx_publish_qe_devices(); > > return 0; > } > > machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices); > machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices); > -machine_device_initcall(p1021_mds, p1021_publish_devices); > +machine_device_initcall(p1021_mds, mpc85xx_common_publish_devices); > > machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier); > machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier); > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > index 7a3a37b..5846025 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > @@ -30,6 +30,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > #undef DEBUG > > #ifdef DEBUG > @@ -108,19 +110,7 @@ static void __init mpc85xx_rdb_setup_arch(void) > printk(KERN_INFO "MPC85xx RDB board from Freescale Semiconductor\n"); > } > > -static struct of_device_id __initdata mpc85xxrdb_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init mpc85xxrdb_publish_devices(void) > -{ > - return of_platform_bus_probe(NULL, mpc85xxrdb_ids, NULL); > -} > -machine_device_initcall(mpc85xx_rdb, mpc85xxrdb_publish_devices); > +machine_device_initcall(mpc85xx_rdb, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c > index 266b3aa..26e6f75 100644 > --- a/arch/powerpc/platforms/85xx/p1022_ds.c > +++ b/arch/powerpc/platforms/85xx/p1022_ds.c > @@ -27,6 +27,8 @@ > #include <sysdev/fsl_pci.h> > #include <asm/fsl_guts.h> > > +#include "mpc85xx.h" > + > #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) > > /* > @@ -325,10 +327,6 @@ static void __init p1022_ds_setup_arch(void) > } > > static struct of_device_id __initdata p1022_ds_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > /* So that the DMA channel nodes can be probed individually: */ > { .compatible = "fsl,eloplus-dma", }, > {}, > @@ -338,6 +336,7 @@ static int __init p1022_ds_publish_devices(void) > { > return of_platform_bus_probe(NULL, p1022_ds_ids, NULL); > } > +machine_device_initcall(p1022_ds, mpc85xx_common_publish_devices); > machine_device_initcall(p1022_ds, p1022_ds_publish_devices); > > machine_arch_initcall(p1022_ds, swiotlb_setup_bus_notifier); > diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c > index 2eeb376..42343ac 100644 > --- a/arch/powerpc/platforms/85xx/sbc8548.c > +++ b/arch/powerpc/platforms/85xx/sbc8548.c > @@ -49,6 +49,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > static int sbc_rev = -EINVAL; > > static void __init sbc8548_pic_init(void) > @@ -152,21 +154,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m) > seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .name = "soc", }, > - { .type = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(sbc8548, declare_of_platform_devices); > +machine_device_initcall(sbc8548, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c > index 678f5a8..bbb656f 100644 > --- a/arch/powerpc/platforms/85xx/sbc8560.c > +++ b/arch/powerpc/platforms/85xx/sbc8560.c > @@ -37,6 +37,8 @@ > #include <sysdev/cpm2_pic.h> > #endif > > +#include "mpc85xx.h" > + > #ifdef CONFIG_CPM2 > > static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) > @@ -208,23 +210,7 @@ static void sbc8560_show_cpuinfo(struct seq_file *m) > seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .name = "soc", }, > - { .type = "soc", }, > - { .name = "cpm", }, > - { .name = "localbus", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(sbc8560, declare_of_platform_devices); > +machine_device_initcall(sbc8560, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c > index 747d8fb..fec496a 100644 > --- a/arch/powerpc/platforms/85xx/socrates.c > +++ b/arch/powerpc/platforms/85xx/socrates.c > @@ -41,6 +41,7 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > #include "socrates_fpga_pic.h" > > static void __init socrates_pic_init(void) > @@ -96,17 +97,7 @@ static void __init socrates_setup_arch(void) > #endif > } > > -static struct of_device_id __initdata socrates_of_bus_ids[] = { > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init socrates_publish_devices(void) > -{ > - return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); > -} > -machine_device_initcall(socrates, socrates_publish_devices); > +machine_device_initcall(socrates, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c > index 5387e9f..ab80044 100644 > --- a/arch/powerpc/platforms/85xx/stx_gp3.c > +++ b/arch/powerpc/platforms/85xx/stx_gp3.c > @@ -40,6 +40,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > #ifdef CONFIG_CPM2 > #include <asm/cpm2.h> > #include <sysdev/cpm2_pic.h> > @@ -144,19 +146,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m) > seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); > } > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(stx_gp3, declare_of_platform_devices); > +machine_device_initcall(stx_gp3, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c > index 325de77..19e711f 100644 > --- a/arch/powerpc/platforms/85xx/tqm85xx.c > +++ b/arch/powerpc/platforms/85xx/tqm85xx.c > @@ -38,6 +38,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > #ifdef CONFIG_CPM2 > #include <asm/cpm2.h> > #include <sysdev/cpm2_pic.h> > @@ -173,19 +175,7 @@ static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev) > DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520, > tqm85xx_ti1520_fixup); > > -static struct of_device_id __initdata of_bus_ids[] = { > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init declare_of_platform_devices(void) > -{ > - of_platform_bus_probe(NULL, of_bus_ids, NULL); > - > - return 0; > -} > -machine_device_initcall(tqm85xx, declare_of_platform_devices); > +machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices); > > static const char *board[] __initdata = { > "tqc,tqm8540", > diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c > index 0125604..0ee3721 100644 > --- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c > +++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c > @@ -33,6 +33,8 @@ > #include <sysdev/fsl_soc.h> > #include <sysdev/fsl_pci.h> > > +#include "mpc85xx.h" > + > /* A few bit definitions needed for fixups on some boards */ > #define MPC85xx_L2CTL_L2E 0x80000000 /* L2 enable */ > #define MPC85xx_L2CTL_L2I 0x40000000 /* L2 flash invalidate */ > @@ -177,21 +179,9 @@ static void __init xes_mpc85xx_setup_arch(void) > #endif > } > > -static struct of_device_id __initdata xes_mpc85xx_ids[] = { > - { .type = "soc", }, > - { .compatible = "soc", }, > - { .compatible = "simple-bus", }, > - { .compatible = "gianfar", }, > - {}, > -}; > - > -static int __init xes_mpc85xx_publish_devices(void) > -{ > - return of_platform_bus_probe(NULL, xes_mpc85xx_ids, NULL); > -} > -machine_device_initcall(xes_mpc8572, xes_mpc85xx_publish_devices); > -machine_device_initcall(xes_mpc8548, xes_mpc85xx_publish_devices); > -machine_device_initcall(xes_mpc8540, xes_mpc85xx_publish_devices); > +machine_device_initcall(xes_mpc8572, mpc85xx_common_publish_devices); > +machine_device_initcall(xes_mpc8548, mpc85xx_common_publish_devices); > +machine_device_initcall(xes_mpc8540, mpc85xx_common_publish_devices); > > /* > * Called very early, device-tree isn't unflattened > -- > 1.7.2.5
On Tue, 19 Jul 2011 12:53:50 +0400 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > +static struct of_device_id __initdata mpc85xx_common_ids[] = { > + { .type = "soc", }, > + { .compatible = "soc", }, > + { .compatible = "simple-bus", }, > + { .compatible = "gianfar", }, > + { .compatible = "fsl,qe", }, > + { .compatible = "fsl,cpm2", }, > + {}, > +}; Same comment as for 83xx regarding localbus and compatibility with old device trees. -Scott
On 7/19/11, Scott Wood <scottwood@freescale.com> wrote: > On Tue, 19 Jul 2011 12:53:50 +0400 > Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > >> +static struct of_device_id __initdata mpc85xx_common_ids[] = { >> + { .type = "soc", }, >> + { .compatible = "soc", }, >> + { .compatible = "simple-bus", }, >> + { .compatible = "gianfar", }, >> + { .compatible = "fsl,qe", }, >> + { .compatible = "fsl,cpm2", }, >> + {}, >> +}; > > Same comment as for 83xx regarding localbus and compatibility with old > device trees. I checked for in-kernel device trees. Unless I miss something, there are no leftovers from this list. (83xx provided no simple-bus property for localbus, so your argument is valid there). If we should care about strange cases, not even blessed by kernel trees, I can add some of the old probes back. What do you thing?
On Fri, 22 Jul 2011 23:44:01 +0400 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > On 7/19/11, Scott Wood <scottwood@freescale.com> wrote: > > On Tue, 19 Jul 2011 12:53:50 +0400 > > Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > > > >> +static struct of_device_id __initdata mpc85xx_common_ids[] = { > >> + { .type = "soc", }, > >> + { .compatible = "soc", }, > >> + { .compatible = "simple-bus", }, > >> + { .compatible = "gianfar", }, > >> + { .compatible = "fsl,qe", }, > >> + { .compatible = "fsl,cpm2", }, > >> + {}, > >> +}; > > > > Same comment as for 83xx regarding localbus and compatibility with old > > device trees. > > I checked for in-kernel device trees. Unless I miss something, there are no > leftovers from this list. (83xx provided no simple-bus property for localbus, > so your argument is valid there). If we should care about strange cases, > not even blessed by kernel trees, I can add some of the old probes back. I see simple-bus missing in sbc8560 and ksi8560 -- were these included in the consolidation? Plus some of the others may have had simple-bus added after their initial version. As for out-of-tree trees (which could include trees dynamically generated/augmented by firmware, as well as device trees for custom boards that forked off of an old reference board tree), it's still nice to not break them as long as they stick to the binding. While the localbus binding is deficient regarding the compatible property, IIRC localbus preceded the introduction of simple-bus, which appears to be defined only in ePAPR (not in Linux or on devicetree.org). The ePAPR language does not suggest that it's mandatory for all buses that don't need special handling -- in fact, the language could be read as suggesting that it's only applicable to the "internal I/O bus" on an SoC (whereas this is an external bus), though that wasn't the intent behind it. The notion of probing buses isn't really a part of the device tree specs; they're more concerned with binding the devices themselves. In theory Linux should probably be probing everything that a driver will match, regardless of where in the tree it is, except where an ancestor node is diasbled, has matched a driver that wants to do things differently, or is on a blacklist. Of course, that's somewhat of a philosophical question on whether it's better to risk probing someting that shouldn't be, or not probing something that should be. The former is often nastier but more obvious, the latter is more likely until simple-bus is more widely used, and either one results in something not working. Leaving the localbus in may help someone, and it shouldn't hurt anything. -Scott
On 7/23/11, Scott Wood <scottwood@freescale.com> wrote: > On Fri, 22 Jul 2011 23:44:01 +0400 > Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > >> On 7/19/11, Scott Wood <scottwood@freescale.com> wrote: >> > On Tue, 19 Jul 2011 12:53:50 +0400 >> > Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: >> > >> >> +static struct of_device_id __initdata mpc85xx_common_ids[] = { >> >> + { .type = "soc", }, >> >> + { .compatible = "soc", }, >> >> + { .compatible = "simple-bus", }, >> >> + { .compatible = "gianfar", }, >> >> + { .compatible = "fsl,qe", }, >> >> + { .compatible = "fsl,cpm2", }, >> >> + {}, >> >> +}; >> > >> > Same comment as for 83xx regarding localbus and compatibility with old >> > device trees. >> >> I checked for in-kernel device trees. Unless I miss something, there are >> no >> leftovers from this list. (83xx provided no simple-bus property for >> localbus, >> so your argument is valid there). If we should care about strange cases, >> not even blessed by kernel trees, I can add some of the old probes back. > > I see simple-bus missing in sbc8560 and ksi8560 -- were these included in > the consolidation? Plus some of the others may have had simple-bus added > after their initial version. Patches for those are included in the patch serie. Kumar has applied them to next-3.2. > As for out-of-tree trees (which could include trees dynamically > generated/augmented by firmware, as well as device trees for custom boards > that forked off of an old reference board tree), it's still nice to not > break them as long as they stick to the binding. I see your point. I just wasn't thinking too much about ot-of-tree trees. My thought was that if someone updates the kernel, he can also update the dtb. > While the localbus binding is deficient regarding the compatible property, > IIRC localbus preceded the introduction of simple-bus, which appears to be > defined only in ePAPR (not in Linux or on devicetree.org). The ePAPR > language does not suggest that it's mandatory for all buses that don't need > special handling -- in fact, the language could be read as suggesting that > it's only applicable to the "internal I/O bus" on an SoC (whereas this > is an external bus), though that wasn't the intent behind it. Could you please update the lbc.txt suggesting the compatibility with simple-bus for lbc? Or you thing that it would be wrong? I think we should define compatibility list as "fsl,mpcXXXX-localbus", "fsl,pqXXXXX-localbus", "simple-bus", noting that by default new platforms/boards should only use "simple-bus" internally. Does this look reasonable for you? I can then try to provide a patch. > The notion of probing buses isn't really a part of the device tree specs; > they're more concerned with binding the devices themselves. In theory > Linux should probably be probing everything that a driver will match, > regardless of where in the tree it is, except where an ancestor node is > diasbled, has matched a driver that wants to do things differently, or is > on a blacklist. Of course, that's somewhat of a philosophical question on > whether it's better to risk probing someting that shouldn't be, or not > probing something that should be. The former is often nastier but more > obvious, the latter is more likely until simple-bus is more widely used, > and either one results in something not working. > Leaving the localbus in may help someone, and it shouldn't hurt anything. What do you suggest/prefer? To add .name="localbus" to generic code or to have board-specific hooks (like one for mpc834xemitx)? So, > > -Scott > >
On Sat, 23 Jul 2011 01:45:53 +0400 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > I see your point. I just wasn't thinking too much about ot-of-tree trees. > My thought was that if someone updates the kernel, he can also update the dtb. Sometimes there are firmware dependencies that make that difficult. And even if it's just user laziness/forgetfulness, that still translates to extra support requests. > Could you please update the lbc.txt suggesting the compatibility > with simple-bus for lbc? Or you thing that it would be wrong? > > I think we should define compatibility list as "fsl,mpcXXXX-localbus", > "fsl,pqXXXXX-localbus", "simple-bus", noting that by default new > platforms/boards should only use "simple-bus" internally. Does this > look reasonable for you? I can then try to provide a patch. I'm OK with saying that localbus nodes should have simple-bus in new trees, and defining canonical compatible values (chips with eLBC should be "fsl,XXXX-elbc", "fsl,elbc", "simple-bus"). I'm not sure what you mean by "should only use simple-bus internally", especially in the context of the binding. > What do you suggest/prefer? To add .name="localbus" to generic code > or to have board-specific hooks (like one for mpc834xemitx)? Just add localbus to the generic table. -Scott
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index 43b2162..ca4b1b9 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -3,6 +3,8 @@ # obj-$(CONFIG_SMP) += smp.o +obj-y += mpc85xx_common.o + obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c index c46f935..7657e1a 100644 --- a/arch/powerpc/platforms/85xx/ksi8560.c +++ b/arch/powerpc/platforms/85xx/ksi8560.c @@ -35,6 +35,7 @@ #include <asm/cpm2.h> #include <sysdev/cpm2_pic.h> +#include "mpc85xx.h" #define KSI8560_CPLD_HVR 0x04 /* Hardware Version Register */ #define KSI8560_CPLD_PVR 0x08 /* PLD Version Register */ @@ -215,22 +216,7 @@ static void ksi8560_show_cpuinfo(struct seq_file *m) seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); } -static struct of_device_id __initdata of_bus_ids[] = { - { .type = "soc", }, - { .type = "simple-bus", }, - { .name = "cpm", }, - { .name = "localbus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(ksi8560, declare_of_platform_devices); +machine_device_initcall(ksi8560, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c index f79f2f1..9ee6455 100644 --- a/arch/powerpc/platforms/85xx/mpc8536_ds.c +++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c @@ -32,6 +32,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + void __init mpc8536_ds_pic_init(void) { struct mpic *mpic; @@ -104,19 +106,7 @@ static void __init mpc8536_ds_setup_arch(void) printk("MPC8536 DS board from Freescale Semiconductor\n"); } -static struct of_device_id __initdata mpc8536_ds_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init mpc8536_ds_publish_devices(void) -{ - return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL); -} -machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices); +machine_device_initcall(mpc8536_ds, mpc85xx_common_publish_devices); machine_arch_initcall(mpc8536_ds, swiotlb_setup_bus_notifier); diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h new file mode 100644 index 0000000..1a1b4eb --- /dev/null +++ b/arch/powerpc/platforms/85xx/mpc85xx.h @@ -0,0 +1,4 @@ +#ifndef MPC85xx_H +#define MPC85xx_H +extern int mpc85xx_common_publish_devices(void); +#endif diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 2483929..3bc2acc 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -35,6 +35,8 @@ #include <sysdev/cpm2_pic.h> #endif +#include "mpc85xx.h" + #ifdef CONFIG_PCI static int mpc85xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) @@ -219,23 +221,7 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); } -static struct of_device_id __initdata of_bus_ids[] = { - { .name = "soc", }, - { .type = "soc", }, - { .name = "cpm", }, - { .name = "localbus", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(mpc85xx_ads, declare_of_platform_devices); +machine_device_initcall(mpc85xx_ads, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index e209c23..281ecc5 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -47,6 +47,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + /* CADMUS info */ /* xxx - galak, move into device tree */ #define CADMUS_BASE (0xf8004000) @@ -328,19 +330,7 @@ static int __init mpc85xx_cds_probe(void) return of_flat_dt_is_compatible(root, "MPC85xxCDS"); } -static struct of_device_id __initdata of_bus_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - return of_platform_bus_probe(NULL, of_bus_ids, NULL); -} -machine_device_initcall(mpc85xx_cds, declare_of_platform_devices); +machine_device_initcall(mpc85xx_cds, mpc85xx_common_publish_devices); define_machine(mpc85xx_cds) { .name = "MPC85xx CDS", diff --git a/arch/powerpc/platforms/85xx/mpc85xx_common.c b/arch/powerpc/platforms/85xx/mpc85xx_common.c new file mode 100644 index 0000000..999567a --- /dev/null +++ b/arch/powerpc/platforms/85xx/mpc85xx_common.c @@ -0,0 +1,26 @@ +/* + * Routines common to most mpc85xx-based boards. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <linux/kernel.h> +#include <linux/of_platform.h> + +#include "mpc85xx.h" + +static struct of_device_id __initdata mpc85xx_common_ids[] = { + { .type = "soc", }, + { .compatible = "soc", }, + { .compatible = "simple-bus", }, + { .compatible = "gianfar", }, + { .compatible = "fsl,qe", }, + { .compatible = "fsl,cpm2", }, + {}, +}; + +int __init mpc85xx_common_publish_devices(void) +{ + return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL); +} diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 53bf07d..7a0b728 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -36,6 +36,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + #undef DEBUG #ifdef DEBUG @@ -216,21 +218,9 @@ static int __init mpc8544_ds_probe(void) return 0; } -static struct of_device_id __initdata mpc85xxds_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init mpc85xxds_publish_devices(void) -{ - return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL); -} -machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices); -machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices); -machine_device_initcall(p2020_ds, mpc85xxds_publish_devices); +machine_device_initcall(mpc8544_ds, mpc85xx_common_publish_devices); +machine_device_initcall(mpc8572_ds, mpc85xx_common_publish_devices); +machine_device_initcall(p2020_ds, mpc85xx_common_publish_devices); machine_arch_initcall(mpc8544_ds, swiotlb_setup_bus_notifier); machine_arch_initcall(mpc8572_ds, swiotlb_setup_bus_notifier); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 747d1ee..fde37e5 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -53,6 +53,8 @@ #include <asm/mpic.h> #include <asm/swiotlb.h> +#include "mpc85xx.h" + #undef DEBUG #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) @@ -159,25 +161,6 @@ extern void __init mpc85xx_smp_init(void); #endif #ifdef CONFIG_QUICC_ENGINE -static struct of_device_id mpc85xx_qe_ids[] __initdata = { - { .type = "qe", }, - { .compatible = "fsl,qe", }, - { }, -}; - -static void __init mpc85xx_publish_qe_devices(void) -{ - struct device_node *np; - - np = of_find_compatible_node(NULL, NULL, "fsl,qe"); - if (!of_device_is_available(np)) { - of_node_put(np); - return; - } - - of_platform_bus_probe(NULL, mpc85xx_qe_ids, NULL); -} - static void __init mpc85xx_mds_reset_ucc_phys(void) { struct device_node *np; @@ -348,7 +331,6 @@ static void __init mpc85xx_mds_qeic_init(void) of_node_put(np); } #else -static void __init mpc85xx_publish_qe_devices(void) { } static void __init mpc85xx_mds_qe_init(void) { } static void __init mpc85xx_mds_qeic_init(void) { } #endif /* CONFIG_QUICC_ENGINE */ @@ -430,24 +412,12 @@ machine_arch_initcall(mpc8568_mds, board_fixups); machine_arch_initcall(mpc8569_mds, board_fixups); static struct of_device_id mpc85xx_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, { .compatible = "fsl,rapidio-delta", }, { .compatible = "fsl,mpc8548-guts", }, { .compatible = "gpio-leds", }, {}, }; -static struct of_device_id p1021_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - static int __init mpc85xx_publish_devices(void) { if (machine_is(mpc8568_mds)) @@ -455,23 +425,15 @@ static int __init mpc85xx_publish_devices(void) if (machine_is(mpc8569_mds)) simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); + mpc85xx_common_publish_devices(); of_platform_bus_probe(NULL, mpc85xx_ids, NULL); - mpc85xx_publish_qe_devices(); - - return 0; -} - -static int __init p1021_publish_devices(void) -{ - of_platform_bus_probe(NULL, p1021_ids, NULL); - mpc85xx_publish_qe_devices(); return 0; } machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices); machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices); -machine_device_initcall(p1021_mds, p1021_publish_devices); +machine_device_initcall(p1021_mds, mpc85xx_common_publish_devices); machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier); machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 7a3a37b..5846025 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -30,6 +30,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + #undef DEBUG #ifdef DEBUG @@ -108,19 +110,7 @@ static void __init mpc85xx_rdb_setup_arch(void) printk(KERN_INFO "MPC85xx RDB board from Freescale Semiconductor\n"); } -static struct of_device_id __initdata mpc85xxrdb_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init mpc85xxrdb_publish_devices(void) -{ - return of_platform_bus_probe(NULL, mpc85xxrdb_ids, NULL); -} -machine_device_initcall(mpc85xx_rdb, mpc85xxrdb_publish_devices); +machine_device_initcall(mpc85xx_rdb, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 266b3aa..26e6f75 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c @@ -27,6 +27,8 @@ #include <sysdev/fsl_pci.h> #include <asm/fsl_guts.h> +#include "mpc85xx.h" + #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) /* @@ -325,10 +327,6 @@ static void __init p1022_ds_setup_arch(void) } static struct of_device_id __initdata p1022_ds_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, /* So that the DMA channel nodes can be probed individually: */ { .compatible = "fsl,eloplus-dma", }, {}, @@ -338,6 +336,7 @@ static int __init p1022_ds_publish_devices(void) { return of_platform_bus_probe(NULL, p1022_ds_ids, NULL); } +machine_device_initcall(p1022_ds, mpc85xx_common_publish_devices); machine_device_initcall(p1022_ds, p1022_ds_publish_devices); machine_arch_initcall(p1022_ds, swiotlb_setup_bus_notifier); diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c index 2eeb376..42343ac 100644 --- a/arch/powerpc/platforms/85xx/sbc8548.c +++ b/arch/powerpc/platforms/85xx/sbc8548.c @@ -49,6 +49,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + static int sbc_rev = -EINVAL; static void __init sbc8548_pic_init(void) @@ -152,21 +154,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m) seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); } -static struct of_device_id __initdata of_bus_ids[] = { - { .name = "soc", }, - { .type = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(sbc8548, declare_of_platform_devices); +machine_device_initcall(sbc8548, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c index 678f5a8..bbb656f 100644 --- a/arch/powerpc/platforms/85xx/sbc8560.c +++ b/arch/powerpc/platforms/85xx/sbc8560.c @@ -37,6 +37,8 @@ #include <sysdev/cpm2_pic.h> #endif +#include "mpc85xx.h" + #ifdef CONFIG_CPM2 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) @@ -208,23 +210,7 @@ static void sbc8560_show_cpuinfo(struct seq_file *m) seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); } -static struct of_device_id __initdata of_bus_ids[] = { - { .name = "soc", }, - { .type = "soc", }, - { .name = "cpm", }, - { .name = "localbus", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(sbc8560, declare_of_platform_devices); +machine_device_initcall(sbc8560, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c index 747d8fb..fec496a 100644 --- a/arch/powerpc/platforms/85xx/socrates.c +++ b/arch/powerpc/platforms/85xx/socrates.c @@ -41,6 +41,7 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" #include "socrates_fpga_pic.h" static void __init socrates_pic_init(void) @@ -96,17 +97,7 @@ static void __init socrates_setup_arch(void) #endif } -static struct of_device_id __initdata socrates_of_bus_ids[] = { - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init socrates_publish_devices(void) -{ - return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); -} -machine_device_initcall(socrates, socrates_publish_devices); +machine_device_initcall(socrates, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c index 5387e9f..ab80044 100644 --- a/arch/powerpc/platforms/85xx/stx_gp3.c +++ b/arch/powerpc/platforms/85xx/stx_gp3.c @@ -40,6 +40,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + #ifdef CONFIG_CPM2 #include <asm/cpm2.h> #include <sysdev/cpm2_pic.h> @@ -144,19 +146,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m) seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); } -static struct of_device_id __initdata of_bus_ids[] = { - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(stx_gp3, declare_of_platform_devices); +machine_device_initcall(stx_gp3, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c index 325de77..19e711f 100644 --- a/arch/powerpc/platforms/85xx/tqm85xx.c +++ b/arch/powerpc/platforms/85xx/tqm85xx.c @@ -38,6 +38,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + #ifdef CONFIG_CPM2 #include <asm/cpm2.h> #include <sysdev/cpm2_pic.h> @@ -173,19 +175,7 @@ static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520, tqm85xx_ti1520_fixup); -static struct of_device_id __initdata of_bus_ids[] = { - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init declare_of_platform_devices(void) -{ - of_platform_bus_probe(NULL, of_bus_ids, NULL); - - return 0; -} -machine_device_initcall(tqm85xx, declare_of_platform_devices); +machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices); static const char *board[] __initdata = { "tqc,tqm8540", diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c index 0125604..0ee3721 100644 --- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c +++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c @@ -33,6 +33,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + /* A few bit definitions needed for fixups on some boards */ #define MPC85xx_L2CTL_L2E 0x80000000 /* L2 enable */ #define MPC85xx_L2CTL_L2I 0x40000000 /* L2 flash invalidate */ @@ -177,21 +179,9 @@ static void __init xes_mpc85xx_setup_arch(void) #endif } -static struct of_device_id __initdata xes_mpc85xx_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init xes_mpc85xx_publish_devices(void) -{ - return of_platform_bus_probe(NULL, xes_mpc85xx_ids, NULL); -} -machine_device_initcall(xes_mpc8572, xes_mpc85xx_publish_devices); -machine_device_initcall(xes_mpc8548, xes_mpc85xx_publish_devices); -machine_device_initcall(xes_mpc8540, xes_mpc85xx_publish_devices); +machine_device_initcall(xes_mpc8572, mpc85xx_common_publish_devices); +machine_device_initcall(xes_mpc8548, mpc85xx_common_publish_devices); +machine_device_initcall(xes_mpc8540, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened
85xx board files have a lot of duplication in *_publish_devices()/ *_declare_of_platform_devices() functions. Merge that into a single function common to most of the boards. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- arch/powerpc/platforms/85xx/Makefile | 2 + arch/powerpc/platforms/85xx/ksi8560.c | 18 +--------- arch/powerpc/platforms/85xx/mpc8536_ds.c | 16 ++------- arch/powerpc/platforms/85xx/mpc85xx.h | 4 ++ arch/powerpc/platforms/85xx/mpc85xx_ads.c | 20 ++--------- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 16 ++------- arch/powerpc/platforms/85xx/mpc85xx_common.c | 26 ++++++++++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 20 +++-------- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 46 ++----------------------- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 16 ++------- arch/powerpc/platforms/85xx/p1022_ds.c | 7 ++-- arch/powerpc/platforms/85xx/sbc8548.c | 18 ++-------- arch/powerpc/platforms/85xx/sbc8560.c | 20 ++--------- arch/powerpc/platforms/85xx/socrates.c | 13 +------ arch/powerpc/platforms/85xx/stx_gp3.c | 16 ++------- arch/powerpc/platforms/85xx/tqm85xx.c | 16 ++------- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 20 +++-------- 17 files changed, 77 insertions(+), 217 deletions(-) create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_common.c