Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Masahiro Yamada]

Hi Rob, Mark, Jon,


Setting aside the future plan, anyway we should avoid
relying on an undocumented compatible string.
(and we should avoid its spread as Rob pointed out.)

I rephrase the git-log  (no update in the code-diff).

Could you check v2, please?
https://patchwork.kernel.org/patch/8529701/

Better?





2016-03-04 5:23 GMT+09:00 Rob Herring :
> On Thu, Mar 3, 2016 at 4:12 AM, Jon Medhurst (Tixy)  wrote:
>> On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
>> [...]
>>> This patch is derived from Rob Herring' comment
>>> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
>>> in the following thread:
>>> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
>>>
>>>
>>> So, the plan would be like this:
>>>
>>> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
>>> [2] New device trees should no longer use "arm,amba-bus" alone.
>>> [3] Go though some releases until we do not care about the backward
>>> compatibility
>>
>> Why would we stop caring about backwards compatibility? If I was a user
>> of any of the platforms in question and updated my kernel, I wouldn't
>> expect to have to debug why it was broken, then install a new dtb to fix
>> it - which may be a tricky thing to do, depending on the firmware used
>> to boot Linux.
>
> If no one notices, then there is no ABI. Things break all the time
> when nobody cares. It will be more than a few releases for sure. We
> may never get to step 3, but we should do step 1 so people stop
> copy-n-pasting this in step 2.
>
> Rob
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Best Regards
Masahiro Yamada

Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Masahiro Yamada]

Hi Rob, Mark, Jon,


Setting aside the future plan, anyway we should avoid
relying on an undocumented compatible string.
(and we should avoid its spread as Rob pointed out.)

I rephrase the git-log  (no update in the code-diff).

Could you check v2, please?
https://patchwork.kernel.org/patch/8529701/

Better?





2016-03-04 5:23 GMT+09:00 Rob Herring :
> On Thu, Mar 3, 2016 at 4:12 AM, Jon Medhurst (Tixy)  wrote:
>> On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
>> [...]
>>> This patch is derived from Rob Herring' comment
>>> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
>>> in the following thread:
>>> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
>>>
>>>
>>> So, the plan would be like this:
>>>
>>> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
>>> [2] New device trees should no longer use "arm,amba-bus" alone.
>>> [3] Go though some releases until we do not care about the backward
>>> compatibility
>>
>> Why would we stop caring about backwards compatibility? If I was a user
>> of any of the platforms in question and updated my kernel, I wouldn't
>> expect to have to debug why it was broken, then install a new dtb to fix
>> it - which may be a tricky thing to do, depending on the firmware used
>> to boot Linux.
>
> If no one notices, then there is no ABI. Things break all the time
> when nobody cares. It will be more than a few releases for sure. We
> may never get to step 3, but we should do step 1 so people stop
> copy-n-pasting this in step 2.
>
> Rob
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Best Regards
Masahiro Yamada

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Rob Herring]

On Mon, Feb 29, 2016 at 9:57 PM, Masahiro Yamada
 wrote:
> The "arm,amba-bus" string in the of_default_bus_match_table is
> ambiguous.  This prepares for killing it off in a long run.
>
> Signed-off-by: Masahiro Yamada 
> ---
>
>  arch/arm/boot/dts/axm55xx.dtsi | 2 +-
>  arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos4.dtsi | 2 +-
>  arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
>  arch/arm/boot/dts/hi3620.dtsi  | 2 +-
>  arch/arm/boot/dts/hip01.dtsi   | 2 +-
>  arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
>  arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
>  arch/arm/boot/dts/rk3036.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3228.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3288.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
>  arch/arm/boot/dts/s5pv210.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
>  arch/arm/boot/dts/ste-u300.dts | 2 +-
>  arch/arm/boot/dts/versatile-ab.dts | 2 +-
>  23 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
> index ea288f0..8da4582 100644
> --- a/arch/arm/boot/dts/axm55xx.dtsi
> +++ b/arch/arm/boot/dts/axm55xx.dtsi
> @@ -107,7 +107,7 @@
> };
>
> amba {
> -   compatible = "arm,amba-bus";
> +   compatible = "arm,amba-bus", "simple-bus";

Actually, I would remove arm,amba-bus completely to prevent its
spread. Both have been matched since ARM DT support began in the
kernel. AFAICT, FreeBSD only uses simple-bus. If so, then this patch
fixes FreeBSD on these systems (if that was the only issue).

Rob

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Rob Herring]

