This series contains a few .dts fixes which were found during review of
[0] (which is now the first patch in this series).
[0] https://lore.kernel.org/linux-amlogic/[email protected]/
Martin Blumenstingl (6):
arm64: dts: meson-gxl: jethub-j80: Fix WiFi MAC address node
arm64: dts: meson-gxl: jethub-j80: Fix Bluetooth MAC node name
arm64: dts: meson-axg: jethub-j1xx: Fix MAC address node names
arm64: dts: meson-gx: Fix Ethernet MAC address unit name
arm64: dts: meson-g12a: Fix internal Ethernet PHY unit name
arm64: dts: meson-gx: Fix the SCPI DVFS node name and unit address
.../boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 6 +++---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 ++--
.../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
--
2.39.0
Documentation/devicetree/bindings/net/ethernet-phy.yaml defines that the
node name for Ethernet PHYs should match the following pattern:
^ethernet-phy(@[a-f0-9]+)?$
Replace the underscore with a hyphen to adhere to this binding.
Fixes: 280c17df8fbf ("arm64: dts: meson: g12a: add mdio multiplexer")
Signed-off-by: Martin Blumenstingl <[email protected]>
---
changes from v1 -> v2:
- new patch
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 9dbd50820b1c..c95cf3afc666 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1694,7 +1694,7 @@ int_mdio: mdio@1 {
#address-cells = <1>;
#size-cells = <0>;
- internal_ephy: ethernet_phy@8 {
+ internal_ephy: ethernet-phy@8 {
compatible = "ethernet-phy-id0180.3301",
"ethernet-phy-ieee802.3-c22";
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
--
2.39.0
Unit addresses should be written using lower-case hex characters. Use
wifi_mac@c to fix a yaml schema validation error once the eFuse
dt-bindings have been converted to a yaml schema:
efuse: Unevaluated properties are not allowed ('wifi_mac@C' was
unexpected)
Also node names should use hyphens instead of underscores as the latter
can also cause warnings.
Fixes: abfaae24ecf3 ("arm64: dts: meson-gxl: add support for JetHub H1")
Acked-by: Vyacheslav Bocharov <[email protected]>
Signed-off-by: Martin Blumenstingl <[email protected]>
---
changes from v1 -> v2:
- Added Vyacheslav's Acked-by (originally given as "Vyachesav", but my
understanding is that this was a typo
- Also replace the underscore in the node name with a hyphen
.../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
index 6831137c5c10..270483e007bc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
@@ -90,7 +90,7 @@ bt_mac: bt_mac@6 {
reg = <0x6 0x6>;
};
- wifi_mac: wifi_mac@C {
+ wifi_mac: wifi-mac@c {
reg = <0xc 0x6>;
};
};
--
2.39.0
Node names should be generic and use hyphens instead of underscores to
not cause warnings. Also nodes without a reg property should not have a
unit-address. Change the scpi_dvfs node to use clock-controller as node
name without a unit address (since it does not have a reg property).
Fixes: 70db166a2baa ("ARM64: dts: meson-gxbb: Add SCPI with cpufreq & sensors Nodes")
Signed-off-by: Martin Blumenstingl <[email protected]>
---
changes from v1 -> v2:
- new patch
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index f8b115cd6775..a79a35e84281 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -250,7 +250,7 @@ scpi {
scpi_clocks: clocks {
compatible = "arm,scpi-clocks";
- scpi_dvfs: scpi_clocks@0 {
+ scpi_dvfs: clock-controller {
compatible = "arm,scpi-dvfs-clocks";
#clock-cells = <1>;
clock-indices = <0>;
--
2.39.0
On 11/01/2023 22:13, Martin Blumenstingl wrote:
> Node names should be generic and use hyphens instead of underscores to
> not cause warnings. Also nodes without a reg property should not have a
> unit-address. Change the scpi_dvfs node to use clock-controller as node
> name without a unit address (since it does not have a reg property).
>
> Fixes: 70db166a2baa ("ARM64: dts: meson-gxbb: Add SCPI with cpufreq & sensors Nodes")
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> changes from v1 -> v2:
> - new patch
>
> arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> index f8b115cd6775..a79a35e84281 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> @@ -250,7 +250,7 @@ scpi {
> scpi_clocks: clocks {
> compatible = "arm,scpi-clocks";
>
> - scpi_dvfs: scpi_clocks@0 {
> + scpi_dvfs: clock-controller {
> compatible = "arm,scpi-dvfs-clocks";
> #clock-cells = <1>;
> clock-indices = <0>;
Reviewed-by: Neil Armstrong <[email protected]>
Hi,
On Wed, 11 Jan 2023 22:13:44 +0100, Martin Blumenstingl wrote:
> This series contains a few .dts fixes which were found during review of
> [0] (which is now the first patch in this series).
>
>
>
> [0] https://lore.kernel.org/linux-amlogic/[email protected]/
>
> [...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.3/arm64-dt)
[1/6] arm64: dts: meson-gxl: jethub-j80: Fix WiFi MAC address node
https://git.kernel.org/amlogic/c/f95acdb2b4af21caae2c76a48e565158181386ca
[2/6] arm64: dts: meson-gxl: jethub-j80: Fix Bluetooth MAC node name
https://git.kernel.org/amlogic/c/cb199de1d3aecb02556d8a6e26393015effa0a9f
[3/6] arm64: dts: meson-axg: jethub-j1xx: Fix MAC address node names
https://git.kernel.org/amlogic/c/2f66eeb06e3e8b1cac9e9093be3baadbac2709eb
[4/6] arm64: dts: meson-gx: Fix Ethernet MAC address unit name
https://git.kernel.org/amlogic/c/8ed5310356bfa47cc6bb4221ae6b21258c52e3d1
[5/6] arm64: dts: meson-g12a: Fix internal Ethernet PHY unit name
https://git.kernel.org/amlogic/c/e7303651bbc76c848007f1cfac1fbeaa65f600d1
[6/6] arm64: dts: meson-gx: Fix the SCPI DVFS node name and unit address
https://git.kernel.org/amlogic/c/f189c869ad92787ddd753558bcbae89d75825bb6
These changes has been applied on the intermediate git tree [1].
The v6.3/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.
In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].
The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.
If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
--
Neil
On 11/01/2023 22:13, Martin Blumenstingl wrote:
> Documentation/devicetree/bindings/net/ethernet-phy.yaml defines that the
> node name for Ethernet PHYs should match the following pattern:
> ^ethernet-phy(@[a-f0-9]+)?$
>
> Replace the underscore with a hyphen to adhere to this binding.
>
> Fixes: 280c17df8fbf ("arm64: dts: meson: g12a: add mdio multiplexer")
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> changes from v1 -> v2:
> - new patch
>
> arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 9dbd50820b1c..c95cf3afc666 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -1694,7 +1694,7 @@ int_mdio: mdio@1 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> - internal_ephy: ethernet_phy@8 {
> + internal_ephy: ethernet-phy@8 {
> compatible = "ethernet-phy-id0180.3301",
> "ethernet-phy-ieee802.3-c22";
> interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
Reviewed-by: Neil Armstrong <[email protected]>
On 11/01/2023 22:13, Martin Blumenstingl wrote:
> Unit addresses should be written using lower-case hex characters. Use
> wifi_mac@c to fix a yaml schema validation error once the eFuse
> dt-bindings have been converted to a yaml schema:
> efuse: Unevaluated properties are not allowed ('wifi_mac@C' was
> unexpected)
>
> Also node names should use hyphens instead of underscores as the latter
> can also cause warnings.
>
> Fixes: abfaae24ecf3 ("arm64: dts: meson-gxl: add support for JetHub H1")
> Acked-by: Vyacheslav Bocharov <[email protected]>
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> changes from v1 -> v2:
> - Added Vyacheslav's Acked-by (originally given as "Vyachesav", but my
> understanding is that this was a typo
> - Also replace the underscore in the node name with a hyphen
>
> .../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> index 6831137c5c10..270483e007bc 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> @@ -90,7 +90,7 @@ bt_mac: bt_mac@6 {
> reg = <0x6 0x6>;
> };
>
> - wifi_mac: wifi_mac@C {
> + wifi_mac: wifi-mac@c {
> reg = <0xc 0x6>;
> };
> };
Reviewed-by: Neil Armstrong <[email protected]>