* [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??)
@ 2024-06-06 8:48 Neil Armstrong
2024-06-06 8:48 ` [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller Neil Armstrong
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
Along with the following:
- https://lore.kernel.org/all/20240422-t7-reset-v2-1-cb82271d3296@amlogic.com/
- https://lore.kernel.org/all/20240513224552.800153-1-jan.dakinevich@salutedevices.com/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-spifc-v1-1-380f29ba4a16@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-convert-spdif-receiver-v1-1-262465adbac2@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-mmc-v1-1-4acbb8cc2626@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-nvmem-v1-1-ef6f10c86a63@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-phy-v1-1-c819b0ecd8c8@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-rng-v1-1-0a55a7ba55e4@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-audio-widgets-v1-1-65bd7cc2e09b@linaro.org/
- https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-sardac-v1-1-40a8de6baa59@linaro.org/
- https://lore.kernel.org/all/20240606-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-v2-1-70d44fa30790@linaro.org/
this bunch of changes fixes 99% of the remaining dts check errors.
The two remaining bindings conversions for arm64/amlogic are:
- ti,tas5707
- everest,es7241
I'm too lazy to do them right now, so if someone is interested
in doing the conversion, please do it!
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
Neil Armstrong (12):
arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller
arm64: dts: amlogic: move ao_pinctrl into aobus
arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node
arm64: dts: amlogic: sm1: fix tdm audio-controller clock order
arm64: dts: amlogic: sm1: fix tdm controllers compatible
arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells
arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec
arm64: dts: amlogic: axg: fix tdm audio-controller clock order
arm64: dts: amlogic: c3: use correct compatible for gpio_intc node
arm64: dts: amlogic: a1: use correct node name for mmc controller
arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400
arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 3 +-
arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 3 +-
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 17 +-
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +-
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 427 ++++++++++-----------
arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 16 +-
.../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 18 +-
arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 16 +-
.../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 18 +-
.../meson-g12b-bananapi-cm4-mnt-reform2.dts | 18 +-
.../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 30 +-
.../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 16 +-
.../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 16 +-
.../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 +-
.../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 18 +-
.../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 18 +-
.../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 16 +-
.../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 16 +-
.../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 17 +-
.../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 18 +-
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 17 +-
.../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 17 +-
.../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 +-
.../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 19 +-
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 17 +-
arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 17 +-
.../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 17 +-
.../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 17 +-
.../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 17 +-
.../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 17 +-
.../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 17 +-
.../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 17 +-
.../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 17 +-
.../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 17 +-
.../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 17 +-
.../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 17 +-
.../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 17 +-
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 17 +-
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 16 +-
.../dts/amlogic/meson-libretech-cottonwood.dtsi | 16 +-
.../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 16 +-
.../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 16 +-
.../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 16 +-
.../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 16 +-
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 16 +-
.../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 16 +-
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 36 +-
53 files changed, 679 insertions(+), 630 deletions(-)
---
base-commit: c3f38fa61af77b49866b006939479069cd451173
change-id: 20240606-topic-amlogic-upstream-bindings-fixes-dts-6a572ad54324
Best regards,
--
Neil Armstrong <neil.armstrong@linaro.org>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 02/12] arm64: dts: amlogic: move ao_pinctrl into aobus Neil Armstrong
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
The fan is connected to the GPIOAO_10 pin, which can be connected to the pwm_AO_cd
controller, but this one is already used for the vddcpu_b regulator.
The fan was wrongly described as using the pwm_cd with the invalid "pwm-gpios"
property, both are wrong so remove the fan until we find an acceptable solution.
This fixes the following error:
pwm@1a000: 'pwm-gpios' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
index 4b8db872bbf3..6a346cb86a53 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
@@ -44,13 +44,6 @@ emmc_pwrseq: emmc-pwrseq {
reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
};
- fan0: pwm-fan {
- compatible = "pwm-fan";
- #cooling-cells = <2>;
- cooling-levels = <0 120 170 220>;
- pwms = <&pwm_cd 1 40000 0>;
- };
-
hdmi-connector {
compatible = "hdmi-connector";
type = "a";
@@ -374,13 +367,6 @@ &pwm_ab {
clock-names = "clkin0";
};
-&pwm_cd {
- status = "okay";
- pinctrl-0 = <&pwm_d_x6_pins>;
- pinctrl-names = "default";
- pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>;
-};
-
&pwm_ef {
status = "okay";
pinctrl-0 = <&pwm_e_pins>;
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 02/12] arm64: dts: amlogic: move ao_pinctrl into aobus
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
2024-06-06 8:48 ` [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 03/12] arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node Neil Armstrong
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
The AO pinctrl was mis-described as beeing part of AO rti sysctrl, move it
it into aobus like it's also done in GX SoCs, and remove the now invalid
'#address-cells', '#size-cells' & 'ranges from the sys-ctrl@0 node.
This fixes:
sys-ctrl@0: '#address-cells', '#size-cells', 'ranges' do not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 427 +++++++++++-----------
1 file changed, 212 insertions(+), 215 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index b058ed78faf0..138fb18c6480 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1741,9 +1741,6 @@ rti: sys-ctrl@0 {
compatible = "amlogic,meson-gx-ao-sysctrl",
"simple-mfd", "syscon";
reg = <0x0 0x0 0x0 0x100>;
- #address-cells = <2>;
- #size-cells = <2>;
- ranges = <0x0 0x0 0x0 0x0 0x0 0x100>;
clkc_AO: clock-controller {
compatible = "amlogic,meson-g12a-aoclkc";
@@ -1752,278 +1749,278 @@ clkc_AO: clock-controller {
clocks = <&xtal>, <&clkc CLKID_CLK81>;
clock-names = "xtal", "mpeg-clk";
};
+ };
- ao_pinctrl: pinctrl {
- compatible = "amlogic,meson-g12a-aobus-pinctrl";
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
+ ao_pinctrl: pinctrl@14 {
+ compatible = "amlogic,meson-g12a-aobus-pinctrl";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ gpio_ao: bank@14 {
+ reg = <0x0 0x14 0x0 0x8>,
+ <0x0 0x1c 0x0 0x8>,
+ <0x0 0x24 0x0 0x14>;
+ reg-names = "mux",
+ "ds",
+ "gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&ao_pinctrl 0 0 15>;
+ };
- gpio_ao: bank@14 {
- reg = <0x0 0x14 0x0 0x8>,
- <0x0 0x1c 0x0 0x8>,
- <0x0 0x24 0x0 0x14>;
- reg-names = "mux",
- "ds",
- "gpio";
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&ao_pinctrl 0 0 15>;
+ i2c_ao_sck_pins: i2c_ao_sck_pins {
+ mux {
+ groups = "i2c_ao_sck";
+ function = "i2c_ao";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- i2c_ao_sck_pins: i2c_ao_sck_pins {
- mux {
- groups = "i2c_ao_sck";
- function = "i2c_ao";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ i2c_ao_sda_pins: i2c_ao_sda {
+ mux {
+ groups = "i2c_ao_sda";
+ function = "i2c_ao";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- i2c_ao_sda_pins: i2c_ao_sda {
- mux {
- groups = "i2c_ao_sda";
- function = "i2c_ao";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ i2c_ao_sck_e_pins: i2c_ao_sck_e {
+ mux {
+ groups = "i2c_ao_sck_e";
+ function = "i2c_ao";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- i2c_ao_sck_e_pins: i2c_ao_sck_e {
- mux {
- groups = "i2c_ao_sck_e";
- function = "i2c_ao";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ i2c_ao_sda_e_pins: i2c_ao_sda_e {
+ mux {
+ groups = "i2c_ao_sda_e";
+ function = "i2c_ao";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- i2c_ao_sda_e_pins: i2c_ao_sda_e {
- mux {
- groups = "i2c_ao_sda_e";
- function = "i2c_ao";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
- };
-
- mclk0_ao_pins: mclk0-ao {
- mux {
- groups = "mclk0_ao";
- function = "mclk0_ao";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ mclk0_ao_pins: mclk0-ao {
+ mux {
+ groups = "mclk0_ao";
+ function = "mclk0_ao";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_din0_pins: tdm-ao-b-din0 {
- mux {
- groups = "tdm_ao_b_din0";
- function = "tdm_ao_b";
- bias-disable;
- };
+ tdm_ao_b_din0_pins: tdm-ao-b-din0 {
+ mux {
+ groups = "tdm_ao_b_din0";
+ function = "tdm_ao_b";
+ bias-disable;
};
+ };
- spdif_ao_out_pins: spdif-ao-out {
- mux {
- groups = "spdif_ao_out";
- function = "spdif_ao_out";
- drive-strength-microamp = <500>;
- bias-disable;
- };
+ spdif_ao_out_pins: spdif-ao-out {
+ mux {
+ groups = "spdif_ao_out";
+ function = "spdif_ao_out";
+ drive-strength-microamp = <500>;
+ bias-disable;
};
+ };
- tdm_ao_b_din1_pins: tdm-ao-b-din1 {
- mux {
- groups = "tdm_ao_b_din1";
- function = "tdm_ao_b";
- bias-disable;
- };
+ tdm_ao_b_din1_pins: tdm-ao-b-din1 {
+ mux {
+ groups = "tdm_ao_b_din1";
+ function = "tdm_ao_b";
+ bias-disable;
};
+ };
- tdm_ao_b_din2_pins: tdm-ao-b-din2 {
- mux {
- groups = "tdm_ao_b_din2";
- function = "tdm_ao_b";
- bias-disable;
- };
+ tdm_ao_b_din2_pins: tdm-ao-b-din2 {
+ mux {
+ groups = "tdm_ao_b_din2";
+ function = "tdm_ao_b";
+ bias-disable;
};
+ };
- tdm_ao_b_dout0_pins: tdm-ao-b-dout0 {
- mux {
- groups = "tdm_ao_b_dout0";
- function = "tdm_ao_b";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ tdm_ao_b_dout0_pins: tdm-ao-b-dout0 {
+ mux {
+ groups = "tdm_ao_b_dout0";
+ function = "tdm_ao_b";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_dout1_pins: tdm-ao-b-dout1 {
- mux {
- groups = "tdm_ao_b_dout1";
- function = "tdm_ao_b";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ tdm_ao_b_dout1_pins: tdm-ao-b-dout1 {
+ mux {
+ groups = "tdm_ao_b_dout1";
+ function = "tdm_ao_b";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_dout2_pins: tdm-ao-b-dout2 {
- mux {
- groups = "tdm_ao_b_dout2";
- function = "tdm_ao_b";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ tdm_ao_b_dout2_pins: tdm-ao-b-dout2 {
+ mux {
+ groups = "tdm_ao_b_dout2";
+ function = "tdm_ao_b";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_fs_pins: tdm-ao-b-fs {
- mux {
- groups = "tdm_ao_b_fs";
- function = "tdm_ao_b";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ tdm_ao_b_fs_pins: tdm-ao-b-fs {
+ mux {
+ groups = "tdm_ao_b_fs";
+ function = "tdm_ao_b";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_sclk_pins: tdm-ao-b-sclk {
- mux {
- groups = "tdm_ao_b_sclk";
- function = "tdm_ao_b";
- bias-disable;
- drive-strength-microamp = <3000>;
- };
+ tdm_ao_b_sclk_pins: tdm-ao-b-sclk {
+ mux {
+ groups = "tdm_ao_b_sclk";
+ function = "tdm_ao_b";
+ bias-disable;
+ drive-strength-microamp = <3000>;
};
+ };
- tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs {
- mux {
- groups = "tdm_ao_b_slv_fs";
- function = "tdm_ao_b";
- bias-disable;
- };
+ tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs {
+ mux {
+ groups = "tdm_ao_b_slv_fs";
+ function = "tdm_ao_b";
+ bias-disable;
};
+ };
- tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk {
- mux {
- groups = "tdm_ao_b_slv_sclk";
- function = "tdm_ao_b";
- bias-disable;
- };
+ tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk {
+ mux {
+ groups = "tdm_ao_b_slv_sclk";
+ function = "tdm_ao_b";
+ bias-disable;
};
+ };
- uart_ao_a_pins: uart-a-ao {
- mux {
- groups = "uart_ao_a_tx",
- "uart_ao_a_rx";
- function = "uart_ao_a";
- bias-disable;
- };
+ uart_ao_a_pins: uart-a-ao {
+ mux {
+ groups = "uart_ao_a_tx",
+ "uart_ao_a_rx";
+ function = "uart_ao_a";
+ bias-disable;
};
+ };
- uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts {
- mux {
- groups = "uart_ao_a_cts",
- "uart_ao_a_rts";
- function = "uart_ao_a";
- bias-disable;
- };
+ uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts {
+ mux {
+ groups = "uart_ao_a_cts",
+ "uart_ao_a_rts";
+ function = "uart_ao_a";
+ bias-disable;
};
+ };
- uart_ao_b_2_3_pins: uart-ao-b-2-3 {
- mux {
- groups = "uart_ao_b_tx_2",
- "uart_ao_b_rx_3";
- function = "uart_ao_b";
- bias-disable;
- };
+ uart_ao_b_2_3_pins: uart-ao-b-2-3 {
+ mux {
+ groups = "uart_ao_b_tx_2",
+ "uart_ao_b_rx_3";
+ function = "uart_ao_b";
+ bias-disable;
};
+ };
- uart_ao_b_8_9_pins: uart-ao-b-8-9 {
- mux {
- groups = "uart_ao_b_tx_8",
- "uart_ao_b_rx_9";
- function = "uart_ao_b";
- bias-disable;
- };
+ uart_ao_b_8_9_pins: uart-ao-b-8-9 {
+ mux {
+ groups = "uart_ao_b_tx_8",
+ "uart_ao_b_rx_9";
+ function = "uart_ao_b";
+ bias-disable;
};
+ };
- uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
- mux {
- groups = "uart_ao_b_cts",
- "uart_ao_b_rts";
- function = "uart_ao_b";
- bias-disable;
- };
+ uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+ mux {
+ groups = "uart_ao_b_cts",
+ "uart_ao_b_rts";
+ function = "uart_ao_b";
+ bias-disable;
};
+ };
- pwm_a_e_pins: pwm-a-e {
- mux {
- groups = "pwm_a_e";
- function = "pwm_a_e";
- bias-disable;
- };
+ pwm_a_e_pins: pwm-a-e {
+ mux {
+ groups = "pwm_a_e";
+ function = "pwm_a_e";
+ bias-disable;
};
+ };
- pwm_ao_a_pins: pwm-ao-a {
- mux {
- groups = "pwm_ao_a";
- function = "pwm_ao_a";
- bias-disable;
- };
+ pwm_ao_a_pins: pwm-ao-a {
+ mux {
+ groups = "pwm_ao_a";
+ function = "pwm_ao_a";
+ bias-disable;
};
+ };
- pwm_ao_b_pins: pwm-ao-b {
- mux {
- groups = "pwm_ao_b";
- function = "pwm_ao_b";
- bias-disable;
- };
+ pwm_ao_b_pins: pwm-ao-b {
+ mux {
+ groups = "pwm_ao_b";
+ function = "pwm_ao_b";
+ bias-disable;
};
+ };
- pwm_ao_c_4_pins: pwm-ao-c-4 {
- mux {
- groups = "pwm_ao_c_4";
- function = "pwm_ao_c";
- bias-disable;
- };
+ pwm_ao_c_4_pins: pwm-ao-c-4 {
+ mux {
+ groups = "pwm_ao_c_4";
+ function = "pwm_ao_c";
+ bias-disable;
};
+ };
- pwm_ao_c_6_pins: pwm-ao-c-6 {
- mux {
- groups = "pwm_ao_c_6";
- function = "pwm_ao_c";
- bias-disable;
- };
+ pwm_ao_c_6_pins: pwm-ao-c-6 {
+ mux {
+ groups = "pwm_ao_c_6";
+ function = "pwm_ao_c";
+ bias-disable;
};
+ };
- pwm_ao_d_5_pins: pwm-ao-d-5 {
- mux {
- groups = "pwm_ao_d_5";
- function = "pwm_ao_d";
- bias-disable;
- };
+ pwm_ao_d_5_pins: pwm-ao-d-5 {
+ mux {
+ groups = "pwm_ao_d_5";
+ function = "pwm_ao_d";
+ bias-disable;
};
+ };
- pwm_ao_d_10_pins: pwm-ao-d-10 {
- mux {
- groups = "pwm_ao_d_10";
- function = "pwm_ao_d";
- bias-disable;
- };
+ pwm_ao_d_10_pins: pwm-ao-d-10 {
+ mux {
+ groups = "pwm_ao_d_10";
+ function = "pwm_ao_d";
+ bias-disable;
};
+ };
- pwm_ao_d_e_pins: pwm-ao-d-e {
- mux {
- groups = "pwm_ao_d_e";
- function = "pwm_ao_d";
- };
+ pwm_ao_d_e_pins: pwm-ao-d-e {
+ mux {
+ groups = "pwm_ao_d_e";
+ function = "pwm_ao_d";
};
+ };
- remote_input_ao_pins: remote-input-ao {
- mux {
- groups = "remote_ao_input";
- function = "remote_ao_input";
- bias-disable;
- };
+ remote_input_ao_pins: remote-input-ao {
+ mux {
+ groups = "remote_ao_input";
+ function = "remote_ao_input";
+ bias-disable;
};
};
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 03/12] arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
2024-06-06 8:48 ` [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller Neil Armstrong
2024-06-06 8:48 ` [PATCH 02/12] arm64: dts: amlogic: move ao_pinctrl into aobus Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order Neil Armstrong
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
The assigne-clocks* properties should be used in nodes depending or sharing
those clocks, so move tose properties from the sound node to either:
- clkc on GX* SoCs
- clkc_audio on AXG/G12*/SM1 SoCs
This fixes all the following errors:
sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected)
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-sound-card.yaml#
sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected)
from schema $id: http://devicetree.org/schemas/sound/amlogic,gx-sound-card.yaml#
sound: 'anyOf' conditional failed, one must be fixed:
'clocks' is a required property
'#clock-cells' is a required property
from schema $id: http://devicetree.org/schemas/clock/clock.yaml#
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 16 ++++++++--------
.../boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 18 ++++++++++--------
.../amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts | 18 ++++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 16 ++++++++--------
.../boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 18 ++++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 18 ++++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 18 +++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 17 ++++++++++-------
.../boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 17 ++++++++++-------
.../boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 17 ++++++++++-------
.../dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 17 ++++++++++-------
.../boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 17 ++++++++++-------
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 16 ++++++++--------
.../boot/dts/amlogic/meson-libretech-cottonwood.dtsi | 16 ++++++++--------
.../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 16 ++++++++--------
.../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 16 ++++++++--------
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 16 ++++++++--------
48 files changed, 435 insertions(+), 363 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 7ed526f45175..b2ff20737914 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -268,13 +268,6 @@ sound {
"Speaker1 Right", "SPK1 OUT_D",
"Linein AINL", "Linein",
"Linein AINR", "Linein";
- assigned-clocks = <&clkc CLKID_HIFI_PLL>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <589824000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&frddr_a>;
@@ -354,6 +347,16 @@ wifi32k: wifi32k {
};
};
+&clkc_audio {
+ assigned-clocks = <&clkc CLKID_HIFI_PLL>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <589824000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rgmii_y_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
index af211d8f3952..6b2e4cf52ca9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
@@ -176,14 +176,6 @@ sound {
"SPDIFOUT_A IN 1", "FRDDR_B OUT 3",
"SPDIFOUT_A IN 2", "FRDDR_C OUT 3";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -256,6 +248,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
index 15b9bc280706..0c1cf498e9de 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -138,14 +138,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -209,6 +201,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
index 61cb8135a392..bb30e087b7e1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
@@ -201,14 +201,6 @@ sound {
"TODDR_B IN 1", "TDMIN_B OUT",
"TODDR_C IN 1", "TDMIN_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -303,6 +295,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index 3da7922d83f1..17c38bb3368c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -239,14 +239,6 @@ sound {
"Lineout", "10U2 OUTL",
"Lineout", "10U2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -396,6 +388,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
index 05c7a1e3f1b7..f7deeac4fe1a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
@@ -158,14 +158,6 @@ sound {
"SPDIFOUT_A IN 1", "FRDDR_B OUT 3",
"SPDIFOUT_A IN 2", "FRDDR_C OUT 3";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -252,6 +244,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
index 13d478f9c891..18085a5bf065 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
@@ -70,14 +70,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -120,6 +112,16 @@ &cecb_AO {
status = "okay";
};
+&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts
index 003efed529ba..a53d30692842 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts
@@ -79,14 +79,6 @@ sound {
"LINPUT1", "Mic Jack",
"Mic Jack", "MICB";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -253,6 +245,16 @@ &cecb_AO {
status = "okay";
};
+&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
index 6a346cb86a53..f6615e5c8d92 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
@@ -194,14 +194,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -245,6 +237,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
index bb73e10b5e74..c7cd7894239c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
@@ -48,14 +48,6 @@ sound {
"TDMOUT_A IN 2", "FRDDR_C OUT 1",
"TDM_A Playback", "TDMOUT_A OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -98,6 +90,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
index 6eeedd54ab91..8257a4e2b0f4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
@@ -49,14 +49,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -99,6 +91,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
index 0da386cabe1a..3dbd42f13fb3 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
@@ -37,14 +37,6 @@ sound {
"SPDIFOUT_A IN 1", "FRDDR_B OUT 3",
"SPDIFOUT_A IN 2", "FRDDR_C OUT 3";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -110,6 +102,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index eed2a23047ca..b05d6a5fe15d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -234,14 +234,6 @@ sound {
"Internal Speakers", "Speaker Amplifier OUTL",
"Internal Speakers", "Speaker Amplifier OUTR";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -608,6 +600,14 @@ regulator-state-mem {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
index d80dd9a3da31..2d341c256d7a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -71,14 +71,6 @@ sound {
"Lineout", "U19 OUTL",
"Lineout", "U19 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -163,6 +155,16 @@ &acodec {
status = "okay";
};
+&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
pinctrl-0 = <ð_pins>, <ð_rgmii_pins>;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts
index e26f3e3258e1..9fed17bec9ea 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts
@@ -39,14 +39,6 @@ sound {
"TODDR_B IN 6", "TDMIN_LB OUT",
"TODDR_C IN 6", "TDMIN_LB OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -97,6 +89,16 @@ codec {
};
};
+&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ð_phy {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
index 890f5bfebb03..aeb288aaf27a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
@@ -169,14 +169,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -241,6 +233,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
index 6396f190d703..81ba35e4bd7c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
@@ -32,14 +32,6 @@ sound {
"SPDIFOUT_A IN 1", "FRDDR_B OUT 3",
"SPDIFOUT_A IN 2", "FRDDR_C OUT 3";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -105,6 +97,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
index efd662a452e8..d7b95d9f8bcd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
@@ -194,13 +194,6 @@ sound {
"AU2 INR", "ACODEC LORN",
"7J4-14 LEFT", "AU2 OUTL",
"7J4-11 RIGHT", "AU2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -254,6 +247,16 @@ &cec_AO {
status = "okay";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 08d6b69ba469..4206bf1baddd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -129,13 +129,7 @@ sound {
"AU2 INR", "ACODEC LORN",
"Lineout", "AU2 OUTL",
"Lineout", "AU2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
+
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
};
@@ -203,6 +197,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
index f28452b9f00f..1da38008241a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
@@ -45,13 +45,6 @@ button-reset {
sound {
compatible = "amlogic,gx-sound-card";
model = "KII-PRO";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -95,6 +88,16 @@ &aiu {
pinctrl-names = "default";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index 1fd2e56e6b08..5c7f78e011f9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -135,13 +135,6 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,gx-sound-card";
model = "NANOPI-K2";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -178,6 +171,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index cca129ce2c58..79d87943b2b6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -142,13 +142,6 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,gx-sound-card";
model = "NEXBOX-A95X";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -178,6 +171,16 @@ &aiu {
status = "okay";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index c431986e6a33..d4e5c960d4cd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -177,13 +177,6 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,gx-sound-card";
model = "ODROID-C2";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -220,6 +213,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rgmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 7f94716876d3..d00a579be5d1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -68,13 +68,6 @@ button-menu {
sound {
compatible = "amlogic,gx-sound-card";
model = "P200";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -118,6 +111,16 @@ &aiu {
pinctrl-names = "default";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rgmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
index 6f81eed83bec..b5bce8b56022 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
@@ -17,13 +17,6 @@ / {
sound {
compatible = "amlogic,gx-sound-card";
model = "P201";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -53,6 +46,16 @@ &aiu {
status = "okay";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 255e93a0b36d..87d639c06b3b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -108,13 +108,6 @@ sdio_pwrseq: sdio-pwrseq {
sound {
compatible = "amlogic,gx-sound-card";
model = "VEGA-S95";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -165,6 +158,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
pinctrl-0 = <ð_rgmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
index af9ea32a2876..0bcca84e85e2 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
@@ -16,13 +16,6 @@ / {
sound {
compatible = "amlogic,gx-sound-card";
model = "WETEK-HUB";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -52,6 +45,16 @@ &aiu {
status = "okay";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&ir {
linux,rc-map-name = "rc-wetek-hub";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
index 376760d86766..72b2937e291f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
@@ -48,13 +48,6 @@ button {
sound {
compatible = "amlogic,gx-sound-card";
model = "WETEK-PLAY2";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -98,6 +91,16 @@ &aiu {
pinctrl-names = "default";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&i2c_A {
status = "okay";
pinctrl-0 = <&i2c_a_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
index 90ef9c17d80b..cad577f7c9c6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
@@ -123,13 +123,6 @@ sound {
"Speaker", "9J5-2 RIGHT";
audio-routing = "9J5-3 LEFT", "ACODEC LOLN",
"9J5-2 RIGHT", "ACODEC LORN";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -183,6 +176,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
index 08a4718219b1..a08f3555ac4a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
@@ -128,13 +128,6 @@ sound {
"AU2 INR", "ACODEC LORN",
"Lineout", "AU2 OUTL",
"Lineout", "AU2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -188,6 +181,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index fea65f20523a..9625111b8517 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -67,13 +67,6 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,gx-sound-card";
model = "KHADAS-VIM";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -110,6 +103,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&hdmi_tx {
status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
index 63b20860067c..5c2a2b55506f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
@@ -160,13 +160,6 @@ vcc_1v8: regulator-vcc-1v8 {
sound {
compatible = "amlogic,gx-sound-card";
model = "LIBRETECH-CC-V2";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -203,6 +196,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 8b26c9661be1..4f4d1546fa05 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -142,13 +142,6 @@ sound {
"AU2 INR", "ACODEC LORN",
"Lineout", "AU2 OUTL",
"Lineout", "AU2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -202,6 +195,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
index 9b4ea6a49398..c8c7d9d2a020 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
@@ -50,13 +50,6 @@ sound {
"AU2 INR", "ACODEC LORN",
"Lineout", "AU2 OUTL",
"Lineout", "AU2 OUTR";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
};
@@ -109,6 +102,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
index 07e7c3bedea0..b5e925b212ce 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
@@ -150,13 +150,6 @@ wifi32k: wifi32k {
sound {
compatible = "amlogic,gx-sound-card";
model = "KHADAS-VIM2";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -193,6 +186,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cpu_cooling_maps {
map0 {
cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index ad2dd4ad0a31..73248cc4edde 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -86,13 +86,6 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,gx-sound-card";
model = "NEXBOX-A1";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -143,6 +136,16 @@ &cec_AO {
hdmi-phandle = <&hdmi_tx>;
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
index d05dde8da5c5..a126fb057e0f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
@@ -101,13 +101,6 @@ sdio_pwrseq: sdio-pwrseq {
sound {
compatible = "amlogic,gx-sound-card";
model = "RBOX-PRO";
- assigned-clocks = <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>,
- <&clkc CLKID_MPLL2>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
@@ -151,6 +144,16 @@ &aiu {
pinctrl-names = "default";
};
+&clkc {
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+};
+
ðmac {
status = "okay";
diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
index e78cc9b577a0..028d58702003 100644
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
@@ -182,14 +182,6 @@ sound {
"TODDR_B IN 0", "TDMIN_A OUT",
"TODDR_C IN 0", "TDMIN_A OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -252,6 +244,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
index 082b72703cdf..784b816f7ef8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
@@ -200,14 +200,6 @@ sound {
<&tdmin_a>, <&tdmin_b>, <&tdmin_c>,
<&dioo2133>;
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -353,6 +345,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
index 9b2eb6e42651..72319430737b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -73,6 +65,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts
index 6e34fd80ed71..b42bcfae43b9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -73,6 +65,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
index 586034316ec3..f98953340645 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -69,6 +61,14 @@ codec {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
index f045bf851638..a1dfee63e158 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
@@ -57,14 +57,6 @@ sound {
"Lineout", "ACODEC LOLP",
"Lineout", "ACODEC LORP";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -151,6 +143,14 @@ &acodec {
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
index e6e9410d40cb..de7ee1d2d911 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -73,6 +65,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index 951eb8e3f0c0..b3b30041324f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -174,14 +174,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -239,6 +231,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
index 3581e14cbf18..27e480873767 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
@@ -239,14 +239,6 @@ sound {
"TODDR_B IN 1", "TDMIN_B OUT",
"TODDR_C IN 1", "TDMIN_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -348,6 +340,14 @@ &cecb_AO {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
index fc9b961133cd..50c4c56f6359 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -73,6 +65,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts
index 9ea969255b4f..59269dcd47e0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts
@@ -22,14 +22,6 @@ sound {
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
"TDM_B Playback", "TDMOUT_B OUT";
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
dai-link-0 {
sound-dai = <&frddr_a>;
};
@@ -73,6 +65,14 @@ &arb {
};
&clkc_audio {
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
status = "okay";
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (2 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 03/12] arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible Neil Armstrong
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
Fix the clock order in the tdm audio-controller nodes,
this fixes the following errors:
audio-controller-0: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-0: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-0: clock-names:2: 'mclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:2: 'mclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:2: 'mclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
index 643f94d9d08e..6822c2f3cfed 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -17,10 +17,10 @@ tdmif_a: audio-controller-0 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_A";
- clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
- <&clkc_audio AUD_CLKID_MST_A_SCLK>,
- <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_A_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_A_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_A_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
@@ -28,10 +28,10 @@ tdmif_b: audio-controller-1 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_B";
- clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
- <&clkc_audio AUD_CLKID_MST_B_SCLK>,
- <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_B_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_B_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_B_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
@@ -39,10 +39,10 @@ tdmif_c: audio-controller-2 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_C";
- clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
- <&clkc_audio AUD_CLKID_MST_C_SCLK>,
- <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_C_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_C_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_C_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (3 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells Neil Armstrong
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
Fixes the following:
audio-controller@300: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml#
audio-controller@340: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml#
audio-controller@380: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml#
audio-controller@3c0: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml#
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
index 6822c2f3cfed..d13cf5b4aac7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -275,8 +275,7 @@ arb: reset-controller@280 {
};
tdmin_a: audio-controller@300 {
- compatible = "amlogic,sm1-tdmin",
- "amlogic,axg-tdmin";
+ compatible = "amlogic,sm1-tdmin";
reg = <0x0 0x300 0x0 0x40>;
sound-name-prefix = "TDMIN_A";
resets = <&clkc_audio AUD_RESET_TDMIN_A>;
@@ -291,8 +290,7 @@ tdmin_a: audio-controller@300 {
};
tdmin_b: audio-controller@340 {
- compatible = "amlogic,sm1-tdmin",
- "amlogic,axg-tdmin";
+ compatible = "amlogic,sm1-tdmin";
reg = <0x0 0x340 0x0 0x40>;
sound-name-prefix = "TDMIN_B";
resets = <&clkc_audio AUD_RESET_TDMIN_B>;
@@ -307,8 +305,7 @@ tdmin_b: audio-controller@340 {
};
tdmin_c: audio-controller@380 {
- compatible = "amlogic,sm1-tdmin",
- "amlogic,axg-tdmin";
+ compatible = "amlogic,sm1-tdmin";
reg = <0x0 0x380 0x0 0x40>;
sound-name-prefix = "TDMIN_C";
resets = <&clkc_audio AUD_RESET_TDMIN_C>;
@@ -323,8 +320,7 @@ tdmin_c: audio-controller@380 {
};
tdmin_lb: audio-controller@3c0 {
- compatible = "amlogic,sm1-tdmin",
- "amlogic,axg-tdmin";
+ compatible = "amlogic,sm1-tdmin";
reg = <0x0 0x3c0 0x0 0x40>;
sound-name-prefix = "TDMIN_LB";
resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (4 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec Neil Armstrong
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
audio-amplifier-0: '#sound-dai-cells' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index 17c38bb3368c..e0f15d824249 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -24,7 +24,6 @@ dioo2133: audio-amplifier-0 {
compatible = "simple-audio-amplifier";
enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
VCC-supply = <&vcc_5v>;
- #sound-dai-cells = <0>;
sound-name-prefix = "10U2";
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (5 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order Neil Armstrong
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
audio-controller@32000: 'AVDD-supply' is a required property
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index e0f15d824249..7560e471c56e 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -365,6 +365,7 @@ codec {
};
&acodec {
+ AVDD-supply = <&vddao_1v8>;
status = "okay";
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (6 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node Neil Armstrong
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
audio-controller-0: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-0: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-0: clock-names:2: 'mclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-1: clock-names:2: 'mclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:0: 'sclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:1: 'lrclk' was expected
from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml#
audio-controller-2: clock-names:2: 'mclk' was expected
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 6d12b760b90f..e9b22868983d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -25,10 +25,10 @@ tdmif_a: audio-controller-0 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_A";
- clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
- <&clkc_audio AUD_CLKID_MST_A_SCLK>,
- <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_A_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_A_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_A_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
@@ -36,10 +36,10 @@ tdmif_b: audio-controller-1 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_B";
- clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
- <&clkc_audio AUD_CLKID_MST_B_SCLK>,
- <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_B_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_B_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_B_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
@@ -47,10 +47,10 @@ tdmif_c: audio-controller-2 {
compatible = "amlogic,axg-tdm-iface";
#sound-dai-cells = <0>;
sound-name-prefix = "TDM_C";
- clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
- <&clkc_audio AUD_CLKID_MST_C_SCLK>,
- <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
- clock-names = "mclk", "sclk", "lrclk";
+ clocks = <&clkc_audio AUD_CLKID_MST_C_SCLK>,
+ <&clkc_audio AUD_CLKID_MST_C_LRCLK>,
+ <&clkc_audio AUD_CLKID_MST_C_MCLK>;
+ clock-names = "sclk", "lrclk", "mclk";
status = "disabled";
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (7 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller Neil Armstrong
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
interrupt-controller@4080: compatible: 'oneOf' conditional failed, one must be fixed:
['amlogic,meson-gpio-intc', 'amlogic,c3-gpio-intc'] is too long
'amlogic,meson-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
'amlogic,meson-gpio-intc' was expected
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index 32a754fe7990..f8fb060c49ae 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -111,8 +111,7 @@ gpio: bank@4000 {
};
gpio_intc: interrupt-controller@4080 {
- compatible = "amlogic,meson-gpio-intc",
- "amlogic,c3-gpio-intc";
+ compatible = "amlogic,c3-gpio-intc", "amlogic,meson-gpio-intc";
reg = <0x0 0x4080 0x0 0x0020>;
interrupt-controller;
#interrupt-cells = <2>;
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (8 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400 Neil Armstrong
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
sd@10000: $nodename:0: 'sd@10000' does not match '^mmc(@.*)?$'
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
index c03e207ea6c5..4be801d12c4b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -419,7 +419,7 @@ clkc_pll: pll-clock-controller@7c80 {
clock-names = "fixpll_in", "hifipll_in";
};
- sd_emmc: sd@10000 {
+ sd_emmc: mmc@10000 {
compatible = "amlogic,meson-axg-mmc";
reg = <0x0 0x10000 0x0 0x800>;
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (9 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-06 8:48 ` [PATCH 12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property Neil Armstrong
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
usb@fe004400: 'reset-name' does not match any of the regexes: '^usb@[0-9a-f]+$', 'pinctrl-[0-9]+'
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
index 4be801d12c4b..ade3a51ce89d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -453,7 +453,6 @@ usb: usb@fe004400 {
assigned-clocks = <&clkc_periphs CLKID_USB_BUS>;
assigned-clock-rates = <64000000>;
resets = <&reset RESET_USBCTRL>;
- reset-name = "usb_ctrl";
dr_mode = "otg";
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (10 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400 Neil Armstrong
@ 2024-06-06 8:48 ` Neil Armstrong
2024-06-07 6:06 ` [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Christian Hewitt
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-06 8:48 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Neil Armstrong
This fixes the following:
hub@1: 'reset-gpio' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id: http://devicetree.org/schemas/usb/genesys,gl850g.yaml#
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index d4e5c960d4cd..cafbd5f5b913 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -411,6 +411,6 @@ hub@1 {
compatible = "usb5e3,610";
reg = <1>;
vdd-supply = <&p5v0>;
- reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
};
};
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??)
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (11 preceding siblings ...)
2024-06-06 8:48 ` [PATCH 12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property Neil Armstrong
@ 2024-06-07 6:06 ` Christian Hewitt
2024-06-07 9:16 ` Neil Armstrong
2024-06-07 9:18 ` (subset) " Neil Armstrong
14 siblings, 0 replies; 16+ messages in thread
From: Christian Hewitt @ 2024-06-07 6:06 UTC (permalink / raw)
To: Neil Armstrong
Cc: Kevin Hilman, Jerome Brunet, Martin Blumenstingl, devicetree,
linux-arm-kernel, AML, LKML
> On 6 Jun 2024, at 12:48 PM, Neil Armstrong <neil.armstrong@linaro.org> wrote:
>
> Along with the following:
> - https://lore.kernel.org/all/20240422-t7-reset-v2-1-cb82271d3296@amlogic.com/
> - https://lore.kernel.org/all/20240513224552.800153-1-jan.dakinevich@salutedevices.com/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-spifc-v1-1-380f29ba4a16@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-convert-spdif-receiver-v1-1-262465adbac2@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-mmc-v1-1-4acbb8cc2626@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-nvmem-v1-1-ef6f10c86a63@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-phy-v1-1-c819b0ecd8c8@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-rng-v1-1-0a55a7ba55e4@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-audio-widgets-v1-1-65bd7cc2e09b@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-sardac-v1-1-40a8de6baa59@linaro.org/
> - https://lore.kernel.org/all/20240606-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-v2-1-70d44fa30790@linaro.org/
>
> this bunch of changes fixes 99% of the remaining dts check errors.
>
> The two remaining bindings conversions for arm64/amlogic are:
> - ti,tas5707
> - everest,es7241
>
> I'm too lazy to do them right now, so if someone is interested
> in doing the conversion, please do it!
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
For the series, tested with multiple ‘meson’ boards (GXBB/GXL/GXM/G12B):
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??)
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (12 preceding siblings ...)
2024-06-07 6:06 ` [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Christian Hewitt
@ 2024-06-07 9:16 ` Neil Armstrong
2024-06-07 9:18 ` (subset) " Neil Armstrong
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-07 9:16 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel
On 06/06/2024 10:48, Neil Armstrong wrote:
> Along with the following:
> - https://lore.kernel.org/all/20240422-t7-reset-v2-1-cb82271d3296@amlogic.com/
> - https://lore.kernel.org/all/20240513224552.800153-1-jan.dakinevich@salutedevices.com/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-spifc-v1-1-380f29ba4a16@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-convert-spdif-receiver-v1-1-262465adbac2@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-mmc-v1-1-4acbb8cc2626@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-nvmem-v1-1-ef6f10c86a63@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-phy-v1-1-c819b0ecd8c8@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-rng-v1-1-0a55a7ba55e4@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-audio-widgets-v1-1-65bd7cc2e09b@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-sardac-v1-1-40a8de6baa59@linaro.org/
> - https://lore.kernel.org/all/20240606-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-v2-1-70d44fa30790@linaro.org/
>
> this bunch of changes fixes 99% of the remaining dts check errors.
>
> The two remaining bindings conversions for arm64/amlogic are:
> - ti,tas5707
> - everest,es7241
>
> I'm too lazy to do them right now, so if someone is interested
> in doing the conversion, please do it!
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
> Neil Armstrong (12):
> arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller
> arm64: dts: amlogic: move ao_pinctrl into aobus
> arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node
> arm64: dts: amlogic: sm1: fix tdm audio-controller clock order
> arm64: dts: amlogic: sm1: fix tdm controllers compatible
> arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells
> arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec
> arm64: dts: amlogic: axg: fix tdm audio-controller clock order
> arm64: dts: amlogic: c3: use correct compatible for gpio_intc node
> arm64: dts: amlogic: a1: use correct node name for mmc controller
> arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400
> arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property
>
> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 3 +-
> arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 3 +-
> arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 17 +-
> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +-
> arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 427 ++++++++++-----------
> arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 16 +-
> .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 18 +-
> arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 16 +-
> .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 18 +-
> .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 18 +-
> .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 30 +-
> .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 16 +-
> .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 16 +-
> .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 +-
> .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 18 +-
> .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 18 +-
> .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 16 +-
> .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 16 +-
> .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 17 +-
> .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 18 +-
> arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 17 +-
> .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 17 +-
> .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 +-
> .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 19 +-
> arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 17 +-
> arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 17 +-
> .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 17 +-
> .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 17 +-
> .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 17 +-
> .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 17 +-
> .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 17 +-
> .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 17 +-
> .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 17 +-
> .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 17 +-
> .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 17 +-
> .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 17 +-
> .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 17 +-
> arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 17 +-
> arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 16 +-
> .../dts/amlogic/meson-libretech-cottonwood.dtsi | 16 +-
> .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 16 +-
> .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 16 +-
> .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 16 +-
> .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 16 +-
> arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 16 +-
> .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 16 +-
> arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 36 +-
> 53 files changed, 679 insertions(+), 630 deletions(-)
> ---
> base-commit: c3f38fa61af77b49866b006939479069cd451173
> change-id: 20240606-topic-amlogic-upstream-bindings-fixes-dts-6a572ad54324
>
> Best regards,
I'll postpone applying patch 3 to be sure it's the right solution,
but the other ones are trivial and I'll apply them now.
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: (subset) [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??)
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
` (13 preceding siblings ...)
2024-06-07 9:16 ` Neil Armstrong
@ 2024-06-07 9:18 ` Neil Armstrong
14 siblings, 0 replies; 16+ messages in thread
From: Neil Armstrong @ 2024-06-07 9:18 UTC (permalink / raw)
To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl, Neil Armstrong
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel
Hi,
On Thu, 06 Jun 2024 10:48:07 +0200, Neil Armstrong wrote:
> Along with the following:
> - https://lore.kernel.org/all/20240422-t7-reset-v2-1-cb82271d3296@amlogic.com/
> - https://lore.kernel.org/all/20240513224552.800153-1-jan.dakinevich@salutedevices.com/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-spifc-v1-1-380f29ba4a16@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-convert-spdif-receiver-v1-1-262465adbac2@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-mmc-v1-1-4acbb8cc2626@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-nvmem-v1-1-ef6f10c86a63@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-phy-v1-1-c819b0ecd8c8@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-rng-v1-1-0a55a7ba55e4@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-audio-widgets-v1-1-65bd7cc2e09b@linaro.org/
> - https://lore.kernel.org/all/20240605-topic-amlogic-upstream-bindings-fixes-power-domains-sardac-v1-1-40a8de6baa59@linaro.org/
> - https://lore.kernel.org/all/20240606-topic-amlogic-upstream-bindings-convert-g12a-tohdmitx-v2-1-70d44fa30790@linaro.org/
>
> [...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.11/arm64-dt)
[01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller
https://git.kernel.org/amlogic/c/1095ad0e92175d19cb7f0b5256af300c921a2d63
[02/12] arm64: dts: amlogic: move ao_pinctrl into aobus
https://git.kernel.org/amlogic/c/cf42ea27fd7f087b43da27b709267211e7e0e8c4
[04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order
https://git.kernel.org/amlogic/c/2478d7bee215cdf6a3a581239d12a17407e30771
[05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible
https://git.kernel.org/amlogic/c/94befcb819d47b155554997ccfac52354d1b4380
[06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells
https://git.kernel.org/amlogic/c/4b7df533684032233f65ea1157ec94215ab3f3da
[07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec
https://git.kernel.org/amlogic/c/5dab35f183b30c40fb7fb99015811edde96f90d6
[08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order
https://git.kernel.org/amlogic/c/0cb2a3b0d10a3938df546913d738bca121667455
[09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node
https://git.kernel.org/amlogic/c/e5d4d006a8c5504dfebce7f090ddfb75444491ba
[10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller
https://git.kernel.org/amlogic/c/ea99706a438f19cf352242ffabab46bbc76a03d3
[11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400
https://git.kernel.org/amlogic/c/edc15ee0e43948568fa5380c9147feb9a767ae67
[12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property
https://git.kernel.org/amlogic/c/e822ce43968daf9da4368617d2c948c22ccf93f9
These changes has been applied on the intermediate git tree [1].
The v6.11/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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-06-07 9:18 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-06 8:48 [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Neil Armstrong
2024-06-06 8:48 ` [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller Neil Armstrong
2024-06-06 8:48 ` [PATCH 02/12] arm64: dts: amlogic: move ao_pinctrl into aobus Neil Armstrong
2024-06-06 8:48 ` [PATCH 03/12] arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node Neil Armstrong
2024-06-06 8:48 ` [PATCH 04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order Neil Armstrong
2024-06-06 8:48 ` [PATCH 05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible Neil Armstrong
2024-06-06 8:48 ` [PATCH 06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells Neil Armstrong
2024-06-06 8:48 ` [PATCH 07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec Neil Armstrong
2024-06-06 8:48 ` [PATCH 08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order Neil Armstrong
2024-06-06 8:48 ` [PATCH 09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node Neil Armstrong
2024-06-06 8:48 ` [PATCH 10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller Neil Armstrong
2024-06-06 8:48 ` [PATCH 11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400 Neil Armstrong
2024-06-06 8:48 ` [PATCH 12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property Neil Armstrong
2024-06-07 6:06 ` [PATCH 00/12] arm64: meson: bunch of DT fixes, take 4 (final one ??) Christian Hewitt
2024-06-07 9:16 ` Neil Armstrong
2024-06-07 9:18 ` (subset) " Neil Armstrong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®