Hi Rob, On 30.8.2016 01:45, Rob Herring wrote: > Microblaze bus probing is partially broken because "xlnx,compound" is > missing from the default bus probe. Add it to the default and remove from > the Microblaze arch code.
xlnx,compound is not used for ages. I see see dts files for MB in the
tree but really it is just an very old example.
>
> Fixes: 44a7185c2ae6 ("of/platform: Add common method to populate default bus")
> Signed-off-by: Rob Herring <[email protected]>
> Cc: Michal Simek <[email protected]>
> Cc: Frank Rowand <[email protected]>
> Cc: [email protected]
> ---
> arch/microblaze/kernel/platform.c | 9 ---------
> drivers/of/platform.c | 1 +
> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/microblaze/kernel/platform.c
> b/arch/microblaze/kernel/platform.c
> index b9529ca..9d520bf 100644
> --- a/arch/microblaze/kernel/platform.c
> +++ b/arch/microblaze/kernel/platform.c
> @@ -11,19 +11,10 @@
> */
>
> #include <linux/init.h>
> -#include <linux/of_platform.h>
> -#include <asm/prom.h>
> #include <asm/setup.h>
>
> -static struct of_device_id xilinx_of_bus_ids[] __initdata = {
> - { .compatible = "simple-bus", },
> - { .compatible = "xlnx,compound", },
> - {}
> -};
> -
> static int __init microblaze_device_probe(void)
> {
> - of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL);
> of_platform_reset_gpio_probe();
> return 0;
> }
> diff --git a/drivers/of/platform.c b/drivers/of/platform.c
> index f39ccd5..f0314c4 100644
> --- a/drivers/of/platform.c
> +++ b/drivers/of/platform.c
> @@ -32,6 +32,7 @@ const struct of_device_id of_default_bus_match_table[] = {
> #ifdef CONFIG_ARM_AMBA
> { .compatible = "arm,amba-bus", },
> #endif /* CONFIG_ARM_AMBA */
> + { .compatible = "xlnx,compound", },
> {} /* Empty terminated list */
> };
>
>
Acked-by: Michal Simek <[email protected]>
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs
signature.asc
Description: OpenPGP digital signature
