linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2
@ 2016-05-30  2:12 Masahiro Yamada
  2016-05-30 10:19 ` Heiko Stübner
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2016-05-30  2:12 UTC (permalink / raw)
  To: arm
  Cc: Arnd Bergmann, Olof Johansson, Rob Herring, Masahiro Yamada,
	Chanho Min, devicetree, Jianqun Xu, Heiko Stuebner, Kumar Gala,
	linux-kernel, Ian Campbell, linux-rockchip, Rob Herring,
	Pawel Moll, Will Deacon, Mark Rutland, Catalin Marinas,
	linux-arm-kernel

Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64:
dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some
new users of "arm,amba-bus" at Linux 4.7-rc1.  Eliminate them now.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

In order to not leave these compatible strings for the release,
is it OK to apply this patch for Linux 4.7 ?



 arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi b/arch/arm64/boot/dts/lg/lg1312.dtsi
index 3a4e9a2..fbafa24 100644
--- a/arch/arm64/boot/dts/lg/lg1312.dtsi
+++ b/arch/arm64/boot/dts/lg/lg1312.dtsi
@@ -125,7 +125,7 @@
 		#size-cells = <1>;
 		#interrupts-cells = <3>;
 
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		interrupt-parent = <&gic>;
 		ranges;
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 46f325a..d7f8e06 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -163,7 +163,7 @@
 	};
 
 	amba {
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2
  2016-05-30  2:12 [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2 Masahiro Yamada
@ 2016-05-30 10:19 ` Heiko Stübner
  2016-05-30 23:25 ` Chanho Min
  2016-06-03 19:13 ` Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Heiko Stübner @ 2016-05-30 10:19 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: arm, Arnd Bergmann, Olof Johansson, Rob Herring, Chanho Min,
	devicetree, Jianqun Xu, Kumar Gala, linux-kernel, Ian Campbell,
	linux-rockchip, Rob Herring, Pawel Moll, Will Deacon,
	Mark Rutland, Catalin Marinas, linux-arm-kernel

Am Montag, 30. Mai 2016, 11:12:33 schrieb Masahiro Yamada:
> Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64:
> dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some
> new users of "arm,amba-bus" at Linux 4.7-rc1.  Eliminate them now.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

For the Rockchip part,
Acked-by: Heiko Stuebner <heiko@sntech.de>

> ---
> 
> In order to not leave these compatible strings for the release,
> is it OK to apply this patch for Linux 4.7 ?
> 
> 
> 
>  arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi
> b/arch/arm64/boot/dts/lg/lg1312.dtsi index 3a4e9a2..fbafa24 100644
> --- a/arch/arm64/boot/dts/lg/lg1312.dtsi
> +++ b/arch/arm64/boot/dts/lg/lg1312.dtsi
> @@ -125,7 +125,7 @@
>  		#size-cells = <1>;
>  		#interrupts-cells = <3>;
> 
> -		compatible = "arm,amba-bus";
> +		compatible = "simple-bus";
>  		interrupt-parent = <&gic>;
>  		ranges;
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a..d7f8e06 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -163,7 +163,7 @@
>  	};
> 
>  	amba {
> -		compatible = "arm,amba-bus";
> +		compatible = "simple-bus";
>  		#address-cells = <2>;
>  		#size-cells = <2>;
>  		ranges;

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2
  2016-05-30  2:12 [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2 Masahiro Yamada
  2016-05-30 10:19 ` Heiko Stübner
@ 2016-05-30 23:25 ` Chanho Min
  2016-06-03 19:13 ` Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Chanho Min @ 2016-05-30 23:25 UTC (permalink / raw)
  To: 'Masahiro Yamada', arm
  Cc: 'Arnd Bergmann', 'Olof Johansson',
	'Rob Herring', devicetree, 'Jianqun Xu',
	'Heiko Stuebner', 'Kumar Gala',
	linux-kernel, 'Ian Campbell',
	linux-rockchip, 'Rob Herring', 'Pawel Moll',
	'Will Deacon', 'Mark Rutland',
	'Catalin Marinas',
	linux-arm-kernel, 이건호

> Subject: [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part
> 2
> 
> Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64:
> dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some
> new users of "arm,amba-bus" at Linux 4.7-rc1.  Eliminate them now.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
> In order to not leave these compatible strings for the release,
> is it OK to apply this patch for Linux 4.7 ?
> 
> 
> 
>  arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

> diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi
> b/arch/arm64/boot/dts/lg/lg1312.dtsi
> index 3a4e9a2..fbafa24 100644
> --- a/arch/arm64/boot/dts/lg/lg1312.dtsi
> +++ b/arch/arm64/boot/dts/lg/lg1312.dtsi
> @@ -125,7 +125,7 @@
>  		#size-cells = <1>;
>  		#interrupts-cells = <3>;
> 
> -		compatible = "arm,amba-bus";
> +		compatible = "simple-bus";
>  		interrupt-parent = <&gic>;
>  		ranges;
> 

Acked-by: Chanho Min <chanho.min@lge.com>

> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 46f325a..d7f8e06 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -163,7 +163,7 @@
>  	};
> 
>  	amba {
> -		compatible = "arm,amba-bus";
> +		compatible = "simple-bus";
>  		#address-cells = <2>;
>  		#size-cells = <2>;
>  		ranges;
> --
> 1.9.1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2
  2016-05-30  2:12 [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2 Masahiro Yamada
  2016-05-30 10:19 ` Heiko Stübner
  2016-05-30 23:25 ` Chanho Min
@ 2016-06-03 19:13 ` Olof Johansson
  2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2016-06-03 19:13 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: arm, Arnd Bergmann, Rob Herring, Chanho Min, devicetree,
	Jianqun Xu, Heiko Stuebner, Kumar Gala, linux-kernel,
	Ian Campbell, linux-rockchip, Rob Herring, Pawel Moll,
	Will Deacon, Mark Rutland, Catalin Marinas, linux-arm-kernel

On Mon, May 30, 2016 at 11:12:33AM +0900, Masahiro Yamada wrote:
> Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64:
> dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some
> new users of "arm,amba-bus" at Linux 4.7-rc1.  Eliminate them now.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
> In order to not leave these compatible strings for the release,
> is it OK to apply this patch for Linux 4.7 ?

Thanks, applied to fixes.


-Olof

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-06-03 19:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-30  2:12 [PATCH] arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2 Masahiro Yamada
2016-05-30 10:19 ` Heiko Stübner
2016-05-30 23:25 ` Chanho Min
2016-06-03 19:13 ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).