On Mon, Feb 29, 2016 at 9:57 PM, Masahiro Yamada
 wrote:
> The "arm,amba-bus" string in the of_default_bus_match_table is
> ambiguous.  This prepares for killing it off in a long run.
>
> Signed-off-by: Masahiro Yamada 
> ---
>
>  arch/arm/boot/dts/axm55xx.dtsi | 2 +-
>  arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos4.dtsi | 2 +-
>  arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
>  arch/arm/boot/dts/hi3620.dtsi  | 2 +-
>  arch/arm/boot/dts/hip01.dtsi   | 2 +-
>  arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
>  arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
>  arch/arm/boot/dts/rk3036.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3228.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3288.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
>  arch/arm/boot/dts/s5pv210.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
>  arch/arm/boot/dts/ste-u300.dts | 2 +-
>  arch/arm/boot/dts/versatile-ab.dts | 2 +-
>  23 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
> index ea288f0..8da4582 100644
> --- a/arch/arm/boot/dts/axm55xx.dtsi
> +++ b/arch/arm/boot/dts/axm55xx.dtsi
> @@ -107,7 +107,7 @@
> };
>
> amba {
> -   compatible = "arm,amba-bus";
> +   compatible = "arm,amba-bus", "simple-bus";

Actually, I would remove arm,amba-bus completely to prevent its
spread. Both have been matched since ARM DT support began in the
kernel. AFAICT, FreeBSD only uses simple-bus. If so, then this patch
fixes FreeBSD on these systems (if that was the only issue).

Rob

Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Rob Herring]

On Thu, Mar 3, 2016 at 4:12 AM, Jon Medhurst (Tixy)  wrote:
> On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
> [...]
>> This patch is derived from Rob Herring' comment
>> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
>> in the following thread:
>> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
>>
>>
>> So, the plan would be like this:
>>
>> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
>> [2] New device trees should no longer use "arm,amba-bus" alone.
>> [3] Go though some releases until we do not care about the backward
>> compatibility
>
> Why would we stop caring about backwards compatibility? If I was a user
> of any of the platforms in question and updated my kernel, I wouldn't
> expect to have to debug why it was broken, then install a new dtb to fix
> it - which may be a tricky thing to do, depending on the firmware used
> to boot Linux.

If no one notices, then there is no ABI. Things break all the time
when nobody cares. It will be more than a few releases for sure. We
may never get to step 3, but we should do step 1 so people stop
copy-n-pasting this in step 2.

Rob

Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Rob Herring]

On Thu, Mar 3, 2016 at 4:12 AM, Jon Medhurst (Tixy)  wrote:
> On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
> [...]
>> This patch is derived from Rob Herring' comment
>> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
>> in the following thread:
>> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
>>
>>
>> So, the plan would be like this:
>>
>> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
>> [2] New device trees should no longer use "arm,amba-bus" alone.
>> [3] Go though some releases until we do not care about the backward
>> compatibility
>
> Why would we stop caring about backwards compatibility? If I was a user
> of any of the platforms in question and updated my kernel, I wouldn't
> expect to have to debug why it was broken, then install a new dtb to fix
> it - which may be a tricky thing to do, depending on the firmware used
> to boot Linux.

If no one notices, then there is no ABI. Things break all the time
when nobody cares. It will be more than a few releases for sure. We
may never get to step 3, but we should do step 1 so people stop
copy-n-pasting this in step 2.

Rob

Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Jon Medhurst (Tixy)]

