| Message ID | 20230210122817.1027765-2-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: meson: gxbb-kii-pro: device-tree updates | expand |
On 10/02/2023 13:28, Christian Hewitt wrote: > Alpha-sort the nodes, move the default line in the LED node to where it's > normally found, and remove excess spacing. No functional changes. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com> > --- > .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 32 ++++++++----------- > 1 file changed, 14 insertions(+), 18 deletions(-) > > 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 6d8cc00fedc7..9bfdb54d912a 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts > @@ -6,21 +6,22 @@ > /dts-v1/; > > #include "meson-gxbb-p20x.dtsi" > - > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/leds/common.h> > + > / { > compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; > model = "Videostrong KII Pro"; > > leds { > compatible = "gpio-leds"; > + > status { > gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; > - default-state = "off"; > color = <LED_COLOR_ID_RED>; > function = LED_FUNCTION_STATUS; > + default-state = "off"; > }; > }; > > @@ -34,24 +35,8 @@ button-reset { > gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; > }; > }; > - > -}; > - > - > - > -&uart_A { > - status = "okay"; > - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; > - pinctrl-names = "default"; > - uart-has-rtscts; > - > - bluetooth { > - compatible = "brcm,bcm4335a0"; > - }; > }; > > - > - > ðmac { > status = "okay"; > pinctrl-0 = <ð_rmii_pins>; > @@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { > &ir { > linux,rc-map-name = "rc-videostrong-kii-pro"; > }; > + > +&uart_A { > + status = "okay"; > + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; > + pinctrl-names = "default"; > + uart-has-rtscts; > + > + bluetooth { > + compatible = "brcm,bcm4335a0"; > + }; > +}; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
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 6d8cc00fedc7..9bfdb54d912a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -6,21 +6,22 @@ /dts-v1/; #include "meson-gxbb-p20x.dtsi" - #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/leds/common.h> + / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; leds { compatible = "gpio-leds"; + status { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = <LED_COLOR_ID_RED>; function = LED_FUNCTION_STATUS; + default-state = "off"; }; }; @@ -34,24 +35,8 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - -}; - - - -&uart_A { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names = "default"; - uart-has-rtscts; - - bluetooth { - compatible = "brcm,bcm4335a0"; - }; }; - - ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; @@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { &ir { linux,rc-map-name = "rc-videostrong-kii-pro"; }; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4335a0"; + }; +};