Skip to contentSkip to conversation

ARM: omap: omap4-embt2ws: 32K clock for WLAN

PATCH Superseded Andreas Kemnade 5 participants 10 messages Aug 30, 2023 – Sep 5, 2023

Subsystems (5)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Andreas Kemnade

author maintainer
#0 lore raw

v2 cover ARM: omap: omap4-embt2ws: 32K clock for WLAN

To have WLAN working properly, enable a 32K clock of the TWL6032. In earlier tests, it was still enabled from a previous boot into the vendor system.

Changes in V2:
- no separate device node for the clock
- converted toplevel node of TWL

Andreas Kemnade (5):
dt-bindings: mfd: convert twl-family.tx to json-schema
dt-bindings: mfd: ti,twl: Add clock provider properties
mfd: twl-core: Add a clock subdevice for the TWL6032
clk: twl: add clock driver for TWL6032
ARM: dts: omap4-embt2ws: enable 32K clock on WLAN

 .../devicetree/bindings/mfd/ti,twl.yaml       |  72 +++++++
 .../devicetree/bindings/mfd/twl-family.txt    |  46 ----
 .../boot/dts/ti/omap/omap4-epson-embt2ws.dts  |   8 +
 drivers/clk/Kconfig                           |   9 +
 drivers/clk/Makefile                          |   1 +
 drivers/clk/clk-twl.c                         | 197 ++++++++++++++++++
 drivers/mfd/twl-core.c                        |  16 ++
 7 files changed, 303 insertions(+), 46 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/ti,twl.yaml
 delete mode 100644 Documentation/devicetree/bindings/mfd/twl-family.txt
 create mode 100644 drivers/clk/clk-twl.c
Signature · 1 line
2.39.2
author maintainer
#1 lore raw

PATCH v2 1/5 dt-bindings: mfd: convert twl-family.tx to json-schema

Convert the TWL[46]030 binding to DT schema format. To do it as a step by step work, do not include / handle nodes for subdevices yet, just convert things with minimal corrections. There are already some bindings for its subdevices in the tree.

---
 .../devicetree/bindings/mfd/ti,twl.yaml       | 69 +++++++++++++++++++
 .../devicetree/bindings/mfd/twl-family.txt    | 46 -------------
 2 files changed, 69 insertions(+), 46 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/ti,twl.yaml
 delete mode 100644 Documentation/devicetree/bindings/mfd/twl-family.txt
Documentation/devicetree/bindings/mfd/ti,twl.yaml new file +69 -0
new file mode 100644
index 0000000000000..3d7b3e0addafa
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/ti,twl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments TWL family
+
+maintainers:
+  - Tony Lindgren <[email protected]>
+
+description: |
+  The TWLs are Integrated Power Management Chips.
+  Some version might contain much more analog function like
+  USB transceiver or Audio amplifier.
+  These chips are connected to an i2c bus.
+
+properties:
+  compatible:
+    description:
+      TWL4030 for integrated power-management/audio CODEC device used in OMAP3
+      based boards
+      TWL6030/32 for integrated power-management used in OMAP4 based boards
+    enum:
+      - ti,twl4030
+      - ti,twl6030
+      - ti,twl6032
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 1
+
+additionalProperties: true
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - interrupt-controller
+  - "#interrupt-cells"
+
+examples:
+  - |
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      pmic@48 {
+        compatible = "ti,twl6030";
+        reg = <0x48>;
+        interrupts = <39>; /* IRQ_SYS_1N cascaded to gic */
+        interrupt-controller;
+        #interrupt-cells = <1>;
+        interrupt-parent = <&gic>;
+
+        rtc {
+          compatible = "ti,twl4030-rtc";
+          interrupts = <11>;
+        };
+      };
+    };
+
Documentation/devicetree/bindings/mfd/twl-family.txt deleted +0 -46

46 lines not on this page · raw message

Signature · 1 line
2.39.2
maintainer
#2 lore raw

Re: [PATCH v2 1/5] dt-bindings: mfd: convert twl-family.tx to json-schema

Quoted 5 lines · Andreas Kemnade

Convert the TWL[46]030 binding to DT schema format. To do it as a step by step work, do not include / handle nodes for subdevices yet, just convert things with minimal corrections. There are already some bindings for its subdevices in the tree.

Quoted 8 lines
---
 .../devicetree/bindings/mfd/ti,twl.yaml       | 69 +++++++++++++++++++
 .../devicetree/bindings/mfd/twl-family.txt    | 46 -------------
 2 files changed, 69 insertions(+), 46 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/ti,twl.yaml
 delete mode 100644 Documentation/devicetree/bindings/mfd/twl-family.txt

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/mfd/ti,twl.example.dtb: /example-0/i2c/pmic@48/rtc: failed to match any schema with compatible: ['ti,twl4030-rtc']

