| Message ID | 82a8bc4450a4daee50ee5fada75621fecb3703ff.1648721299.git.christophe.leroy@csgroup.eu |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | powerpc/85xx: Remove fsl,85... bindings | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 2 warnings, 50 lines checked |
| robh/patch-applied | success |
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 <christophe.leroy@csgroup.eu> > --- > .../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 <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
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 <christophe.leroy@csgroup.eu> > --- > .../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.
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 <christophe.leroy@csgroup.eu> > --- > .../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 <oss@buserror.net> -Scott
Borislav Petkov <bp@alien8.de> 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 <christophe.leroy@csgroup.eu> >> --- >> .../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
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", },
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 <christophe.leroy@csgroup.eu> --- .../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(-)