On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
[...]
> This patch is derived from Rob Herring' comment
> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
> in the following thread:
> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
> 
> 
> So, the plan would be like this:
> 
> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
> [2] New device trees should no longer use "arm,amba-bus" alone.
> [3] Go though some releases until we do not care about the backward
> compatibility

Why would we stop caring about backwards compatibility? If I was a user
of any of the platforms in question and updated my kernel, I wouldn't
expect to have to debug why it was broken, then install a new dtb to fix
it - which may be a tricky thing to do, depending on the firmware used
to boot Linux.

> [4] Drop "arm,amba-bus" from of_default_bus_match_table

-- 
Tixy

Re: [PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes

[Jon Medhurst (Tixy)]

On Thu, 2016-03-03 at 12:07 +0900, Masahiro Yamada wrote:
[...]
> This patch is derived from Rob Herring' comment
> "BTW, we should also kill off "amba-bus" which is an ambiguous term"
> in the following thread:
> http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html
> 
> 
> So, the plan would be like this:
> 
> [1] Make device trees not depend on "arm,amba-bus"   (this commit)
> [2] New device trees should no longer use "arm,amba-bus" alone.
> [3] Go though some releases until we do not care about the backward
> compatibility

Why would we stop caring about backwards compatibility? If I was a user
of any of the platforms in question and updated my kernel, I wouldn't
expect to have to debug why it was broken, then install a new dtb to fix
it - which may be a tricky thing to do, depending on the firmware used
to boot Linux.

> [4] Drop "arm,amba-bus" from of_default_bus_match_table

-- 
Tixy

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Masahiro Yamada]

Hi Mark,


2016-03-01 20:46 GMT+09:00 Mark Rutland :
> On Tue, Mar 01, 2016 at 12:57:00PM +0900, Masahiro Yamada wrote:
>> The "arm,amba-bus" string in the of_default_bus_match_table is
>> ambiguous.  This prepares for killing it off in a long run.
>
> I don't follow the purpose of this patch.
>
> There's no way we can remove kernel-side support for "arm,amba-bus", as
> there are DTBs that rely on it.
>
> If we're going to merge "arm,amba-bus" in the kernel with "simple-bus",
> such that there is no distinction between the two, then that doesn't
> require any DTBs to be updated.
>
> The only reason I would see for changing dts files would be a subsequent
> clean-up for consistency, but at that point "arm,amba-bus" could be
> dropped entirely.
>
> So this patch makes no sense to me.
>
> Thanks,
> Mark.
>

This patch is derived from Rob Herring' comment
"BTW, we should also kill off "amba-bus" which is an ambiguous term"
in the following thread:
http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html


So, the plan would be like this:

[1] Make device trees not depend on "arm,amba-bus"   (this commit)
[2] New device trees should no longer use "arm,amba-bus" alone.
[3] Go though some releases until we do not care about the backward
compatibility
[4] Drop "arm,amba-bus" from of_default_bus_match_table


No?


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Masahiro Yamada]

Hi Mark,


2016-03-01 20:46 GMT+09:00 Mark Rutland :
> On Tue, Mar 01, 2016 at 12:57:00PM +0900, Masahiro Yamada wrote:
>> The "arm,amba-bus" string in the of_default_bus_match_table is
>> ambiguous.  This prepares for killing it off in a long run.
>
> I don't follow the purpose of this patch.
>
> There's no way we can remove kernel-side support for "arm,amba-bus", as
> there are DTBs that rely on it.
>
> If we're going to merge "arm,amba-bus" in the kernel with "simple-bus",
> such that there is no distinction between the two, then that doesn't
> require any DTBs to be updated.
>
> The only reason I would see for changing dts files would be a subsequent
> clean-up for consistency, but at that point "arm,amba-bus" could be
> dropped entirely.
>
> So this patch makes no sense to me.
>
> Thanks,
> Mark.
>

This patch is derived from Rob Herring' comment
"BTW, we should also kill off "amba-bus" which is an ambiguous term"
in the following thread:
http://lkml.iu.edu/hypermail/linux/kernel/1601.0/01822.html


So, the plan would be like this:

