Commit a948178e authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: rename "config-file" DT attribute 



"config-file" is too broad. Replace it by "silabs,antenna-config-file"
which is more explicit.

The attribute "config-file" is probably not widely used. This patch
obviously breaks setups that use this attribute.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-31-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89273137

drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml

+5 −4
Original line number Diff line number Diff line
@@ -72,10 +72,11 @@ properties: 
    description: Phandle of gpio that will be used to wake-up chip. Without this

      property, driver will disable most of power saving features.

    maxItems: 1

  config-file:

    description: Use an alternative file as PDS. Default is `wf200.pds`. Only

      necessary for development/debug purpose.

    maxItems: 1

  silabs,antenna-config-file:

    $ref: /schemas/types.yaml#/definitions/string

    description: Use an alternative file for antenna configuration (aka

      "Platform Data Set" in Silabs jargon). Default depends of "compatible"

      string. For "silabs,wf200", the default is 'wf200.pds'.



required:

  - compatible

drivers/staging/wfx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da 
	wdev->hwbus_ops = hwbus_ops;

	wdev->hwbus_priv = hwbus_priv;

	memcpy(&wdev->pdata, pdata, sizeof(*pdata));

	of_property_read_string(dev->of_node, "config-file", &wdev->pdata.file_pds);

	of_property_read_string(dev->of_node, "silabs,antenna-config-file", &wdev->pdata.file_pds);

	wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup", GPIOD_OUT_LOW);

	if (IS_ERR(wdev->pdata.gpio_wakeup))

		return NULL;