Merge tag 'arm-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / amlogic / meson-g12-common.dtsi

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index f84d4b4..45947c1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -845,6 +845,22 @@
                                                };
                                        };
 
+                                       pwm_f_z_pins: pwm-f-z {
+                                               mux {
+                                                       groups = "pwm_f_z";
+                                                       function = "pwm_f";
+                                                       bias-disable;
+                                               };
+                                       };
+
+                                       pwm_f_a_pins: pwm-f-a {
+                                               mux {
+                                                       groups = "pwm_f_a";
+                                                       function = "pwm_f";
+                                                       bias-disable;
+                                               };
+                                       };
+
                                        pwm_f_x_pins: pwm-f-x {
                                                mux {
                                                        groups = "pwm_f_x";
@@ -1887,6 +1903,33 @@
                                                };
                                        };
 
+                                       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_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";