ARM: dts: bcm283x: Remove gpio line name NC

[platform/kernel/linux-starfive.git] / arch / arm / boot / dts / bcm2837-rpi-3-b.dts

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index dd4a486..00ea439 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -4,6 +4,7 @@
 #include "bcm2836-rpi.dtsi"
 #include "bcm283x-rpi-smsc9514.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
+#include "bcm283x-rpi-wifi-bt.dtsi"
 
 / {
        compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
@@ -24,11 +25,10 @@
                        gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
                };
        };
+};
 
-       wifi_pwrseq: wifi-pwrseq {
-               compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
-       };
+&bt {
+       shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
 };
 
 &firmware {
@@ -54,7 +54,6 @@
         * the official GPU firmware DT blob.
         *
         * Legend:
-        * "NC" = not connected (no rail from the SoC)
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
@@ -134,13 +133,6 @@
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
-       status = "okay";
-
-       bluetooth {
-               compatible = "brcm,bcm43438-bt";
-               max-speed = <2000000>;
-               shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-       };
 };
 
 /* uart1 is mapped to the pin header */
@@ -150,23 +142,6 @@
        status = "okay";
 };
 
-/* SDHCI is used to control the SDIO for wireless */
-&sdhci {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&emmc_gpio34>;
-       status = "okay";
-       bus-width = <4>;
-       non-removable;
-       mmc-pwrseq = <&wifi_pwrseq>;
-
-       brcmf: wifi@1 {
-               reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
-       };
-};
-
 /* SDHOST is used to drive the SD card */
 &sdhost {
        pinctrl-names = "default";
@@ -174,3 +149,7 @@
        status = "okay";
        bus-width = <4>;
 };
+
+&wifi_pwrseq {
+       reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
+};