[1] Make device trees not depend on "arm,amba-bus"   (this commit)
[2] New device trees should no longer use "arm,amba-bus" alone.
[3] Go though some releases until we do not care about the backward
compatibility
[4] Drop "arm,amba-bus" from of_default_bus_match_table


No?


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Mark Rutland]

On Tue, Mar 01, 2016 at 12:57:00PM +0900, Masahiro Yamada wrote:
> The "arm,amba-bus" string in the of_default_bus_match_table is
> ambiguous.  This prepares for killing it off in a long run.

I don't follow the purpose of this patch.

There's no way we can remove kernel-side support for "arm,amba-bus", as
there are DTBs that rely on it.

If we're going to merge "arm,amba-bus" in the kernel with "simple-bus",
such that there is no distinction between the two, then that doesn't
require any DTBs to be updated.

The only reason I would see for changing dts files would be a subsequent
clean-up for consistency, but at that point "arm,amba-bus" could be
dropped entirely.

So this patch makes no sense to me.

Thanks,
Mark.

> Signed-off-by: Masahiro Yamada 
> ---
> 
>  arch/arm/boot/dts/axm55xx.dtsi | 2 +-
>  arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos4.dtsi | 2 +-
>  arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
>  arch/arm/boot/dts/hi3620.dtsi  | 2 +-
>  arch/arm/boot/dts/hip01.dtsi   | 2 +-
>  arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
>  arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
>  arch/arm/boot/dts/rk3036.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3228.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3288.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
>  arch/arm/boot/dts/s5pv210.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
>  arch/arm/boot/dts/ste-u300.dts | 2 +-
>  arch/arm/boot/dts/versatile-ab.dts | 2 +-
>  23 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
> index ea288f0..8da4582 100644
> --- a/arch/arm/boot/dts/axm55xx.dtsi
> +++ b/arch/arm/boot/dts/axm55xx.dtsi
> @@ -107,7 +107,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <2>;
>   #size-cells = <2>;
>   ranges;
> diff --git a/arch/arm/boot/dts/exynos3250.dtsi 
> b/arch/arm/boot/dts/exynos3250.dtsi
> index 18e3def..0ad4fa7 100644
> --- a/arch/arm/boot/dts/exynos3250.dtsi
> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> @@ -381,7 +381,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <1>;
>   #size-cells = <1>;
>   ranges;
> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
> index 045785c..d53fd78 100644
> --- a/arch/arm/boot/dts/exynos4.dtsi
> +++ b/arch/arm/boot/dts/exynos4.dtsi
> @@ -661,7 +661,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   interrupt-parent = <>;
>   ranges;
>  
> diff --git a/arch/arm/boot/dts/exynos4415.dtsi 
> b/arch/arm/boot/dts/exynos4415.dtsi
> index ad76484..35d2f99 100644
> --- a/arch/arm/boot/dts/exynos4415.dtsi
> +++ b/arch/arm/boot/dts/exynos4415.dtsi
> @@ -380,7 +380,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <1>;
>   #size-cells = <1>;
>   interrupt-parent = <>;
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi 
> b/arch/arm/boot/dts/exynos5250.dtsi
> index 33e2d5f..bcaed08 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -674,7 +674,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   interrupt-parent = <>;
>   ranges;
>  
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi 
> b/arch/arm/boot/dts/exynos5420.dtsi
> index 48a0a55..838bde3 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -327,7 +327,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>

Re: [PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Mark Rutland]

On Tue, Mar 01, 2016 at 12:57:00PM +0900, Masahiro Yamada wrote:
> The "arm,amba-bus" string in the of_default_bus_match_table is
> ambiguous.  This prepares for killing it off in a long run.

I don't follow the purpose of this patch.

There's no way we can remove kernel-side support for "arm,amba-bus", as
there are DTBs that rely on it.

If we're going to merge "arm,amba-bus" in the kernel with "simple-bus",
such that there is no distinction between the two, then that doesn't
require any DTBs to be updated.

The only reason I would see for changing dts files would be a subsequent
clean-up for consistency, but at that point "arm,amba-bus" could be
dropped entirely.