doc reference errors (make refcheckdocs):
Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt: Documentation/devicetree/bindings/mfd/twl-family.txt

See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.

#3 lore raw

Re: [PATCH v2 1/5] dt-bindings: mfd: convert twl-family.tx to json-schema

In reply to Andreas Kemnade
Quoted 5 lines · Andreas Kemnade

Convert the TWL[46]030 binding to DT schema format. To do it as a step by step work, do not include / handle nodes for subdevices yet, just convert things with minimal corrections. There are already some bindings for its subdevices in the tree.

...

Quoted 13 lines
Documentation/devicetree/bindings/mfd/ti,twl.yaml new file +13 -0
+properties:
+  compatible:
+    description:
+      TWL4030 for integrated power-management/audio CODEC device used in OMAP3
+      based boards
+      TWL6030/32 for integrated power-management used in OMAP4 based boards
+    enum:
+      - ti,twl4030
+      - ti,twl6030
+      - ti,twl6032
+
+  reg:
+    maxItems: 1

Documentation/devicetree/bindings/mfd/ti,twl.yaml line 40

Quoted 10 lines
Documentation/devicetree/bindings/mfd/ti,twl.yaml new file +10 -0
+
+  interrupts:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 1
+
+additionalProperties: true

No, this must be false. example-schema and all device bindings require this to be false. Having it true makes the schema basically no-op, so why do you need it?

Best regards,
Krzysztof

maintainer
#4 lore raw

Re: [PATCH v2 1/5] dt-bindings: mfd: convert twl-family.tx to json-schema

In reply to Andreas Kemnade

Documentation/devicetree/bindings/mfd/ti,twl.yaml line 10

Quoted 4 lines · Andreas Kemnade
Documentation/devicetree/bindings/mfd/ti,twl.yaml new file +4 -0
+title: Texas Instruments TWL family
+
+maintainers:
+  - Tony Lindgren <[email protected]>

s/me/you/ above please :)

Regards,

Tony

author maintainer
#5 lore raw

PATCH v2 2/5 dt-bindings: mfd: ti,twl: Add clock provider properties

In reply to Andreas Kemnade

Since these devices provide clock outputs, add the corresponding property.

---
 Documentation/devicetree/bindings/mfd/ti,twl.yaml | 3 +++
 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/mfd/ti,twl.yaml +3 -0
index 3d7b3e0addafa..6bb781b95ecdb 100644
@@ -37,6 +37,9 @@ properties:
   "#interrupt-cells":
     const: 1
 
+  "#clock-cells":
+    const: 1
+
 additionalProperties: true
 
 required:
Signature · 1 line
2.39.2
Acked-by on v2 2/5
#6 lore raw

Re: [PATCH v2 2/5] dt-bindings: mfd: ti,twl: Add clock provider properties

Quoted 13 lines · Andreas Kemnade

Since these devices provide clock outputs, add the corresponding property.

---
 Documentation/devicetree/bindings/mfd/ti,twl.yaml | 3 +++
 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/mfd/ti,twl.yaml +0 -0
index 3d7b3e0addafa..6bb781b95ecdb 100644

Documentation/devicetree/bindings/mfd/ti,twl.yaml properties: · line 42

Quoted 6 lines
Documentation/devicetree/bindings/mfd/ti,twl.yaml +3 -0
@@ -37,6 +37,9 @@ properties:
   "#interrupt-cells":
     const: 1
 
+  "#clock-cells":
+    const: 1
+

Thanks,
Conor.

Quoted 6 lines
Documentation/devicetree/bindings/mfd/ti,twl.yaml +0 -0
 additionalProperties: true
 
 required:
Signature · 1 line
2.39.2
author maintainer
#7 lore raw

PATCH v2 3/5 mfd: twl-core: Add a clock subdevice for the TWL6032

In reply to Andreas Kemnade

Clock device needs no separate devicetree node, so add it as a platform device. Other devices in the family also have controllable clocks, but due to the lack of testing, just add it for the TWL6032 now.

---
 drivers/mfd/twl-core.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/mfd/twl-core.c +16 -0
index ce01a87f8dc39..234500b2e53fc 100644
@@ -31,6 +31,8 @@
 #include <linux/regulator/machine.h>
 
 #include <linux/i2c.h>
+
+#include <linux/mfd/core.h>
 #include <linux/mfd/twl.h>
 
 /* Register descriptions for audio */
@@ -690,6 +692,10 @@ static struct of_dev_auxdata twl_auxdata_lookup[] = {
 	{ /* sentinel */ },
 };
 
