Re: [PATCH] ARM: dts: imx: drop "fsl,aips-bus"

From: Rob Herring
Date: Fri Jan 03 2020 - 19:36:40 EST

On Mon, Dec 30, 2019 at 08:58:05AM +0000, Peng Fan wrote:
> From: Peng Fan <peng.fan@xxxxxxx>
>
> There is no binding doc for "fsl,aips-bus", "simple-bus" is enough
> for aips usage, so drop it.

NAK. The AIPS bus has registers, so 'simple-bus' alone is not enough.

What you should do is change 'aips' node names to 'bus'.

>
> Scirpt:
> sed -i 's/compatible = "fsl,aips-bus", "simple-bus";/compatible = "simple-bus";/'
> arch/arm/boot/dts/imx*
>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
> ---
> arch/arm/boot/dts/imx25.dtsi | 4 ++--
> arch/arm/boot/dts/imx31.dtsi | 4 ++--
> arch/arm/boot/dts/imx50.dtsi | 4 ++--
> arch/arm/boot/dts/imx51.dtsi | 4 ++--
> arch/arm/boot/dts/imx53.dtsi | 4 ++--
> arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
> arch/arm/boot/dts/imx6sl.dtsi | 4 ++--
> arch/arm/boot/dts/imx6sll.dtsi | 4 ++--
> arch/arm/boot/dts/imx6sx.dtsi | 6 +++---
> arch/arm/boot/dts/imx6ul.dtsi | 4 ++--
> arch/arm/boot/dts/imx6ull.dtsi | 2 +-
> arch/arm/boot/dts/imx7s.dtsi | 6 +++---
> 12 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> index 40b95a290bd6..3b7a0b249d80 100644
> --- a/arch/arm/boot/dts/imx25.dtsi
> +++ b/arch/arm/boot/dts/imx25.dtsi
> @@ -76,7 +76,7 @@
> ranges;
>
> aips@43f00000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x43f00000 0x100000>;
> @@ -333,7 +333,7 @@
> };
>
> aips@53f00000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x53f00000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
> index 6b62f0745b82..b0e7e3bf8a1a 100644
> --- a/arch/arm/boot/dts/imx31.dtsi
> +++ b/arch/arm/boot/dts/imx31.dtsi
> @@ -64,7 +64,7 @@
> };
>
> aips@43f00000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x43f00000 0x100000>;
> @@ -226,7 +226,7 @@
> };
>
> aips@53f00000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x53f00000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
> index 0bfe7c91d0eb..961de09b571d 100644
> --- a/arch/arm/boot/dts/imx50.dtsi
> +++ b/arch/arm/boot/dts/imx50.dtsi
> @@ -102,7 +102,7 @@
> ranges;
>
> aips@50000000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x50000000 0x10000000>;
> @@ -390,7 +390,7 @@
> };
>
> aips@60000000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x60000000 0x10000000>;
> diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
> index dea86b98e9c3..86708688371b 100644
> --- a/arch/arm/boot/dts/imx51.dtsi
> +++ b/arch/arm/boot/dts/imx51.dtsi
> @@ -159,7 +159,7 @@
> };
>
> aips@70000000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x70000000 0x10000000>;
> @@ -441,7 +441,7 @@
> };
>
> aips@80000000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x80000000 0x10000000>;
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index ed341cfd9d09..f46a83c7d2c4 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -223,7 +223,7 @@
> };
>
> aips@50000000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x50000000 0x10000000>;
> @@ -655,7 +655,7 @@
> };
>
> aips@60000000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x60000000 0x10000000>;
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index e6b4b8525f98..9b7635e9cf3c 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -295,7 +295,7 @@
> };
>
> aips-bus@2000000 { /* AIPS1 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02000000 0x100000>;
> @@ -936,7 +936,7 @@
> };
>
> aips-bus@2100000 { /* AIPS2 */
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02100000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index 59c54e6ad09a..4b4f22217dfe 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -144,7 +144,7 @@
> };
>
> aips1: aips-bus@2000000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02000000 0x100000>;
> @@ -787,7 +787,7 @@
> };
>
> aips2: aips-bus@2100000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02100000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
> index a1bc5bb31756..fac8f22255aa 100644
> --- a/arch/arm/boot/dts/imx6sll.dtsi
> +++ b/arch/arm/boot/dts/imx6sll.dtsi
> @@ -145,7 +145,7 @@
> };
>
> aips1: aips-bus@2000000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02000000 0x100000>;
> @@ -664,7 +664,7 @@
> };
>
> aips2: aips-bus@2100000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02100000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
> index 59bad60a47dc..4499be62c8bb 100644
> --- a/arch/arm/boot/dts/imx6sx.dtsi
> +++ b/arch/arm/boot/dts/imx6sx.dtsi
> @@ -236,7 +236,7 @@
> };
>
> aips1: aips-bus@2000000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02000000 0x100000>;
> @@ -831,7 +831,7 @@
> };
>
> aips2: aips-bus@2100000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02100000 0x100000>;
> @@ -1189,7 +1189,7 @@
> };
>
> aips3: aips-bus@2200000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02200000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index d9fdca12819b..63d276fc2477 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -205,7 +205,7 @@
> };
>
> aips1: aips-bus@2000000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02000000 0x100000>;
> @@ -772,7 +772,7 @@
> };
>
> aips2: aips-bus@2100000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02100000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
> index b7e67d121322..633fa08bc972 100644
> --- a/arch/arm/boot/dts/imx6ull.dtsi
> +++ b/arch/arm/boot/dts/imx6ull.dtsi
> @@ -52,7 +52,7 @@
> / {
> soc {
> aips3: aips-bus@2200000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x02200000 0x100000>;
> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> index 139ab9b98472..552b14be14a1 100644
> --- a/arch/arm/boot/dts/imx7s.dtsi
> +++ b/arch/arm/boot/dts/imx7s.dtsi
> @@ -317,7 +317,7 @@
> };
>
> aips1: aips-bus@30000000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x30000000 0x400000>;
> @@ -669,7 +669,7 @@
> };
>
> aips2: aips-bus@30400000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x30400000 0x400000>;
> @@ -809,7 +809,7 @@
> };
>
> aips3: aips-bus@30800000 {
> - compatible = "fsl,aips-bus", "simple-bus";
> + compatible = "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> reg = <0x30800000 0x400000>;
> --
> 2.16.4
>