From patchwork Mon Jan 18 13:23:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 365535 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp2258605jap; Mon, 18 Jan 2021 05:25:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrNdiAjsFLQsuKFmH7rIpqzUa8nHPk3uez4nm/v3oCbx/N3/C/jXIgoaqc5gt9dQBUkYfi X-Received: by 2002:a17:90b:3792:: with SMTP id mz18mr8510799pjb.23.1610976334418; Mon, 18 Jan 2021 05:25:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610976334; cv=none; d=google.com; s=arc-20160816; b=yUtC92UVPQx/q4SjFHc+nLqbOGeHuObSAGXcKicwr5XNpSCyvsg1r8X0Zh5PVA/+VI x73HkFoMEgtuIldQ7zlyAK0yIyBHuETdFxEZ+ypG6ipaoOdp6Tnk+fvwQUI48rcCcwH8 7B4dSmmgnc6Fy60dvPpqrf/ItcXVWDecD1YyX2+0qpbeo6W9oyypBZEwj7a111Ln8dt1 ebHG4rzwv3UpbrvF0a7bWyq9RU031NrrhBmXGFlFUzC+NZhuDaTWLWCM+8dvM+PZKj7c tgrom2V7ZFChmtqrdl7OJDFnwIA2PGV1nFyU5lIsGk2YgYiPeY8WaRFCC+LA3N4tXo1l /SYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=WsBR9bMxH1WlbxPtLyUs6xwtzue2W4fj/97zl+2QALI=; b=R/h/CepMWGfbVzv2Yg0AXgtiUJnCplAztv85uieEPxt+kFQN1VwG8FYH1rwSsfCkDr RoIzniKXlv4QJGqhZf2sIxex6fnv0DT4zxrZvuuYHQT0SjfLgBgehZSZpycQOtXPsdaT l6VtuirZi3Z6odVc2DF6B2Yzuj0iHMgNsQuBxsEg9vl/ccy8wps6mNw7kS6K1sb2OEaB 1dtJcpJbCnI+jJ1VyJ/eixbTvtzFV97jKU7S6oYExno3wy3bj0dnISqNcYCvJvL+PabC 9nyKHmA/z53j8JbqIL56yrhK/J42sVtcUQwOb5MLyUtBU/Rad/6z5QSD+HwOFKzlNkGD eCbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aeaPU1Ux; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id h4si7002991plo.57.2021.01.18.05.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 05:25:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aeaPU1Ux; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 304836E2E3; Mon, 18 Jan 2021 13:25:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A6BA6E20E for ; Mon, 18 Jan 2021 13:25:32 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id b26so24066540lff.9 for ; Mon, 18 Jan 2021 05:25:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fDErTN48Y1CGE6gFpR/zw1RZXGRM0zR2TnnW++IPcwc=; b=aeaPU1UxLYaiKbhBGp2LdGC7WWgdVM1tiUjVDgJLVoTzjtBjlqUndUgAp08G2zwBYJ C74H9qtooZPIQkzy8bTvshvrcEu78zaDtEgW4iq8cqe1h0lg/bTkdKhUyv1UPM4nLaM9 v/onnM/O0YM+JqCB3d4jioGr20mBCpibNOh3hhkpteEKUwe4/XNKxgFHTNFBL1OWWiTE maU5gj+B0nDgzGCbD0Ytd1iOJxEzoWCsGvj1Fv7Bm48+lQmdJd5cz4QKpMR/etWOfrEk w+VeuhNOIr1S3y/Tos0ykrIfKlgn5bqKDO4doEAdxYdkdg9yElKrf6AFITDQi6hBYXRa SaPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fDErTN48Y1CGE6gFpR/zw1RZXGRM0zR2TnnW++IPcwc=; b=FcsPPLIJSw7ai0WqZd7elJt2Mj9yBiIHNOYCuMS8x+mlGpQpuD02Szsg3I4d4wGLKW 8raeaReuFL4fhdkpNmZAsOtxNRyoTgF9+1F95PLYIBSVDf6v9XowvYQYLf8g/ocMKBcW fCp0k7yP25QYKNnCkv/eIRcbOWsKZmDayKdVxeafIm0iRwRVyBAAkwVmHMOwpyDBulhA tJmwPfAtQ1nml1GP+IMJSalih9kHSObDoFcewHt0o5OAxochEyZPtXUqmRlxxjN0yBp+ egvnX8BoDphYWywLl2ZyBr8mdiAutJbO2Ym00XgBbpsZ2DM9POPh2ssrXL599gxL7b55 UmWQ== X-Gm-Message-State: AOAM5306+lKqZqwMSoeRAdm4SyJneTCNqL1Tmpymysp2nPPBlqYXQHuq D5U0W64ewn68RhGXazaS7D6W2w== X-Received: by 2002:a19:8b8b:: with SMTP id n133mr11300193lfd.278.1610976330760; Mon, 18 Jan 2021 05:25:30 -0800 (PST) Received: from localhost.localdomain (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id m13sm1685779ljo.121.2021.01.18.05.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 05:25:25 -0800 (PST) From: Linus Walleij To: Lee Jones , Daniel Thompson , Jingoo Han , dri-devel@lists.freedesktop.org Subject: [PATCH v9] backlight: lms283gf05: Convert to GPIO descriptors Date: Mon, 18 Jan 2021 14:23:22 +0100 Message-Id: <20210118132322.7282-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Haojian Zhuang , Mark Brown , Robert Jarzmik , Daniel Mack Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This converts the lms283gf05 backlight driver to use GPIO descriptors and switches the single PXA Palm Z2 device over to defining these. Since the platform data was only used to convey GPIO information we can delete the platform data header. Notice that we define the proper active low semantics in the board file GPIO descriptor table (active low) and assert the reset line by bringing it to "1" (asserted). Cc: Marek Vasut Cc: Haojian Zhuang Cc: Robert Jarzmik Reviewed-by: Daniel Mack Acked-by: Mark Brown Reviewed-by: Daniel Thompson Signed-off-by: Linus Walleij --- ChangeLog v8->v9: - Collect ACKs! - Backlight maintainers: please merge this into the backlight tree. ChangeLog v7->v8: - Rebase onto v5.11-rc1 - I wonder why this never seems to get merged...? ChangeLog v6->v7: - Rebase onto v5.10-rc1 ChangeLog v5->v6: - Rebase onto v5.9-rc1 ChangeLog v4->v5: - Rebase on v5.8-rc1 - Collected Daniel's Reviewed-by tag. ChangeLog v3->v4: - Check IS_ERR() on the returned GPIO descriptor. - Unconditionally set consumer name since the API tolerates NULL. ChangeLog v2->v3: - Fix a use-before-allocated bug discovered by compile tests. - Remove unused ret variable as autobuilders complained. ChangeLog v1->v2: - Bring up the GPIO de-asserted in probe() Marek: I saw this was written by you, are you regularly testing the Z2 device? --- arch/arm/mach-pxa/z2.c | 12 +++++--- drivers/video/backlight/lms283gf05.c | 43 +++++++++++----------------- include/linux/spi/lms283gf05.h | 16 ----------- 3 files changed, 25 insertions(+), 46 deletions(-) delete mode 100644 include/linux/spi/lms283gf05.h -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 21fd76bb09cd..89eb5243c85f 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -578,8 +577,13 @@ static struct pxa2xx_spi_chip lms283_chip_info = { .gpio_cs = GPIO88_ZIPITZ2_LCD_CS, }; -static const struct lms283gf05_pdata lms283_pdata = { - .reset_gpio = GPIO19_ZIPITZ2_LCD_RESET, +static struct gpiod_lookup_table lms283_gpio_table = { + .dev_id = "spi2.0", /* SPI bus 2 chip select 0 */ + .table = { + GPIO_LOOKUP("gpio-pxa", GPIO19_ZIPITZ2_LCD_RESET, + "reset", GPIO_ACTIVE_LOW), + { }, + }, }; static struct spi_board_info spi_board_info[] __initdata = { @@ -595,7 +599,6 @@ static struct spi_board_info spi_board_info[] __initdata = { { .modalias = "lms283gf05", .controller_data = &lms283_chip_info, - .platform_data = &lms283_pdata, .max_speed_hz = 400000, .bus_num = 2, .chip_select = 0, @@ -615,6 +618,7 @@ static void __init z2_spi_init(void) { pxa2xx_set_spi_info(1, &pxa_ssp1_master_info); pxa2xx_set_spi_info(2, &pxa_ssp2_master_info); + gpiod_add_lookup_table(&lms283_gpio_table); spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); } #else diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c index 0e45685bcc1c..36856962ed83 100644 --- a/drivers/video/backlight/lms283gf05.c +++ b/drivers/video/backlight/lms283gf05.c @@ -9,16 +9,16 @@ #include #include #include -#include +#include #include #include -#include #include struct lms283gf05_state { struct spi_device *spi; struct lcd_device *ld; + struct gpio_desc *reset; }; struct lms283gf05_seq { @@ -90,13 +90,13 @@ static const struct lms283gf05_seq disp_pdwnseq[] = { }; -static void lms283gf05_reset(unsigned long gpio, bool inverted) +static void lms283gf05_reset(struct gpio_desc *gpiod) { - gpio_set_value(gpio, !inverted); + gpiod_set_value(gpiod, 0); /* De-asserted */ mdelay(100); - gpio_set_value(gpio, inverted); + gpiod_set_value(gpiod, 1); /* Asserted */ mdelay(20); - gpio_set_value(gpio, !inverted); + gpiod_set_value(gpiod, 0); /* De-asserted */ mdelay(20); } @@ -125,18 +125,15 @@ static int lms283gf05_power_set(struct lcd_device *ld, int power) { struct lms283gf05_state *st = lcd_get_data(ld); struct spi_device *spi = st->spi; - struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev); if (power <= FB_BLANK_NORMAL) { - if (pdata) - lms283gf05_reset(pdata->reset_gpio, - pdata->reset_inverted); + if (st->reset) + lms283gf05_reset(st->reset); lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq)); } else { lms283gf05_toggle(spi, disp_pdwnseq, ARRAY_SIZE(disp_pdwnseq)); - if (pdata) - gpio_set_value(pdata->reset_gpio, - pdata->reset_inverted); + if (st->reset) + gpiod_set_value(st->reset, 1); /* Asserted */ } return 0; @@ -150,24 +147,18 @@ static struct lcd_ops lms_ops = { static int lms283gf05_probe(struct spi_device *spi) { struct lms283gf05_state *st; - struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev); struct lcd_device *ld; - int ret = 0; - - if (pdata != NULL) { - ret = devm_gpio_request_one(&spi->dev, pdata->reset_gpio, - GPIOF_DIR_OUT | (!pdata->reset_inverted ? - GPIOF_INIT_HIGH : GPIOF_INIT_LOW), - "LMS283GF05 RESET"); - if (ret) - return ret; - } st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state), GFP_KERNEL); if (st == NULL) return -ENOMEM; + st->reset = gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(st->reset)) + return PTR_ERR(st->reset); + gpiod_set_consumer_name(st->reset, "LMS283GF05 RESET"); + ld = devm_lcd_device_register(&spi->dev, "lms283gf05", &spi->dev, st, &lms_ops); if (IS_ERR(ld)) @@ -179,8 +170,8 @@ static int lms283gf05_probe(struct spi_device *spi) spi_set_drvdata(spi, st); /* kick in the LCD */ - if (pdata) - lms283gf05_reset(pdata->reset_gpio, pdata->reset_inverted); + if (st->reset) + lms283gf05_reset(st->reset); lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq)); return 0; diff --git a/include/linux/spi/lms283gf05.h b/include/linux/spi/lms283gf05.h deleted file mode 100644 index f237b2d062e9..000000000000 --- a/include/linux/spi/lms283gf05.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * lms283gf05.h - Platform glue for Samsung LMS283GF05 LCD - * - * Copyright (C) 2009 Marek Vasut -*/ - -#ifndef _INCLUDE_LINUX_SPI_LMS283GF05_H_ -#define _INCLUDE_LINUX_SPI_LMS283GF05_H_ - -struct lms283gf05_pdata { - unsigned long reset_gpio; - bool reset_inverted; -}; - -#endif /* _INCLUDE_LINUX_SPI_LMS283GF05_H_ */