From: Ajay Singh <ajay.kathat@xxxxxxxxxxxxx> Merged the DT binding documentation of SDIO and SPI into a single file. Removed documentation for some of the properties which are not required and handled review comments received in [1] & [2]. [1]. https://lore.kernel.org/linux-wireless/20200303020230.GA15543@bogus [2]. https://lore.kernel.org/linux-wireless/20200303015558.GA6876@bogus Signed-off-by: Ajay Singh <ajay.kathat@xxxxxxxxxxxxx> --- .../wilc1000/microchip,wilc1000,sdio.yaml | 68 ------------------ .../wilc1000/microchip,wilc1000,spi.yaml | 61 ---------------- .../staging/wilc1000/microchip,wilc1000.yaml | 72 +++++++++++++++++++ 3 files changed, 72 insertions(+), 129 deletions(-) delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,sdio.yaml delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,spi.yaml create mode 100644 drivers/staging/wilc1000/microchip,wilc1000.yaml diff --git a/drivers/staging/wilc1000/microchip,wilc1000,sdio.yaml b/drivers/staging/wilc1000/microchip,wilc1000,sdio.yaml deleted file mode 100644 index b338f569f7e2..000000000000 --- a/drivers/staging/wilc1000/microchip,wilc1000,sdio.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/net/wireless/microchip,wilc1000,sdio.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Microchip WILC wireless SDIO devicetree bindings - -maintainers: - - Adham Abozaeid <adham.abozaeid@xxxxxxxxxxxxx> - - Ajay Singh <ajay.kathat@xxxxxxxxxxxxx> - -description: - The wilc1000 chips can be connected via SDIO. The node is used to - specify child node to the SDIO controller that connects the device - to the system. - -properties: - compatible: - const: microchip,wilc1000-sdio - - irq-gpios: - description: The GPIO phandle connect to a host IRQ. - maxItems: 1 - - reg: - description: Slot ID used in the controller. - maxItems: 1 - - clocks: - description: phandle to the clock connected on rtc clock line. - maxItems: 1 - - bus-width: - description: The number of data lines wired up the slot. - allOf: - - $ref: /schemas/types.yaml#/definitions/uint32 - - enum: [1, 4, 8] - - default: 1 - -required: - - compatible - - irq-gpios - - reg - -examples: - - | - mmc1: mmc@fc000000 { - #address-cells = <1>; - #size-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; - non-removable; - vmmc-supply = <&vcc_mmc1_reg>; - vqmmc-supply = <&vcc_3v3_reg>; - status = "okay"; - wilc_sdio@0 { - compatible = "microchip,wilc1000-sdio"; - irq-gpios = <&pioC 27 0>; - reg = <0>; - clocks = <&pck1>; - clock-names = "rtc_clk"; - assigned-clocks = <&pck1>; - assigned-clock-rates = <32768>; - status = "okay"; - bus-width = <4>; - }; - }; diff --git a/drivers/staging/wilc1000/microchip,wilc1000,spi.yaml b/drivers/staging/wilc1000/microchip,wilc1000,spi.yaml deleted file mode 100644 index cc8ed64ce627..000000000000 --- a/drivers/staging/wilc1000/microchip,wilc1000,spi.yaml +++ /dev/null @@ -1,61 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/net/wireless/microchip,wilc1000,spi.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Microchip WILC wireless SPI devicetree bindings - -maintainers: - - Adham Abozaeid <adham.abozaeid@xxxxxxxxxxxxx> - - Ajay Singh <ajay.kathat@xxxxxxxxxxxxx> - -description: - The wilc1000 chips can be connected via SPI. This document describes - the binding for the SPI connected module. - -properties: - compatible: - const: microchip,wilc1000-spi - - spi-max-frequency: - description: Maximum SPI clocking speed of device in Hz. - maxItems: 1 - - reg: - description: Chip select address of device. - maxItems: 1 - - irq-gpios: - description: The GPIO phandle connect to a host IRQ. - maxItems: 1 - - clocks: - description: phandle to the clock connected on rtc clock line. - maxItems: 1 - -required: - - compatible - - spi-max-frequency - - reg - - irq-gpios - -examples: - - | - spi1: spi@fc018000 { - #address-cells = <1>; - #size-cells = <0>; - cs-gpios = <&pioB 21 0>; - status = "okay"; - wilc_spi@0 { - compatible = "microchip,wilc1000-spi"; - spi-max-frequency = <48000000>; - reg = <0>; - irq-gpios = <&pioC 27 0>; - clocks = <&pck1>; - clock-names = "rtc_clk"; - assigned-clocks = <&pck1>; - assigned-clock-rates = <32768>; - status = "okay"; - }; - }; diff --git a/drivers/staging/wilc1000/microchip,wilc1000.yaml b/drivers/staging/wilc1000/microchip,wilc1000.yaml new file mode 100644 index 000000000000..bc6cc5d3f347 --- /dev/null +++ b/drivers/staging/wilc1000/microchip,wilc1000.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/wireless/microchip,wilc1000.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip WILC wireless devicetree bindings + +maintainers: + - Adham Abozaeid <adham.abozaeid@xxxxxxxxxxxxx> + - Ajay Singh <ajay.kathat@xxxxxxxxxxxxx> + +description: + The wilc1000 chips can be connected via SPI or SDIO. This document + describes the binding to connect wilc devices. + +properties: + compatible: + const: microchip,wilc1000 + + spi-max-frequency: true + + interrupts: + maxItems: 1 + + clocks: + description: phandle to the clock connected on rtc clock line. + maxItems: 1 + + clock-names: + const: rtc + +required: + - compatible + - interrupts + +examples: + - | + spi1: spi@fc018000 { + #address-cells = <1>; + #size-cells = <0>; + cs-gpios = <&pioB 21 0>; + wifi@0 { + compatible = "microchip,wilc1000"; + spi-max-frequency = <48000000>; + reg = <0>; + interrupt-parent = <&pioC>; + interrupts = <27 0>; + clocks = <&pck1>; + clock-names = "rtc"; + }; + }; + + - | + mmc1: mmc@fc000000 { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; + non-removable; + vmmc-supply = <&vcc_mmc1_reg>; + vqmmc-supply = <&vcc_3v3_reg>; + bus-width = <4>; + wifi@0 { + compatible = "microchip,wilc1000"; + reg = <0>; + interrupt-parent = <&pioC>; + interrupts = <27 0>; + clocks = <&pck1>; + clock-names = "rtc"; + }; + }; -- 2.24.0
