[PATCH 1/4] leds: cpcap: add support for the keyboard light channel

[PATCH 1/4] leds: cpcap: add support for the keyboard light channel

[Carl Philipp Klemm]

The keyboard light channel is used on xt875 for the touchscreen
button lights.
This commit also adds a checks for the sucessfull return of
device_get_match_data.

Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
---
 drivers/leds/leds-cpcap.c    | 15 +++++++++++++++
 drivers/mfd/motorola-cpcap.c |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c
index 7d41ce8c9bb1..11a9b857d8ea 100644
--- a/drivers/leds/leds-cpcap.c
+++ b/drivers/leds/leds-cpcap.c
@@ -58,6 +58,15 @@ static const struct cpcap_led_info cpcap_led_cp = {
 	.init_val	= 0x0008,
 };
 
+/* keyboard led */
+static const struct cpcap_led_info cpcap_led_kl = {
+	.reg		= CPCAP_REG_KLC,
+	.mask		= 0x0001,
+	.limit		= 1,
+	.init_mask	= 0x07FF,
+	.init_val	= 0x07F0,
+};
+
 struct cpcap_led {
 	struct led_classdev led;
 	const struct cpcap_led_info *info;
@@ -152,6 +161,7 @@ static const struct of_device_id cpcap_led_of_match[] = {
 	{ .compatible = "motorola,cpcap-led-blue",  .data = &cpcap_led_blue },
 	{ .compatible = "motorola,cpcap-led-adl", .data = &cpcap_led_adl },
 	{ .compatible = "motorola,cpcap-led-cp", .data = &cpcap_led_cp },
+	{ .compatible = "motorola,cpcap-led-kl", .data = &cpcap_led_kl },
 	{},
 };
 MODULE_DEVICE_TABLE(of, cpcap_led_of_match);
@@ -168,6 +178,11 @@ static int cpcap_led_probe(struct platform_device *pdev)
 	led->info = device_get_match_data(&pdev->dev);
 	led->dev = &pdev->dev;
 
+	if (!led->info) {
+		dev_warn(led->dev, "Can't get match data");
+		return -ENODEV;
+	}
+
 	if (led->info->reg == 0x0000) {
 		dev_err(led->dev, "Unsupported LED");
 		return -ENODEV;
diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
index 265464b5d7cc..57b3378a8829 100644
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -285,6 +285,10 @@ static const struct mfd_cell cpcap_mfd_devices[] = {
 		.name          = "cpcap-led",
 		.id            = 4,
 		.of_compatible = "motorola,cpcap-led-cp",
+	}, {
+		.name          = "cpcap-led",
+		.id            = 5,
+		.of_compatible = "motorola,cpcap-led-kl",
 	}, {
 		.name          = "cpcap-codec",
 	}
-- 
2.38.1

[PATCH 2/4] leds: cpcap: make leds-cpcap an independent platform device to allow varying led setups

[Carl Philipp Klemm]

Previously led-cpcap devices where defined statically in mfd_cell
of the parent mdf device. This causes issues for devices like
xt875 that have less and different leds than xt894. Splitting the
device like this is posssible, as in reality the cpcap led ip block
is totaly independent from the mdf device and cpcap core.

Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
---
 drivers/leds/leds-cpcap.c    | 19 +++++++++++++++++--
 drivers/mfd/motorola-cpcap.c | 24 ------------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c
index 11a9b857d8ea..7a1dd050fdf0 100644
--- a/drivers/leds/leds-cpcap.c
+++ b/drivers/leds/leds-cpcap.c
@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/spi/spi.h>
 
 #define CPCAP_LED_NO_CURRENT 0x0001
 
@@ -170,6 +171,18 @@ static int cpcap_led_probe(struct platform_device *pdev)
 {
 	struct cpcap_led *led;
 	int err;
+	struct device_node *mfd_node;
+	struct device *cpcap_dev;
+
+	mfd_node = of_parse_phandle(pdev->dev.of_node, "cpcap-phandle", 0);
+	if (!mfd_node) {
+		dev_err(&pdev->dev, "cpcap-phandle is missing in device tree\n");
+		return -ENODEV;
+	}
+
+	cpcap_dev = bus_find_device_by_of_node(&spi_bus_type, mfd_node);
+	if (IS_ERR_OR_NULL(cpcap_dev))
+		return -EAGAIN;
 
 	led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL);
 	if (!led)
@@ -188,9 +201,11 @@ static int cpcap_led_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	led->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-	if (!led->regmap)
+	led->regmap = dev_get_regmap(cpcap_dev, NULL);
+	if (!led->regmap) {
+		dev_err(led->dev, "Couldn't get regmap from cpcap mdf device");
 		return -ENODEV;
+	}
 
 	led->vdd = devm_regulator_get(&pdev->dev, "vdd");
 	if (IS_ERR(led->vdd)) {
diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
index 57b3378a8829..e1ae14e0e651 100644
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -265,30 +265,6 @@ static const struct mfd_cell cpcap_mfd_devices[] = {
 	}, {
 		.name          = "cpcap-usb-phy",
 		.of_compatible = "motorola,mapphone-cpcap-usb-phy",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 0,
-		.of_compatible = "motorola,cpcap-led-red",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 1,
-		.of_compatible = "motorola,cpcap-led-green",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 2,
-		.of_compatible = "motorola,cpcap-led-blue",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 3,
-		.of_compatible = "motorola,cpcap-led-adl",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 4,
-		.of_compatible = "motorola,cpcap-led-cp",
-	}, {
-		.name          = "cpcap-led",
-		.id            = 5,
-		.of_compatible = "motorola,cpcap-led-kl",
 	}, {
 		.name          = "cpcap-codec",
 	}
-- 
2.38.1

[PATCH 3/4] dt-bindings: leds: leds-cpcap

[Carl Philipp Klemm]

update bindgins as cpcap-led has been removed from the mdf device

Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
---
 Documentation/devicetree/bindings/leds/leds-cpcap.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/leds/leds-cpcap.txt b/Documentation/devicetree/bindings/leds/leds-cpcap.txt
index ebf7cdc7f70c..b78a26a0acf0 100644
--- a/Documentation/devicetree/bindings/leds/leds-cpcap.txt
+++ b/Documentation/devicetree/bindings/leds/leds-cpcap.txt
@@ -17,13 +17,15 @@ Requires node properties:
    * "motorola,cpcap-led-cp"		(Camera Privacy LED)
 - label: see Documentation/devicetree/bindings/leds/common.txt
 - vdd-supply: A phandle to the regulator powering the LED
+- cpcap-phandle: A phandle to the cpcap mfd device node
 
 Example:
 
-&cpcap {
+/ {
 	cpcap_led_red: red-led {
 		compatible = "motorola,cpcap-led-red";
 		label = "cpcap:red";
 		vdd-supply = <&sw5>;
+		cpcap-phandle = <&cpcap>;
 	};
 };
-- 
2.38.1

[PATCH 4/4] arch: arm: dts: cpcap-mapphone: Move cpcap leds from common dts file to devices as apropriate

[Carl Philipp Klemm]

Removes non-functional leds from xt875 and adds its touchscreen
button light

Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
---
 .../arm/boot/dts/motorola-cpcap-mapphone.dtsi | 47 ++++++++-----------
 .../arm/boot/dts/omap4-droid-bionic-xt875.dts |  7 +++
 arch/arm/boot/dts/omap4-droid4-xt894.dts      | 14 ++++++
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index ea02fd403a9b..f7ddcf122404 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -115,36 +115,29 @@ cpcap_usb2_phy: phy {
 			io-channel-names = "vbus", "id";
 			vusb-supply = <&vusb>;
 		};
+	};
+};
 
-		led_red: led-red {
-			compatible = "motorola,cpcap-led-red";
-			vdd-supply = <&sw5>;
-			label = "status-led:red";
-		};
-
-		led_green: led-green {
-			compatible = "motorola,cpcap-led-green";
-			vdd-supply = <&sw5>;
-			label = "status-led:green";
-		};
-
-		led_blue: led-blue {
-			compatible = "motorola,cpcap-led-blue";
-			vdd-supply = <&sw5>;
-			label = "status-led:blue";
-		};
+/ {
+	led_red: led-red {
+		compatible = "motorola,cpcap-led-red";
+		vdd-supply = <&sw5>;
+		label = "status-led:red";
+		cpcap-phandle = <&cpcap>;
+	};
 
-		led_adl: led-adl {
-			compatible = "motorola,cpcap-led-adl";
-			vdd-supply = <&sw5>;
-			label = "button-backlight";
-		};
+	led_green: led-green {
+		compatible = "motorola,cpcap-led-green";
+		vdd-supply = <&sw5>;
+		label = "status-led:green";
+		cpcap-phandle = <&cpcap>;
+	};
 
-		led_cp: led-cp {
-			compatible = "motorola,cpcap-led-cp";
-			vdd-supply = <&sw5>;
-			label = "shift-key-light";
-		};
+	led_blue: led-blue {
+		compatible = "motorola,cpcap-led-blue";
+		vdd-supply = <&sw5>;
+		label = "status-led:blue";
+		cpcap-phandle = <&cpcap>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
index ccf03a743678..eae69ec9b3f1 100644
--- a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
+++ b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
@@ -6,6 +6,13 @@
 / {
 	model = "Motorola Droid Bionic XT875";
 	compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";
+
+	led_kl: led-kl {
+		compatible = "motorola,cpcap-led-kl";
+		vdd-supply = <&sw5>;
+		label = "button-backlight";
+		cpcap-phandle = <&cpcap>;
+	};
 };
 
 &keypad {
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index e833c21f1c01..a590f28edbf6 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -31,6 +31,20 @@ slider {
 			debounce-interval = <10>;
 		};
 	};
+
+	led_adl: led-adl {
+		compatible = "motorola,cpcap-led-adl";
+		vdd-supply = <&sw5>;
+		label = "button-backlight";
+		cpcap-phandle = <&cpcap>;
+	};
+
+	led_cp: led-cp {
+		compatible = "motorola,cpcap-led-cp";
+		vdd-supply = <&sw5>;
+		label = "shift-key-light";
+		cpcap-phandle = <&cpcap>;
+	};
 };
 
 / {
-- 
2.38.1

Re: [PATCH 1/4] leds: cpcap: add support for the keyboard light channel

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 2684 bytes --]

Hi,

On Sun, Dec 04, 2022 at 11:43:10AM +0100, Carl Philipp Klemm wrote:
> The keyboard light channel is used on xt875 for the touchscreen
> button lights.
> This commit also adds a checks for the sucessfull return of
> device_get_match_data.

"this commit also adds ..." means, that the commit should be split
:)

> Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
> ---
>  drivers/leds/leds-cpcap.c    | 15 +++++++++++++++
>  drivers/mfd/motorola-cpcap.c |  4 ++++
>  2 files changed, 19 insertions(+)
> 
> diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c
> index 7d41ce8c9bb1..11a9b857d8ea 100644
> --- a/drivers/leds/leds-cpcap.c
> +++ b/drivers/leds/leds-cpcap.c
> @@ -58,6 +58,15 @@ static const struct cpcap_led_info cpcap_led_cp = {
>  	.init_val	= 0x0008,
>  };
>  
> +/* keyboard led */
> +static const struct cpcap_led_info cpcap_led_kl = {
> +	.reg		= CPCAP_REG_KLC,
> +	.mask		= 0x0001,
> +	.limit		= 1,
> +	.init_mask	= 0x07FF,
> +	.init_val	= 0x07F0,
> +};
> +
>  struct cpcap_led {
>  	struct led_classdev led;
>  	const struct cpcap_led_info *info;
> @@ -152,6 +161,7 @@ static const struct of_device_id cpcap_led_of_match[] = {
>  	{ .compatible = "motorola,cpcap-led-blue",  .data = &cpcap_led_blue },
>  	{ .compatible = "motorola,cpcap-led-adl", .data = &cpcap_led_adl },
>  	{ .compatible = "motorola,cpcap-led-cp", .data = &cpcap_led_cp },
> +	{ .compatible = "motorola,cpcap-led-kl", .data = &cpcap_led_kl },
>  	{},
>  };
>  MODULE_DEVICE_TABLE(of, cpcap_led_of_match);
> @@ -168,6 +178,11 @@ static int cpcap_led_probe(struct platform_device *pdev)
>  	led->info = device_get_match_data(&pdev->dev);
>  	led->dev = &pdev->dev;
>  
> +	if (!led->info) {
> +		dev_warn(led->dev, "Can't get match data");
> +		return -ENODEV;
> +	}

If it's fatal, it should be dev_err and not dev_warn:

if (!led->info)
    return dev_err_probe(led->dev, -ENODEV, "Can't get match data");

-- Sebastian

> +
>  	if (led->info->reg == 0x0000) {
>  		dev_err(led->dev, "Unsupported LED");
>  		return -ENODEV;
> diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
> index 265464b5d7cc..57b3378a8829 100644
> --- a/drivers/mfd/motorola-cpcap.c
> +++ b/drivers/mfd/motorola-cpcap.c
> @@ -285,6 +285,10 @@ static const struct mfd_cell cpcap_mfd_devices[] = {
>  		.name          = "cpcap-led",
>  		.id            = 4,
>  		.of_compatible = "motorola,cpcap-led-cp",
> +	}, {
> +		.name          = "cpcap-led",
> +		.id            = 5,
> +		.of_compatible = "motorola,cpcap-led-kl",
>  	}, {
>  		.name          = "cpcap-codec",
>  	}
> -- 
> 2.38.1
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/4] leds: cpcap: make leds-cpcap an independent platform device to allow varying led setups

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

Hi,

On Sun, Dec 04, 2022 at 11:43:11AM +0100, Carl Philipp Klemm wrote:
> Previously led-cpcap devices where defined statically in mfd_cell
> of the parent mdf device. This causes issues for devices like
> xt875 that have less and different leds than xt894. Splitting the
> device like this is posssible, as in reality the cpcap led ip block
> is totaly independent from the mdf device and cpcap core.
> 
> Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>

I don't follow. Can't you just use 'status = "disabled;"' for the
unavailable nodes?

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/4] leds: cpcap: make leds-cpcap an independent platform device to allow varying led setups

[Carl Philipp Klemm]

Hi,

> I don't follow. Can't you just use 'status = "disabled;"' for the
> unavailable nodes?

Sure but unless im missing something, adding some nodes to a dts, one
for eatch led the device in question really has feals mutch better to
me than going arround and setting every led channel disabled for eatch
device that dosent use it. xt894 being the outlier here amoung the
cpcap devices we intend to support (xt894, xt860, xt875, xt910, xt912,
mb865, mz609 and mz617) in that it uses most of the extra led channels,
most of these use at most one (xt875, xt910, xt912, mb865) or zero
(mz609, mz617) extra channels.

Carl

Re: [PATCH 2/4] leds: cpcap: make leds-cpcap an independent platform device to allow varying led setups

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Hi,

On Mon, Dec 05, 2022 at 07:15:48PM +0100, Carl Philipp Klemm wrote:
> > I don't follow. Can't you just use 'status = "disabled;"' for the
> > unavailable nodes?
> 
> Sure but unless im missing something, adding some nodes to a dts, one
> for eatch led the device in question really has feals mutch better to
> me than going arround and setting every led channel disabled for eatch
> device that dosent use it. xt894 being the outlier here amoung the
> cpcap devices we intend to support (xt894, xt860, xt875, xt910, xt912,
> mb865, mz609 and mz617) in that it uses most of the extra led channels,
> most of these use at most one (xt875, xt910, xt912, mb865) or zero
> (mz609, mz617) extra channels.

Just mark them all status = 'disabled'; in the common include and
then enable them on a per board basis. Just the same way as all the
SoC peripherals are handled nowadays.

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 4/4] arch: arm: dts: cpcap-mapphone: Move cpcap leds from common dts file to devices as apropriate

[Rob Herring]

On Sun, Dec 04, 2022 at 11:43:13AM +0100, Carl Philipp Klemm wrote:
> Removes non-functional leds from xt875 and adds its touchscreen
> button light
> 
> Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz>
> ---
>  .../arm/boot/dts/motorola-cpcap-mapphone.dtsi | 47 ++++++++-----------
>  .../arm/boot/dts/omap4-droid-bionic-xt875.dts |  7 +++
>  arch/arm/boot/dts/omap4-droid4-xt894.dts      | 14 ++++++
>  3 files changed, 41 insertions(+), 27 deletions(-)

Looks like you are breaking the ABI with this series. What happens in a 
system with only the DT change or only the kernel change?

Rob