+static const struct mfd_cell twl6032_cells[] = {
+	{ .name = "twl6032-clk" },
+};
+
 /* NOTE: This driver only handles a single twl4030/tps659x0 chip */
 static int
 twl_probe(struct i2c_client *client)
@@ -836,6 +842,16 @@ twl_probe(struct i2c_client *client)
 				 TWL4030_DCDC_GLOBAL_CFG);
 	}
 
+	if (id->driver_data == (TWL6030_CLASS | TWL6032_SUBCLASS)) {
+		status = devm_mfd_add_devices(&client->dev,
+					      PLATFORM_DEVID_NONE,
+					      twl6032_cells,
+					      ARRAY_SIZE(twl6032_cells),
+					      NULL, 0, NULL);
+		if (status < 0)
+			goto free;
+	}
+
 	status = of_platform_populate(node, NULL, twl_auxdata_lookup,
 				      &client->dev);
 
Signature · 1 line
2.39.2
author maintainer
#8 lore raw

PATCH v2 4/5 clk: twl: add clock driver for TWL6032

In reply to Andreas Kemnade

The TWL6032 has some clock outputs which are controlled like fixed-voltage regulators, in some drivers for these chips found in the wild, just the regulator api is abused for controlling them, so simply use something similar to the regulator functions. Due to a lack of hardware available for testing, leave out the TWL6030-specific part of those functions.

---
 drivers/clk/Kconfig   |   9 ++
 drivers/clk/Makefile  |   1 +
 drivers/clk/clk-twl.c | 197 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 207 insertions(+)
 create mode 100644 drivers/clk/clk-twl.c
drivers/clk/Kconfig +9 -0
index 6b3b424addab4..e927f88d6014c 100644
@@ -277,6 +277,15 @@ config COMMON_CLK_S2MPS11
 	  clock. These multi-function devices have two (S2MPS14) or three
 	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
 
+config CLK_TWL
+	tristate "Clock driver for the TWL PMIC family"
+	depends on TWL4030_CORE
+	help
+	  Enable support for controlling the clock resources on TWL family
+	  PMICs. These devices have some 32K clock outputs which can be
+	  controlled by software. For now, only the TWL6032 clocks are
+	  supported.
+
 config CLK_TWL6040
 	tristate "External McPDM functional clock from twl6040"
 	depends on TWL6040_CORE
drivers/clk/Makefile +1 -0
index 7cb000549b612..31c04e23b7a90 100644
@@ -73,6 +73,7 @@ obj-$(CONFIG_COMMON_CLK_STM32H7)	+= clk-stm32h7.o
 obj-$(CONFIG_COMMON_CLK_STM32MP157)	+= clk-stm32mp1.o
 obj-$(CONFIG_COMMON_CLK_TPS68470)      += clk-tps68470.o
 obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o
+obj-$(CONFIG_CLK_TWL)			+= clk-twl.o
 obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o
 obj-$(CONFIG_COMMON_CLK_RS9_PCIE)	+= clk-renesas-pcie.o
 obj-$(CONFIG_COMMON_CLK_SI521XX)	+= clk-si521xx.o
drivers/clk/clk-twl.c new file +197 -0

197 lines not on this page · raw message

Signature · 1 line
2.39.2
author maintainer
#9 lore raw

PATCH v2 5/5 ARM: dts: omap4-embt2ws: enable 32K clock on WLAN

In reply to Andreas Kemnade

WLAN did only work if clock was left enabled by the original system, so make it fully enable the needed resources itself.

---
 arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts +8 -0
index ee86981b2e448..9d2f2d8639496 100644
@@ -69,6 +69,12 @@ unknown_supply: unknown-supply {
 		regulator-name = "unknown";
 	};
 
+	wl12xx_pwrseq: wl12xx-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&twl 1>;
+		clock-names = "ext_clock";
+	};
+
        /* regulator for wl12xx on sdio2 */
 	wl12xx_vmmc: wl12xx-vmmc {
 		pinctrl-names = "default";
@@ -92,6 +98,7 @@ &i2c1 {
 	twl: pmic@48 {
 		compatible = "ti,twl6032";
 		reg = <0x48>;
+		#clock-cells = <1>;
 		/* IRQ# = 7 */
 		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
 		interrupt-controller;
@@ -316,6 +323,7 @@ &mmc3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&wl12xx_pins>;
 	vmmc-supply = <&wl12xx_vmmc>;
+	mmc-pwrseq = <&wl12xx_pwrseq>;
 	interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
 			       &omap4_pmx_core 0x12e>;
 	non-removable;
Signature · 1 line
2.39.2