So this patch makes no sense to me.

Thanks,
Mark.

> Signed-off-by: Masahiro Yamada 
> ---
> 
>  arch/arm/boot/dts/axm55xx.dtsi | 2 +-
>  arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos4.dtsi | 2 +-
>  arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
>  arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
>  arch/arm/boot/dts/hi3620.dtsi  | 2 +-
>  arch/arm/boot/dts/hip01.dtsi   | 2 +-
>  arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
>  arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
>  arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
>  arch/arm/boot/dts/rk3036.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3228.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3288.dtsi  | 2 +-
>  arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
>  arch/arm/boot/dts/s5pv210.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga.dtsi | 2 +-
>  arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
>  arch/arm/boot/dts/ste-u300.dts | 2 +-
>  arch/arm/boot/dts/versatile-ab.dts | 2 +-
>  23 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
> index ea288f0..8da4582 100644
> --- a/arch/arm/boot/dts/axm55xx.dtsi
> +++ b/arch/arm/boot/dts/axm55xx.dtsi
> @@ -107,7 +107,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <2>;
>   #size-cells = <2>;
>   ranges;
> diff --git a/arch/arm/boot/dts/exynos3250.dtsi 
> b/arch/arm/boot/dts/exynos3250.dtsi
> index 18e3def..0ad4fa7 100644
> --- a/arch/arm/boot/dts/exynos3250.dtsi
> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> @@ -381,7 +381,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <1>;
>   #size-cells = <1>;
>   ranges;
> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
> index 045785c..d53fd78 100644
> --- a/arch/arm/boot/dts/exynos4.dtsi
> +++ b/arch/arm/boot/dts/exynos4.dtsi
> @@ -661,7 +661,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   interrupt-parent = <>;
>   ranges;
>  
> diff --git a/arch/arm/boot/dts/exynos4415.dtsi 
> b/arch/arm/boot/dts/exynos4415.dtsi
> index ad76484..35d2f99 100644
> --- a/arch/arm/boot/dts/exynos4415.dtsi
> +++ b/arch/arm/boot/dts/exynos4415.dtsi
> @@ -380,7 +380,7 @@
>   };
>  
>   amba {
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   #address-cells = <1>;
>   #size-cells = <1>;
>   interrupt-parent = <>;
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi 
> b/arch/arm/boot/dts/exynos5250.dtsi
> index 33e2d5f..bcaed08 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -674,7 +674,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   interrupt-parent = <>;
>   ranges;
>  
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi 
> b/arch/arm/boot/dts/exynos5420.dtsi
> index 48a0a55..838bde3 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -327,7 +327,7 @@
>   amba {
>   #address-cells = <1>;
>   #size-cells = <1>;
> - compatible = "arm,amba-bus";
> + compatible = "arm,amba-bus", "simple-bus";
>   interrupt-parent = <>;

[PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Masahiro Yamada]

The "arm,amba-bus" string in the of_default_bus_match_table is
ambiguous.  This prepares for killing it off in a long run.

Signed-off-by: Masahiro Yamada 
---

 arch/arm/boot/dts/axm55xx.dtsi | 2 +-
 arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
 arch/arm/boot/dts/exynos4.dtsi | 2 +-
 arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
 arch/arm/boot/dts/hi3620.dtsi  | 2 +-
 arch/arm/boot/dts/hip01.dtsi   | 2 +-
 arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
 arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
 arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
 arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
 arch/arm/boot/dts/rk3036.dtsi  | 2 +-
 arch/arm/boot/dts/rk3228.dtsi  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
 arch/arm/boot/dts/s5pv210.dtsi | 2 +-
 arch/arm/boot/dts/socfpga.dtsi | 2 +-
 arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
 arch/arm/boot/dts/ste-u300.dts | 2 +-
 arch/arm/boot/dts/versatile-ab.dts | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
index ea288f0..8da4582 100644
--- a/arch/arm/boot/dts/axm55xx.dtsi
+++ b/arch/arm/boot/dts/axm55xx.dtsi
@@ -107,7 +107,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges;
diff --git a/arch/arm/boot/dts/exynos3250.dtsi 
b/arch/arm/boot/dts/exynos3250.dtsi
index 18e3def..0ad4fa7 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -381,7 +381,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 045785c..d53fd78 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -661,7 +661,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos4415.dtsi 
b/arch/arm/boot/dts/exynos4415.dtsi
index ad76484..35d2f99 100644
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -380,7 +380,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi 
b/arch/arm/boot/dts/exynos5250.dtsi
index 33e2d5f..bcaed08 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -674,7 +674,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos5420.dtsi 
b/arch/arm/boot/dts/exynos5420.dtsi
index 48a0a55..838bde3 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -327,7 +327,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos5440.dtsi 
b/arch/arm/boot/dts/exynos5440.dtsi
index f18b51f..5fe5639 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -200,7 +200,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
};
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index 6cbb62e..7b67ffe 100644
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -68,7 +68,7 @@
 

[PATCH] ARM: dts: add "simple-bus" to "arm,amba-bus" compatible nodes

[Masahiro Yamada]

The "arm,amba-bus" string in the of_default_bus_match_table is
ambiguous.  This prepares for killing it off in a long run.

Signed-off-by: Masahiro Yamada 
---

 arch/arm/boot/dts/axm55xx.dtsi | 2 +-
 arch/arm/boot/dts/exynos3250.dtsi  | 2 +-
 arch/arm/boot/dts/exynos4.dtsi | 2 +-
 arch/arm/boot/dts/exynos4415.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5250.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5420.dtsi  | 2 +-
 arch/arm/boot/dts/exynos5440.dtsi  | 2 +-
 arch/arm/boot/dts/hi3620.dtsi  | 2 +-
 arch/arm/boot/dts/hip01.dtsi   | 2 +-
 arch/arm/boot/dts/hisi-x5hd2.dtsi  | 2 +-
 arch/arm/boot/dts/qcom-apq8064.dtsi| 2 +-
 arch/arm/boot/dts/qcom-msm8660.dtsi| 2 +-
 arch/arm/boot/dts/qcom-msm8960.dtsi| 2 +-
 arch/arm/boot/dts/rk3036.dtsi  | 2 +-
 arch/arm/boot/dts/rk3228.dtsi  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi  | 2 +-
 arch/arm/boot/dts/s5pv210.dtsi | 2 +-
 arch/arm/boot/dts/socfpga.dtsi | 2 +-
 arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
 arch/arm/boot/dts/ste-u300.dts | 2 +-
 arch/arm/boot/dts/versatile-ab.dts | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
index ea288f0..8da4582 100644
--- a/arch/arm/boot/dts/axm55xx.dtsi
+++ b/arch/arm/boot/dts/axm55xx.dtsi
@@ -107,7 +107,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges;
diff --git a/arch/arm/boot/dts/exynos3250.dtsi 
b/arch/arm/boot/dts/exynos3250.dtsi
index 18e3def..0ad4fa7 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -381,7 +381,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 045785c..d53fd78 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -661,7 +661,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos4415.dtsi 
b/arch/arm/boot/dts/exynos4415.dtsi
index ad76484..35d2f99 100644
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -380,7 +380,7 @@
};
 
amba {
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi 
b/arch/arm/boot/dts/exynos5250.dtsi
index 33e2d5f..bcaed08 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -674,7 +674,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos5420.dtsi 
b/arch/arm/boot/dts/exynos5420.dtsi
index 48a0a55..838bde3 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -327,7 +327,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
 
diff --git a/arch/arm/boot/dts/exynos5440.dtsi 
b/arch/arm/boot/dts/exynos5440.dtsi
index f18b51f..5fe5639 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -200,7 +200,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
-   compatible = "arm,amba-bus";
+   compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <>;
ranges;
};
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index 6cbb62e..7b67ffe 100644
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -68,7 +68,7 @@
 
#address-cells =