2022-03-31 19:00:11

by Christophe Leroy

Subject: [PATCH] powerpc/85xx: Remove fsl,85... bindings

Since commit 8a4ab218ef70 ("powerpc/85xx: Change deprecated binding
for 85xx-based boards"), those bindings are not used anymore.

A comment in drivers/edac/mpc85xx_edac.c say they are to be removed
with kernel 2.6.30.

Remove them now.

Signed-off-by: Christophe Leroy <[email protected]>
---
.../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 ------
.../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 ------
drivers/edac/mpc85xx_edac.c | 14 --------------
3 files changed, 26 deletions(-)

diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml
index af5147f9da72..84f778a99546 100644
--- a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml
+++ b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml
@@ -25,12 +25,6 @@ properties:
- const: fsl,qoriq-memory-controller
- enum:
- fsl,bsc9132-memory-controller
- - fsl,8540-memory-controller
- - fsl,8541-memory-controller
- - fsl,8544-memory-controller
- - fsl,8548-memory-controller
- - fsl,8555-memory-controller
- - fsl,8568-memory-controller
- fsl,mpc8536-memory-controller
- fsl,mpc8540-memory-controller
- fsl,mpc8541-memory-controller
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt b/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
index 8a70696395a7..22ad012660e9 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
@@ -6,12 +6,6 @@ The cache bindings explained below are Devicetree Specification compliant
Required Properties:

- compatible : Should include one of the following:
- "fsl,8540-l2-cache-controller"
- "fsl,8541-l2-cache-controller"
- "fsl,8544-l2-cache-controller"
- "fsl,8548-l2-cache-controller"
- "fsl,8555-l2-cache-controller"
- "fsl,8568-l2-cache-controller"
"fsl,b4420-l2-cache-controller"
"fsl,b4860-l2-cache-controller"
"fsl,bsc9131-l2-cache-controller"
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 67f7bc3fe5b3..5bf92298554d 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -609,13 +609,6 @@ static int mpc85xx_l2_err_remove(struct platform_device *op)
}

static const struct of_device_id mpc85xx_l2_err_of_match[] = {
-/* deprecate the fsl,85.. forms in the future, 2.6.30? */
- { .compatible = "fsl,8540-l2-cache-controller", },
- { .compatible = "fsl,8541-l2-cache-controller", },
- { .compatible = "fsl,8544-l2-cache-controller", },
- { .compatible = "fsl,8548-l2-cache-controller", },
- { .compatible = "fsl,8555-l2-cache-controller", },
- { .compatible = "fsl,8568-l2-cache-controller", },
{ .compatible = "fsl,mpc8536-l2-cache-controller", },
{ .compatible = "fsl,mpc8540-l2-cache-controller", },
{ .compatible = "fsl,mpc8541-l2-cache-controller", },
@@ -644,13 +637,6 @@ static struct platform_driver mpc85xx_l2_err_driver = {
};

static const struct of_device_id mpc85xx_mc_err_of_match[] = {
-/* deprecate the fsl,85.. forms in the future, 2.6.30? */
- { .compatible = "fsl,8540-memory-controller", },
- { .compatible = "fsl,8541-memory-controller", },
- { .compatible = "fsl,8544-memory-controller", },
- { .compatible = "fsl,8548-memory-controller", },
- { .compatible = "fsl,8555-memory-controller", },
- { .compatible = "fsl,8568-memory-controller", },
{ .compatible = "fsl,mpc8536-memory-controller", },
{ .compatible = "fsl,mpc8540-memory-controller", },
{ .compatible = "fsl,mpc8541-memory-controller", },
--
2.35.1

2022-04-01 18:27:31

by Borislav Petkov

Subject: Re: [PATCH] powerpc/85xx: Remove fsl,85... bindings

On Thu, Mar 31, 2022 at 12:13:10PM +0200, Christophe Leroy wrote:
> Since commit 8a4ab218ef70 ("powerpc/85xx: Change deprecated binding
> for 85xx-based boards"), those bindings are not used anymore.
>
> A comment in drivers/edac/mpc85xx_edac.c say they are to be removed
> with kernel 2.6.30.
>
> Remove them now.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> ---
> .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 ------
> .../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 ------
> drivers/edac/mpc85xx_edac.c | 14 --------------
> 3 files changed, 26 deletions(-)


I'll take it through the EDAC tree of there are no objections.

Thx.

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette

2022-04-04 22:01:19

by Crystal Wood

Subject: Re: [PATCH] powerpc/85xx: Remove fsl,85... bindings

On Thu, 2022-03-31 at 12:13 +0200, Christophe Leroy wrote:
> Since commit 8a4ab218ef70 ("powerpc/85xx: Change deprecated binding
> for 85xx-based boards"), those bindings are not used anymore.
>
> A comment in drivers/edac/mpc85xx_edac.c say they are to be removed
> with kernel 2.6.30.
>
> Remove them now.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> ---
>  .../bindings/memory-controllers/fsl/fsl,ddr.yaml   |  6 ------
>  .../devicetree/bindings/powerpc/fsl/l2cache.txt    |  6 ------
>  drivers/edac/mpc85xx_edac.c                        | 14 --------------
>  3 files changed, 26 deletions(-)

Acked-by: Scott Wood <[email protected]>

-Scott

2022-04-05 00:06:45

by Michael Ellerman

Subject: Re: [PATCH] powerpc/85xx: Remove fsl,85... bindings

Borislav Petkov <[email protected]> writes:
> On Thu, Mar 31, 2022 at 12:13:10PM +0200, Christophe Leroy wrote:
>> Since commit 8a4ab218ef70 ("powerpc/85xx: Change deprecated binding
>> for 85xx-based boards"), those bindings are not used anymore.
>>
>> A comment in drivers/edac/mpc85xx_edac.c say they are to be removed
>> with kernel 2.6.30.
>>
>> Remove them now.
>>
>> Signed-off-by: Christophe Leroy <[email protected]>
>> ---
>> .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 ------
>> .../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 ------
>> drivers/edac/mpc85xx_edac.c | 14 --------------
>> 3 files changed, 26 deletions(-)
>
>
> I'll take it through the EDAC tree of there are no objections.

Fine by me, thanks.

cheers

2022-04-05 02:31:55

by Krzysztof Kozlowski

Subject: Re: [PATCH] powerpc/85xx: Remove fsl,85... bindings

On 31/03/2022 12:13, Christophe Leroy wrote:
> Since commit 8a4ab218ef70 ("powerpc/85xx: Change deprecated binding
> for 85xx-based boards"), those bindings are not used anymore.
>
> A comment in drivers/edac/mpc85xx_edac.c say they are to be removed
> with kernel 2.6.30.
>
> Remove them now.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> ---
> .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 ------
> .../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 ------
> drivers/edac/mpc85xx_edac.c | 14 --------------
> 3 files changed, 26 deletions(-)
>

Acked-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof