microblaze: move xlnx,compound to default bus matching
Subsystems (2)
Rob Herring
maintainerPATCH 1/1 microblaze: move xlnx,compound to default bus matching
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.
--- arch/microblaze/kernel/platform.c | 9 --------- drivers/of/platform.c | 1 + 2 files changed, 1 insertion(+), 9 deletions(-)
arch/microblaze/kernel/platform.c +0 -9
@@ -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 ; }
drivers/of/platform.c +1 -0
@@ -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 */ };
Signature · 6 lines
2.9.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob,
Quoted 3 lines · Rob Herring
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.
Quoted 41 lines
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]>--- arch/microblaze/kernel/platform.c | 9 --------- drivers/of/platform.c | 1 + 2 files changed, 1 insertion(+), 9 deletions(-)arch/microblaze/kernel/platform.c +0
-9@@ -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 ; }drivers/of/platform.c +0
-0
drivers/of/platform.c const struct of_device_id of_default_bus_match_table[] = { · line 38
Quoted 7 lines
drivers/of/platform.c +1
-0@@ -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 */ };
Thanks,
Michal
Signature · 5 lines
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
Rob Herring
maintainerQuoted 9 lines · Michal Simek
Hi Rob,
Quoted 3 lines · Rob Herring
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.
Then can I drop this patch?
[...]
Quoted 5 lines
Acked-by Michal Simek <[email protected]>Thanks,
Michal
Quoted 8 lines
--
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html