* [PATCH 1/3 v4] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor
@ 2020-11-24 8:53 Linus Walleij
2020-11-24 8:53 ` [PATCH 2/3 v4] x86/platform/geode: Convert geode " Linus Walleij
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Linus Walleij @ 2020-11-24 8:53 UTC (permalink / raw)
To: Hans de Goede, Mark Gross
Cc: platform-driver-x86, Linus Walleij, linux-gpio, Andres Salomon,
linux-geode, Darren Hart, x86, Andy Shevchenko
This makes the machine look up the LED from a GPIO machine
descriptor table. The Geode LEDs should be on the CS5535
companion chip.
Cc: linux-gpio@vger.kernel.org
Cc: Andres Salomon <dilinger@queued.net>
Cc: linux-geode@lists.infradead.org
Cc: Darren Hart <dvhart@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: x86@kernel.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v3->v4:
- Cc x86@kernel.org
- Collect Hans' Review tag.
ChangeLog v2->v3:
- Rebase on v5.10-rc1
- Resend
ChangeLog v1->v2:
- Drop excess comma after terminator { }
- Collect Andy's Reviewed-by
---
arch/x86/platform/geode/net5501.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/geode/net5501.c b/arch/x86/platform/geode/net5501.c
index 163e1b545517..558384acd777 100644
--- a/arch/x86/platform/geode/net5501.c
+++ b/arch/x86/platform/geode/net5501.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <asm/geode.h>
@@ -55,9 +56,7 @@ static struct platform_device net5501_buttons_dev = {
static struct gpio_led net5501_leds[] = {
{
.name = "net5501:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 0,
},
};
@@ -66,6 +65,15 @@ static struct gpio_led_platform_data net5501_leds_data = {
.leds = net5501_leds,
};
+static struct gpiod_lookup_table net5501_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_HIGH),
+ { }
+ },
+};
+
static struct platform_device net5501_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -80,6 +88,7 @@ static struct platform_device *net5501_devs[] __initdata = {
static void __init register_net5501(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&net5501_leds_gpio_table);
platform_add_devices(net5501_devs, ARRAY_SIZE(net5501_devs));
}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3 v4] x86/platform/geode: Convert geode LED to GPIO machine descriptor
2020-11-24 8:53 [PATCH 1/3 v4] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor Linus Walleij
@ 2020-11-24 8:53 ` Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] " tip-bot2 for Linus Walleij
2020-11-24 8:53 ` [PATCH 3/3 v4] x86/platform/geode: Convert alix " Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] x86/platform/geode: Convert net5501 " tip-bot2 for Linus Walleij
2 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2020-11-24 8:53 UTC (permalink / raw)
To: Hans de Goede, Mark Gross
Cc: platform-driver-x86, Linus Walleij, linux-gpio, linux-geode,
Darren Hart, x86, Andy Shevchenko
This makes the machine look up the LED from a GPIO machine
descriptor table. The Geode LEDs should be on the CS5535
companion chip.
Cc: linux-gpio@vger.kernel.org
Cc: linux-geode@lists.infradead.org
Cc: Darren Hart <dvhart@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: x86@kernel.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v3->v4:
- Cc x86@kernel.org
- Collect Hans' Review tag.
ChangeLog v2->v3:
- Rebase on v5.10-rc1
- Resend
ChangeLog v1->v2:
- Drop excess comma after terminator { }
- Collect Andy's Reviewed-by
---
arch/x86/platform/geode/geos.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
index 73a3f49b4eb6..d263528c90bb 100644
--- a/arch/x86/platform/geode/geos.c
+++ b/arch/x86/platform/geode/geos.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <linux/dmi.h>
#include <asm/geode.h>
@@ -53,21 +54,15 @@ static struct platform_device geos_buttons_dev = {
static struct gpio_led geos_leds[] = {
{
.name = "geos:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 1,
},
{
.name = "geos:2",
- .gpio = 25,
.default_trigger = "default-off",
- .active_low = 1,
},
{
.name = "geos:3",
- .gpio = 27,
.default_trigger = "default-off",
- .active_low = 1,
},
};
@@ -76,6 +71,17 @@ static struct gpio_led_platform_data geos_leds_data = {
.leds = geos_leds,
};
+static struct gpiod_lookup_table geos_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 25, NULL, 1, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 27, NULL, 2, GPIO_ACTIVE_LOW),
+ { }
+ },
+};
+
static struct platform_device geos_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -90,6 +96,7 @@ static struct platform_device *geos_devs[] __initdata = {
static void __init register_geos(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&geos_leds_gpio_table);
platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3 v4] x86/platform/geode: Convert alix LED to GPIO machine descriptor
2020-11-24 8:53 [PATCH 1/3 v4] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor Linus Walleij
2020-11-24 8:53 ` [PATCH 2/3 v4] x86/platform/geode: Convert geode " Linus Walleij
@ 2020-11-24 8:53 ` Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] " tip-bot2 for Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] x86/platform/geode: Convert net5501 " tip-bot2 for Linus Walleij
2 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2020-11-24 8:53 UTC (permalink / raw)
To: Hans de Goede, Mark Gross
Cc: platform-driver-x86, Linus Walleij, linux-gpio, linux-geode,
Darren Hart, x86, Andy Shevchenko
This makes the machine look up the LED from a GPIO machine
descriptor table. The Geode LEDs should be on the CS5535
companion chip.
Cc: linux-gpio@vger.kernel.org
Cc: linux-geode@lists.infradead.org
Cc: Darren Hart <dvhart@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: x86@kernel.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v3->v4:
- Cc x86@kernel.org
- Collect Hans' Review tag.
ChangeLog v2->v3:
- Rebase on v5.10-rc1
- Resend
ChangeLog v1->v2:
- Drop excess comma after terminator { }
- Collect Andy's Reviewed-by
---
arch/x86/platform/geode/alix.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c
index c33f744b5388..b39bf3b5e108 100644
--- a/arch/x86/platform/geode/alix.c
+++ b/arch/x86/platform/geode/alix.c
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <linux/dmi.h>
#include <asm/geode.h>
@@ -69,21 +70,15 @@ static struct platform_device alix_buttons_dev = {
static struct gpio_led alix_leds[] = {
{
.name = "alix:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 1,
},
{
.name = "alix:2",
- .gpio = 25,
.default_trigger = "default-off",
- .active_low = 1,
},
{
.name = "alix:3",
- .gpio = 27,
.default_trigger = "default-off",
- .active_low = 1,
},
};
@@ -92,6 +87,17 @@ static struct gpio_led_platform_data alix_leds_data = {
.leds = alix_leds,
};
+static struct gpiod_lookup_table alix_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 25, NULL, 1, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 27, NULL, 2, GPIO_ACTIVE_LOW),
+ { }
+ },
+};
+
static struct platform_device alix_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -106,6 +112,7 @@ static struct platform_device *alix_devs[] __initdata = {
static void __init register_alix(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&alix_leds_gpio_table);
platform_add_devices(alix_devs, ARRAY_SIZE(alix_devs));
}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: x86/platform] x86/platform/geode: Convert alix LED to GPIO machine descriptor
2020-11-24 8:53 ` [PATCH 3/3 v4] x86/platform/geode: Convert alix " Linus Walleij
@ 2021-01-15 18:03 ` tip-bot2 for Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Linus Walleij @ 2021-01-15 18:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: Linus Walleij, Borislav Petkov, Hans de Goede, Andy Shevchenko,
x86, linux-kernel
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: 604303018221d00b58422e1d117ba29ce84295cb
Gitweb: https://git.kernel.org/tip/604303018221d00b58422e1d117ba29ce84295cb
Author: Linus Walleij <linus.walleij@linaro.org>
AuthorDate: Tue, 24 Nov 2020 09:53:39 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 15 Jan 2021 18:55:53 +01:00
x86/platform/geode: Convert alix LED to GPIO machine descriptor
Look up the LED from a GPIO machine descriptor table. The Geode LEDs
should be on the CS5535 companion chip.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lkml.kernel.org/r/20201124085339.6181-3-linus.walleij@linaro.org
---
arch/x86/platform/geode/alix.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c
index c33f744..b39bf3b 100644
--- a/arch/x86/platform/geode/alix.c
+++ b/arch/x86/platform/geode/alix.c
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <linux/dmi.h>
#include <asm/geode.h>
@@ -69,21 +70,15 @@ static struct platform_device alix_buttons_dev = {
static struct gpio_led alix_leds[] = {
{
.name = "alix:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 1,
},
{
.name = "alix:2",
- .gpio = 25,
.default_trigger = "default-off",
- .active_low = 1,
},
{
.name = "alix:3",
- .gpio = 27,
.default_trigger = "default-off",
- .active_low = 1,
},
};
@@ -92,6 +87,17 @@ static struct gpio_led_platform_data alix_leds_data = {
.leds = alix_leds,
};
+static struct gpiod_lookup_table alix_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 25, NULL, 1, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 27, NULL, 2, GPIO_ACTIVE_LOW),
+ { }
+ },
+};
+
static struct platform_device alix_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -106,6 +112,7 @@ static struct platform_device *alix_devs[] __initdata = {
static void __init register_alix(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&alix_leds_gpio_table);
platform_add_devices(alix_devs, ARRAY_SIZE(alix_devs));
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: x86/platform] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor
2020-11-24 8:53 [PATCH 1/3 v4] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor Linus Walleij
2020-11-24 8:53 ` [PATCH 2/3 v4] x86/platform/geode: Convert geode " Linus Walleij
2020-11-24 8:53 ` [PATCH 3/3 v4] x86/platform/geode: Convert alix " Linus Walleij
@ 2021-01-15 18:03 ` tip-bot2 for Linus Walleij
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Linus Walleij @ 2021-01-15 18:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: Linus Walleij, Borislav Petkov, Hans de Goede, Andy Shevchenko,
x86, linux-kernel
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: 3ff13602d7cae283bca1c52caacd0ca6426f37d2
Gitweb: https://git.kernel.org/tip/3ff13602d7cae283bca1c52caacd0ca6426f37d2
Author: Linus Walleij <linus.walleij@linaro.org>
AuthorDate: Tue, 24 Nov 2020 09:53:37 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 15 Jan 2021 18:47:49 +01:00
x86/platform/geode: Convert net5501 LED to GPIO machine descriptor
Look up the LED from a GPIO machine descriptor table. The Geode LEDs
should be on the CS5535 companion chip.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lkml.kernel.org/r/20201124085339.6181-1-linus.walleij@linaro.org
---
arch/x86/platform/geode/net5501.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/geode/net5501.c b/arch/x86/platform/geode/net5501.c
index 163e1b5..558384a 100644
--- a/arch/x86/platform/geode/net5501.c
+++ b/arch/x86/platform/geode/net5501.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <asm/geode.h>
@@ -55,9 +56,7 @@ static struct platform_device net5501_buttons_dev = {
static struct gpio_led net5501_leds[] = {
{
.name = "net5501:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 0,
},
};
@@ -66,6 +65,15 @@ static struct gpio_led_platform_data net5501_leds_data = {
.leds = net5501_leds,
};
+static struct gpiod_lookup_table net5501_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_HIGH),
+ { }
+ },
+};
+
static struct platform_device net5501_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -80,6 +88,7 @@ static struct platform_device *net5501_devs[] __initdata = {
static void __init register_net5501(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&net5501_leds_gpio_table);
platform_add_devices(net5501_devs, ARRAY_SIZE(net5501_devs));
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: x86/platform] x86/platform/geode: Convert geode LED to GPIO machine descriptor
2020-11-24 8:53 ` [PATCH 2/3 v4] x86/platform/geode: Convert geode " Linus Walleij
@ 2021-01-15 18:03 ` tip-bot2 for Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Linus Walleij @ 2021-01-15 18:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: Linus Walleij, Borislav Petkov, Hans de Goede, Andy Shevchenko,
x86, linux-kernel
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: ab20fda2a3da1b189a061ca045d9ca734e1db234
Gitweb: https://git.kernel.org/tip/ab20fda2a3da1b189a061ca045d9ca734e1db234
Author: Linus Walleij <linus.walleij@linaro.org>
AuthorDate: Tue, 24 Nov 2020 09:53:38 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 15 Jan 2021 18:54:38 +01:00
x86/platform/geode: Convert geode LED to GPIO machine descriptor
Look up the LED from a GPIO machine descriptor table. The Geode LEDs
should be on the CS5535 companion chip.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lkml.kernel.org/r/20201124085339.6181-2-linus.walleij@linaro.org
---
arch/x86/platform/geode/geos.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
index 73a3f49..d263528 100644
--- a/arch/x86/platform/geode/geos.c
+++ b/arch/x86/platform/geode/geos.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
#include <linux/dmi.h>
#include <asm/geode.h>
@@ -53,21 +54,15 @@ static struct platform_device geos_buttons_dev = {
static struct gpio_led geos_leds[] = {
{
.name = "geos:1",
- .gpio = 6,
.default_trigger = "default-on",
- .active_low = 1,
},
{
.name = "geos:2",
- .gpio = 25,
.default_trigger = "default-off",
- .active_low = 1,
},
{
.name = "geos:3",
- .gpio = 27,
.default_trigger = "default-off",
- .active_low = 1,
},
};
@@ -76,6 +71,17 @@ static struct gpio_led_platform_data geos_leds_data = {
.leds = geos_leds,
};
+static struct gpiod_lookup_table geos_leds_gpio_table = {
+ .dev_id = "leds-gpio",
+ .table = {
+ /* The Geode GPIOs should be on the CS5535 companion chip */
+ GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 25, NULL, 1, GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP_IDX("cs5535-gpio", 27, NULL, 2, GPIO_ACTIVE_LOW),
+ { }
+ },
+};
+
static struct platform_device geos_leds_dev = {
.name = "leds-gpio",
.id = -1,
@@ -90,6 +96,7 @@ static struct platform_device *geos_devs[] __initdata = {
static void __init register_geos(void)
{
/* Setup LED control through leds-gpio driver */
+ gpiod_add_lookup_table(&geos_leds_gpio_table);
platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-15 18:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 8:53 [PATCH 1/3 v4] x86/platform/geode: Convert net5501 LED to GPIO machine descriptor Linus Walleij
2020-11-24 8:53 ` [PATCH 2/3 v4] x86/platform/geode: Convert geode " Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] " tip-bot2 for Linus Walleij
2020-11-24 8:53 ` [PATCH 3/3 v4] x86/platform/geode: Convert alix " Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] " tip-bot2 for Linus Walleij
2021-01-15 18:03 ` [tip: x86/platform] x86/platform/geode: Convert net5501 " tip-bot2 for Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.