From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DC0AC43381 for ; Mon, 18 Mar 2019 10:38:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB6C520850 for ; Mon, 18 Mar 2019 10:38:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YhrMkPSH"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="SqApr3Ib" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB6C520850 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mVpqsnDjnAjNQhZhbagFjc0Q17lvYYqK+GOrlAOBng0=; b=YhrMkPSHn2bsnD Y2RYyzXRra3q9UK8Anpke1JeKoMsdku3/o0DRFqspHZrfnCWU8marMFjXR1oFCniSZFWLNZS1+/dj IBydl55xRrLlyLu9VH1rcysj8xTP5+PI+nSOuWSNNq7SHc3JqtUPk42AS04YQDK+Qa1iVq82HBFTA alnkcJEnp+iptyE/EL8wdoe/69+SAnMfPRKiA5zUtO/VOBHBatrV4THfwTLn5uN0xLBQQAI6W7hNA gybo0DFeofpU7w6covakp27+P709hlpNa5gQDamX2FOmgp4qFChRr0sz2HSWgxbqvNwMnpQxgPsgB tWQqAdVhoJVfo4t7b5/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5pfA-0005UX-7l; Mon, 18 Mar 2019 10:38:36 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5pf3-0005Rz-Gx for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 10:38:34 +0000 IronPort-Data: A9a23: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 X-IronPort-AV: E=Sophos;i="5.58,493,1544511600"; d="scan'208";a="28251562" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 18 Mar 2019 03:38:25 -0700 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.37) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 18 Mar 2019 03:38:25 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjZrM2jb9x1sV/CcDFguqVfXptToGGcEfN7DP4/D6Ug=; b=SqApr3Iblg/c4sIcuU7jERchut7HsNpvao+YGrkAFFw1pDDM6rnlqdBOgiXDZqF71oWqCnmynA9EM41zGy6dplgQCPXdawaUDtTJ97bmXvqFt6IyQWVwWEYawmN5rrtL2H0dr97bImS2TBwWAiOEfMOErr/zqYHFEWto+cZUyeo= Received: from MWHPR11MB1662.namprd11.prod.outlook.com (10.172.55.15) by MWHPR11MB1309.namprd11.prod.outlook.com (10.169.237.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Mon, 18 Mar 2019 10:38:23 +0000 Received: from MWHPR11MB1662.namprd11.prod.outlook.com ([fe80::5413:49b5:8548:fe44]) by MWHPR11MB1662.namprd11.prod.outlook.com ([fe80::5413:49b5:8548:fe44%8]) with mapi id 15.20.1709.015; Mon, 18 Mar 2019 10:38:23 +0000 From: To: , Subject: Re: [PATCH] video: fbdev: atmel_lcdfb: drop AVR and platform_data support Thread-Topic: [PATCH] video: fbdev: atmel_lcdfb: drop AVR and platform_data support Thread-Index: AQHU3Xax6yx8KGhkR06beat/0UNjKg== Date: Mon, 18 Mar 2019 10:38:22 +0000 Message-ID: <8d40e40f-f721-f01e-eb90-470eb65d7794@microchip.com> References: <20190225212533.26432-1-alexandre.belloni@bootlin.com> In-Reply-To: <20190225212533.26432-1-alexandre.belloni@bootlin.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LNXP123CA0006.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::18) To MWHPR11MB1662.namprd11.prod.outlook.com (2603:10b6:301:e::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Nicolas.Ferre@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [195.6.168.232] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ecafa8e8-db9e-4208-b63c-08d6ab8dd80d x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1309; x-ms-traffictypediagnostic: MWHPR11MB1309: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-forefront-prvs: 098076C36C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(346002)(39860400002)(396003)(136003)(189003)(199004)(6512007)(52116002)(71200400001)(71190400001)(186003)(53936002)(81166006)(81156014)(102836004)(66066001)(5660300002)(6486002)(76176011)(36756003)(2906002)(8936002)(86362001)(6246003)(8676002)(26005)(97736004)(53546011)(6306002)(105586002)(31696002)(7736002)(99286004)(106356001)(305945005)(478600001)(4326008)(31686004)(72206003)(110136005)(386003)(68736007)(316002)(6506007)(54906003)(446003)(6436002)(3846002)(6116002)(14454004)(476003)(2616005)(486006)(229853002)(25786009)(11346002)(256004)(14444005); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1309; H:MWHPR11MB1662.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: c1KJO5so/YLiVK232gcjbyo4/EgHhwh3XZb5LQamLjoGoVsnL+Z1f1Z2UW0ZkQ1q91Cj7zAJeO7dZJpbtYLfPOu7aw7f6Y/Pqso0yhS3DK7s90auasTLNtW2HBb4kV+jFGeBSdkz4JYoKa07Ccsf0ZJvv1c87CUNmALIBAq8BS5YnNvuyczJTT67CJjKzWiUwkjvagWoQkqzBP9VggKskr+KzkdArfeG1ZqVNBEoUV6cKKQwHsiDrRJwoDDmhFUE3To4ZXpPw8x9/tpPhFmYEJCjd2LF7bZtn8HA85GV/eyzBNWsVUkQtAiDyX1r51qguEkWCbhDQHV/4aBcRn5Hvsr5iMVqERg9eXWqY6m2mKTazv2T00B2EYauoeHbgRCY6VWH0iNHuEFrHKvAAidVzS17NQHCWW5L6yOyAr6oWfM= Content-ID: <2F9AA9CA3D59D24E8CC3DA2AB7251ECB@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: ecafa8e8-db9e-4208-b63c-08d6ab8dd80d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2019 10:38:22.8354 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1309 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_033829_695024_0CF8F514 X-CRM114-Status: GOOD ( 17.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, sam@ravnborg.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 25/02/2019 at 22:25, Alexandre Belloni wrote: > Make the driver OF only as since AVR32 has been removed from the kernel, > there are only OF enabled platform using it. > > Signed-off-by: Alexandre Belloni In case it's needed: Acked-by: Nicolas Ferre > --- > drivers/video/fbdev/Kconfig | 6 +- > drivers/video/fbdev/atmel_lcdfb.c | 114 ++---------------------------- > 2 files changed, 7 insertions(+), 113 deletions(-) > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index ae7712c9687a..f0f07d02af88 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -866,8 +866,8 @@ config FB_S1D13XXX > > > config FB_ATMEL > - tristate "AT91/AT32 LCD Controller support" > - depends on FB && HAVE_FB_ATMEL > + tristate "AT91 LCD Controller support" > + depends on FB && OF && HAVE_FB_ATMEL > select FB_BACKLIGHT > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > @@ -875,7 +875,7 @@ config FB_ATMEL > select FB_MODE_HELPERS > select VIDEOMODE_HELPERS > help > - This enables support for the AT91/AT32 LCD Controller. > + This enables support for the AT91 LCD Controller. > > config FB_NVIDIA > tristate "nVidia Framebuffer Support" > diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c > index 4ed55e6bbb84..b8786ff62b87 100644 > --- a/drivers/video/fbdev/atmel_lcdfb.c > +++ b/drivers/video/fbdev/atmel_lcdfb.c > @@ -1,5 +1,5 @@ > /* > - * Driver for AT91/AT32 LCD Controller > + * Driver for AT91 LCD Controller > * > * Copyright (C) 2007 Atmel Corporation > * > @@ -99,86 +99,6 @@ static struct atmel_lcdfb_config at91sam9rl_config = { > .have_intensity_bit = true, > }; > > -static struct atmel_lcdfb_config at32ap_config = { > - .have_hozval = true, > -}; > - > -static const struct platform_device_id atmel_lcdfb_devtypes[] = { > - { > - .name = "at91sam9261-lcdfb", > - .driver_data = (unsigned long)&at91sam9261_config, > - }, { > - .name = "at91sam9263-lcdfb", > - .driver_data = (unsigned long)&at91sam9263_config, > - }, { > - .name = "at91sam9g10-lcdfb", > - .driver_data = (unsigned long)&at91sam9g10_config, > - }, { > - .name = "at91sam9g45-lcdfb", > - .driver_data = (unsigned long)&at91sam9g45_config, > - }, { > - .name = "at91sam9g45es-lcdfb", > - .driver_data = (unsigned long)&at91sam9g45es_config, > - }, { > - .name = "at91sam9rl-lcdfb", > - .driver_data = (unsigned long)&at91sam9rl_config, > - }, { > - .name = "at32ap-lcdfb", > - .driver_data = (unsigned long)&at32ap_config, > - }, { > - /* terminator */ > - } > -}; > -MODULE_DEVICE_TABLE(platform, atmel_lcdfb_devtypes); > - > -static struct atmel_lcdfb_config * > -atmel_lcdfb_get_config(struct platform_device *pdev) > -{ > - unsigned long data; > - > - data = platform_get_device_id(pdev)->driver_data; > - > - return (struct atmel_lcdfb_config *)data; > -} > - > -#if defined(CONFIG_ARCH_AT91) > -#define ATMEL_LCDFB_FBINFO_DEFAULT (FBINFO_DEFAULT \ > - | FBINFO_PARTIAL_PAN_OK \ > - | FBINFO_HWACCEL_YPAN) > - > -static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo, > - struct fb_var_screeninfo *var, > - struct fb_info *info) > -{ > - > -} > -#elif defined(CONFIG_AVR32) > -#define ATMEL_LCDFB_FBINFO_DEFAULT (FBINFO_DEFAULT \ > - | FBINFO_PARTIAL_PAN_OK \ > - | FBINFO_HWACCEL_XPAN \ > - | FBINFO_HWACCEL_YPAN) > - > -static void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo, > - struct fb_var_screeninfo *var, > - struct fb_info *info) > -{ > - u32 dma2dcfg; > - u32 pixeloff; > - > - pixeloff = (var->xoffset * info->var.bits_per_pixel) & 0x1f; > - > - dma2dcfg = (info->var.xres_virtual - info->var.xres) > - * info->var.bits_per_pixel / 8; > - dma2dcfg |= pixeloff << ATMEL_LCDC_PIXELOFF_OFFSET; > - lcdc_writel(sinfo, ATMEL_LCDC_DMA2DCFG, dma2dcfg); > - > - /* Update configuration */ > - lcdc_writel(sinfo, ATMEL_LCDC_DMACON, > - lcdc_readl(sinfo, ATMEL_LCDC_DMACON) > - | ATMEL_LCDC_DMAUPDT); > -} > -#endif > - > static u32 contrast_ctr = ATMEL_LCDC_PS_DIV8 > | ATMEL_LCDC_POL_POSITIVE > | ATMEL_LCDC_ENA_PWMENABLE; > @@ -404,8 +324,6 @@ static void atmel_lcdfb_update_dma(struct fb_info *info, > > /* Set framebuffer DMA base address and pixel offset */ > lcdc_writel(sinfo, ATMEL_LCDC_DMABADDR1, dma_addr); > - > - atmel_lcdfb_update_dma2d(sinfo, var, info); > } > > static inline void atmel_lcdfb_free_video_memory(struct atmel_lcdfb_info *sinfo) > @@ -978,7 +896,6 @@ static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo) > clk_disable_unprepare(sinfo->lcdc_clk); > } > > -#ifdef CONFIG_OF > static const struct of_device_id atmel_lcdfb_dt_ids[] = { > { .compatible = "atmel,at91sam9261-lcdc" , .data = &at91sam9261_config, }, > { .compatible = "atmel,at91sam9263-lcdc" , .data = &at91sam9263_config, }, > @@ -986,7 +903,6 @@ static const struct of_device_id atmel_lcdfb_dt_ids[] = { > { .compatible = "atmel,at91sam9g45-lcdc" , .data = &at91sam9g45_config, }, > { .compatible = "atmel,at91sam9g45es-lcdc" , .data = &at91sam9g45es_config, }, > { .compatible = "atmel,at91sam9rl-lcdc" , .data = &at91sam9rl_config, }, > - { .compatible = "atmel,at32ap-lcdc" , .data = &at32ap_config, }, > { /* sentinel */ } > }; > > @@ -1122,19 +1038,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) > of_node_put(display_np); > return ret; > } > -#else > -static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) > -{ > - return 0; > -} > -#endif > > static int __init atmel_lcdfb_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct fb_info *info; > struct atmel_lcdfb_info *sinfo; > - struct atmel_lcdfb_pdata *pdata = NULL; > struct resource *regs = NULL; > struct resource *map = NULL; > struct fb_modelist *modelist; > @@ -1159,21 +1068,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) > ret = atmel_lcdfb_of_init(sinfo); > if (ret) > goto free_info; > - } else if (dev_get_platdata(dev)) { > - struct fb_monspecs *monspecs; > - int i; > - > - pdata = dev_get_platdata(dev); > - monspecs = pdata->default_monspecs; > - sinfo->pdata = *pdata; > - > - for (i = 0; i < monspecs->modedb_len; i++) > - fb_add_videomode(&monspecs->modedb[i], &info->modelist); > - > - sinfo->config = atmel_lcdfb_get_config(pdev); > - > - info->var.bits_per_pixel = pdata->default_bpp ? pdata->default_bpp : 16; > - memcpy(&info->monspecs, pdata->default_monspecs, sizeof(info->monspecs)); > } else { > dev_err(dev, "cannot get default configuration\n"); > goto free_info; > @@ -1186,7 +1080,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) > if (IS_ERR(sinfo->reg_lcd)) > sinfo->reg_lcd = NULL; > > - info->flags = ATMEL_LCDFB_FBINFO_DEFAULT; > + info->flags = FBINFO_DEFAULT | FBINFO_PARTIAL_PAN_OK | > + FBINFO_HWACCEL_YPAN; > info->pseudo_palette = sinfo->pseudo_palette; > info->fbops = &atmel_lcdfb_ops; > > @@ -1435,7 +1330,6 @@ static struct platform_driver atmel_lcdfb_driver = { > .remove = __exit_p(atmel_lcdfb_remove), > .suspend = atmel_lcdfb_suspend, > .resume = atmel_lcdfb_resume, > - .id_table = atmel_lcdfb_devtypes, > .driver = { > .name = "atmel_lcdfb", > .of_match_table = of_match_ptr(atmel_lcdfb_dt_ids), > @@ -1444,6 +1338,6 @@ static struct platform_driver atmel_lcdfb_driver = { > > module_platform_driver_probe(atmel_lcdfb_driver, atmel_lcdfb_probe); > > -MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver"); > +MODULE_DESCRIPTION("AT91 LCD Controller framebuffer driver"); > MODULE_AUTHOR("Nicolas Ferre "); > MODULE_LICENSE("GPL"); > -- Nicolas Ferre _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel