iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Amlogic Drivers changes for v6.4:

Browse Source 
- convert clk-measure.txt to dt-schema
 - meson-pwrc: Use dev_err_probe()
 - meson_sm: populate platform devices from sm device tree data
 - dt-bindings: Drop unneeded quotes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmQr6rcACgkQd9zb2sjI
 SdE9ExAAoirw95BDQM/DHAanngQAXBoRV6JwIZ0xoVIvXtSvYLZEIHhCa3u06i35
 WxEYgJhkREqhsPglsSsz1vMQ0Nk64IyyMK8x7dv7jsKQYUNwK8oQOJ5wOslqcsb0
 2ZfhA+XalvHG97APIFXvGynX43OJlbXglLaRC2VD/S0otuNXRAgajHLDHP3RXjBh
 g/oD9RkDKknFODna3BEJ3oXkmJclKJqNtldngU3g7BAnYqCi9VUGVRSE4CMJzGTd
 uE9iFXqixhx3lzCMUzNU8SKrit3sOA01gDG6rLukZE8w7Jumq0OQnBqTDkqqC3mx
 kpLNTeqDWnD1Njhfdt5z5jjI0SIjlVYpC6gm0WSkL37dZp7Lv5vzAWBpUUdP9z9N
 DhF0d8DkPMNzB5pHaOTOhxR2yt8wPclt59TfT0sIWU2T2IdZxsdG8xg6PFPRbhIA
 98+w4fQf5ZKYO4RQ0lO+LuTSkcgL4Up1KxX4Nk349g4KL8T4nZUIu9mk6LNlmKpF
 c8D7VqmijnDeczkCo3k3YLN/eeL2h3oklAZQ4BpWhIQo6NTGXnP5CmdLtga9b/AW
 5VpJpoC4m2uIHmr2ANW9BSILvmKXg3uKmUCctNeZKBtb+29X0wDjAGrK8mE5CaXA
 JweshKqwm7LAAZWsn07MkYuRaVV+RuoYhYNw27kL0ubEw3JqR0g=
 =FPN/
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQsL84ACgkQmmx57+YA
 GNnhuRAAuaOcIbnjVQJ3smHN1C98IiL36rQFGzDDCP2HLkPEFIRpqo3myhZTCocs
 MUOrwm7spJLWX4K4jltblFcboGfbQ08vLcKjw4Jck6ADoRVtybMaJ3LXXBcrA3SQ
 AOxvzraYcp1DLT/7oUKCHc2JoB7nlN8MRBh0jZR8Xxl8WTTtMF6WLpAnIoHfkOxX
 W3kH40XLnxo/L9o0pACQlNeneBvFmdD2YQJEQ2HnxBJ34C25hMHKmg2Fo4SnvgXF
 2RQSVvEMgYCWU3NwxfAijm1HrGlGMyzxtxNuD1yQfF0EQ5wzNxD2tows0eC7SNQq
 ZO/gtq4nOAHqhMhYmEpH+HJMnxTCsqHEQCF5wMp8HW5IL7mbGuFkW7I2og2CZJYh
 qOoHvvN6Ie7o+5oJIRChRPyPMIGIxJxZCVlyPM3QuqVuTNeB85BSQSk7vJSkNefG
 yAohYMDNMQgcAvOuLR+R9oK0sdseStuRC9hZX8piwZ0FYkE66yWXagnRdYT9q3T3
 dV89oro2sAlEGy8EekclpuZdNsAlEs6idAgGNA3r5PRsReWeGKsz6Yet2h4ZhFEi
 97yIF8/kbTVqPNZV685jVjSOzGulE83X50rX0NyIdlhOPH/Cu3II0DJFj7h4/hPi
 vySyc2kYAEpM9pRJGJMpjxmax74Uk/jKc81+/KzcVD0GKLm4bHU=
 =zaGu
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic Drivers changes for v6.4:
- convert clk-measure.txt to dt-schema
- meson-pwrc: Use dev_err_probe()
- meson_sm: populate platform devices from sm device tree data
- dt-bindings: Drop unneeded quotes

