Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1472172 > unrolled thread
| Started by | Rob Herring <robh@kernel.org> |
|---|---|
| First post | 2016-08-30 02:00 +0200 |
| Last post | 2016-08-30 14:20 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] microblaze: move xlnx,compound to default bus matching Rob Herring <robh@kernel.org> - 2016-08-30 02:00 +0200
Re: [PATCH] microblaze: move xlnx,compound to default bus matching Rob Herring <robh@kernel.org> - 2016-08-30 14:20 +0200
Re: [PATCH] microblaze: move xlnx,compound to default bus matching Michal Simek <monstr@monstr.eu> - 2016-08-30 14:20 +0200
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2016-08-30 02:00 +0200 |
| Subject | [PATCH] microblaze: move xlnx,compound to default bus matching |
| Message-ID | <sbED7-5tL-15@gated-at.bofh.it> |
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.
Fixes: 44a7185c2ae6 ("of/platform: Add common method to populate default bus")
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: devicetree@vger.kernel.org
---
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 */
};
--
2.9.3
[toc] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2016-08-30 14:20 +0200 |
| Message-ID | <sbQbf-4Ec-7@gated-at.bofh.it> |
| In reply to | #1472172 |
On Tue, Aug 30, 2016 at 7:10 AM, Michal Simek <monstr@monstr.eu> wrote: > 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. Then can I drop this patch? [...] > Acked-by: Michal Simek <michal.simek@xilinx.com> > > 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 > >
[toc] | [prev] | [next] | [standalone]
| From | Michal Simek <monstr@monstr.eu> |
|---|---|
| Date | 2016-08-30 14:20 +0200 |
| Message-ID | <sbQbf-4Ec-9@gated-at.bofh.it> |
| In reply to | #1472172 |
[Multipart message — attachments visible in raw view] — view raw
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 <robh@kernel.org>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Frank Rowand <frowand.list@gmail.com>
> Cc: devicetree@vger.kernel.org
> ---
> 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 <michal.simek@xilinx.com>
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web