| Message ID | 20220113041746.16040-4-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: meson: minor P212/VIM1 fixups | expand |
Hi, On 13/01/2022 05:17, Christian Hewitt wrote: > The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi > so we can remove them from the VIM1 board dts. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > .../amlogic/meson-gxl-s905x-khadas-vim.dts | 19 ------------------- > 1 file changed, 19 deletions(-) > > 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 6ab1cc125b96..108232a5aa2e 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 > @@ -217,25 +217,6 @@ > pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; > }; > > -&sd_emmc_a { > - max-frequency = <100000000>; The SDIO freq is marked as 50000000 in the p212 DTSI and was explicitly changes by Jerome in adc52bf7ef16 ("arm64: dts: meson: fix mmc v2 chips max frequencies") The change is ok if you change the p212 DTSI to 100000000 aswell. > - > - brcmf: wifi@1 { > - reg = <1>; > - compatible = "brcm,bcm4329-fmac"; > - }; > -}; > - > -&uart_A { > - bluetooth { > - compatible = "brcm,bcm43438-bt"; > - shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; > - max-speed = <2000000>; > - clocks = <&wifi32k>; > - clock-names = "lpo"; > - }; > -}; > - > /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */ > &uart_AO { > status = "okay"; > With the change in p212 dtsi: Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Thanks, Neil
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 6ab1cc125b96..108232a5aa2e 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 @@ -217,25 +217,6 @@ pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; }; -&sd_emmc_a { - max-frequency = <100000000>; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - }; -}; - -&uart_A { - bluetooth { - compatible = "brcm,bcm43438-bt"; - shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; - max-speed = <2000000>; - clocks = <&wifi32k>; - clock-names = "lpo"; - }; -}; - /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */ &uart_AO { status = "okay";
The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi so we can remove them from the VIM1 board dts. Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 19 ------------------- 1 file changed, 19 deletions(-)