* tag 'amlogic-drivers-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  dt-bindings: soc: amlogic: Drop unneeded quotes
  firmware: meson_sm: populate platform devices from sm device tree data
  soc: amlogic: meson-pwrc: Use dev_err_probe()
  dt-bindings: soc: amlogic: convert clk-measure.txt to dt-schema

Link: https://lore.kernel.org/r/aebef87f-e0a3-17dd-12b7-7231ca6b0923@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-04 16:10:21 +02:00
commit 748d3c3cce
7 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
View File

@ -2,8 +2,8 @@
# Copyright 2019 BayLibre, SAS
%YAML 1.2
---
$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic Meson Firmware registers Interface

4
Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-mx-secbus2.yaml
View File

@ -1,8 +1,8 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-mx-secbus2.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-mx-secbus2.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic Meson8/Meson8b/Meson8m2 SECBUS2 register interface

4
Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
View File

@ -2,8 +2,8 @@
# Copyright 2019 BayLibre, SAS
%YAML 1.2
---
$id: "http://devicetree.org/schemas/soc/amlogic/amlogic,canvas.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
$id: http://devicetree.org/schemas/soc/amlogic/amlogic,canvas.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic Canvas Video Lookup Table

40
Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml Normal file
View File

@ -0,0 +1,40 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/soc/amlogic/amlogic,meson-gx-clk-measure.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic Internal Clock Measurer
description:
The Amlogic SoCs contains an IP to measure the internal clocks.
The precision is multiple of MHz, useful to debug the clock states.
maintainers:
- Neil Armstrong <neil.armstrong@linaro.org>
properties:
compatible:
enum:
- amlogic,meson-gx-clk-measure
- amlogic,meson8-clk-measure
- amlogic,meson8b-clk-measure
- amlogic,meson-axg-clk-measure
- amlogic,meson-g12a-clk-measure
- amlogic,meson-sm1-clk-measure
reg:
maxItems: 1
required:
- compatible
- reg
unevaluatedProperties: false
examples:
- |
clock-measure@8758 {
compatible = "amlogic,meson-gx-clk-measure";
reg = <0x8758 0x10>;
};

21
Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt
View File

@ -1,21 +0,0 @@
Amlogic Internal Clock Measurer
===============================
The Amlogic SoCs contains an IP to measure the internal clocks.
The precision is multiple of MHz, useful to debug the clock states.
Required properties:
- compatible: Shall contain one of the following :
"amlogic,meson-gx-clk-measure" for GX SoCs
"amlogic,meson8-clk-measure" for Meson8 SoCs
"amlogic,meson8b-clk-measure" for Meson8b SoCs
"amlogic,meson-axg-clk-measure" for AXG SoCs
"amlogic,meson-g12a-clk-measure" for G12a SoCs
"amlogic,meson-sm1-clk-measure" for SM1 SoCs
- reg: base address and size of the Clock Measurer register space.
Example:
clock-measure@8758 {
compatible = "amlogic,meson-gx-clk-measure";
reg = <0x0 0x8758 0x0 0x10>;
};

5
drivers/firmware/meson/meson_sm.c
View File

@ -311,11 +311,14 @@ static int __init meson_sm_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, fw);
pr_info("secure-monitor enabled\n");
if (devm_of_platform_populate(dev))
goto out_in_base;
if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
goto out_in_base;
pr_info("secure-monitor enabled\n");
return 0;
out_in_base:

8
drivers/soc/amlogic/meson-gx-pwrc-vpu.c
View File

@ -308,11 +308,9 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
}
rstc = devm_reset_control_array_get_exclusive(&pdev->dev);
if (IS_ERR(rstc)) {
if (PTR_ERR(rstc) != -EPROBE_DEFER)
dev_err(&pdev->dev, "failed to get reset lines\n");
return PTR_ERR(rstc);
}
if (IS_ERR(rstc))
return dev_err_probe(&pdev->dev, PTR_ERR(rstc),
"failed to get reset lines\n");
vpu_clk = devm_clk_get(&pdev->dev, "vpu");
if (IS_ERR(vpu_clk)) {