[PATCH] UBUNTU: [Upstream]backlight: mbp_nvidia_bl - add five more MacBook variants
Stefan Bader
stefan.bader at canonical.com
Tue Mar 30 07:54:59 UTC 2010
Surbhi Palande wrote:
> These quirks enable backlight support on 5 MacBook variants. This patch fixes
> bug 511965 on launchpad. It was cherrypicked from upstream commit
> 36bc5ee6a8d13333980fa54e97d3469d3d4cda98.
Have we queried on whether this might be get sent to stable from the authors?
> Do consider merging in 10.04 LTS.
>
> From 81b20215f1cabf764ad9b2e0f4a729c5620c7d84 Mon Sep 17 00:00:00 2001
> From: Evan McClain <evan.mcclain at gatech.edu>
> Date: Tue, 9 Mar 2010 19:20:58 -0500
> Subject: [PATCH] UBUNTU: [Upstream] backlight: mbp_nvidia_bl - add five more MacBook variants
[Upstream] would mean you want to upstream it (if I am not wrong here). And
since it is a direct cherry-pick UBUNTU: also does not apply (that would mean
you had to spend effort to backport it). So just
Subject: [PATCH] backlight: mbp_nvidia_bl - add five more MacBook variants
>
> http://launchpad.net/bugs/511965
>
> This adds the MacBook 1,1 2,1 3,1 4,1 and 4,2 to the DMI tables.
>
> Signed-off-by: Evan McClain <evan.mcclain at gatech.edu>
> Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
> (cherry picked from commit 36bc5ee6a8d13333980fa54e97d3469d3d4cda98)
Please add upstream in future patches, so it is clear where you picked it from
in the patch itself.
> Signed-off-by: Surbhi Palande <surbhi.palande at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
(The contents look acceptable otherwise. We might want to clarify the question
of sending it on to stable.)
>
> ---
> drivers/video/backlight/mbp_nvidia_bl.c | 45 +++++++++++++++++++++++++++++++
> 1 files changed, 45 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
> index 9edb8d7..73ab600 100644
> --- a/drivers/video/backlight/mbp_nvidia_bl.c
> +++ b/drivers/video/backlight/mbp_nvidia_bl.c
> @@ -139,6 +139,51 @@ static int mbp_dmi_match(const struct dmi_system_id *id)
> static const struct dmi_system_id __initdata mbp_device_table[] = {
> {
> .callback = mbp_dmi_match,
> + .ident = "MacBook 1,1",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
> + },
> + .driver_data = (void *)&intel_chipset_data,
> + },
> + {
> + .callback = mbp_dmi_match,
> + .ident = "MacBook 2,1",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"),
> + },
> + .driver_data = (void *)&intel_chipset_data,
> + },
> + {
> + .callback = mbp_dmi_match,
> + .ident = "MacBook 3,1",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook3,1"),
> + },
> + .driver_data = (void *)&intel_chipset_data,
> + },
> + {
> + .callback = mbp_dmi_match,
> + .ident = "MacBook 4,1",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,1"),
> + },
> + .driver_data = (void *)&intel_chipset_data,
> + },
> + {
> + .callback = mbp_dmi_match,
> + .ident = "MacBook 4,2",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,2"),
> + },
> + .driver_data = (void *)&intel_chipset_data,
> + },
> + {
> + .callback = mbp_dmi_match,
> .ident = "MacBookPro 3,1",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
More information about the kernel-team
mailing list