Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp1346999ybg; Wed, 23 Oct 2019 14:20:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqwV5O5kL5HMUiI5mtUFm6TbeXf9vc6uxcGHYTb9+U4Lngg3Pb6F4zRoHtg/7GMGpCkdjGjm X-Received: by 2002:a17:907:213c:: with SMTP id qo28mr20323653ejb.43.1571865613461; Wed, 23 Oct 2019 14:20:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865613; cv=none; d=google.com; s=arc-20160816; b=bqkrZJhBCOubGQhRMAGAsjsMXeOUVzBZqfPCbGSzb5R4zINTYcpIriawuB/i3NsG/c iM6zTbX7XYcJxREpj2h/L0++NPV2MOcATXadNKFTaIC+eL6lJ7e5+4aNVqU8Gbxtb/oH TeKGMHNlCcNl+U2q0su63hklxSa9PuDT+x9R1X8/bYesuoU5y43q6wde2wq/UVlSrxj/ G9R3KfGkL06EUbOO2+E8IDtSE4Qj9xG97ZyR57P2fqu9lWqoiEGDkbCh1LDVj6ctKg+j GDbT6OOb1xbo2AXMgmgpwHSS6HPCCkO0L+YaZwQZ6qH0Xum66C/QsRSCkYN8AWn8Lbmi PdTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=o54Jyg7LaPMTM/R2ezpXAUg6vHkjUZaxwTxf8dd6jXk=; b=nYJsyE2IxwfF9EXtUr54uhJSnZEmlQHXsv2gXitbbqErL/RE3yIAoXOSO0yWAuV1RI tPFnIRmlvi1FrNL15k209fmXAFDuSFiGS4G7FOkKGjlAwMt1IyZ4gaPbokON0bXamZCu D3j6LKWKaMPHjwozzcC5F5ptsPAwljaE1Ih9PqbwP+OrraJwlfXqJV4CO6rToMlHSr4G QXior2JPS/8IdX13dTjMxKoKrkDm3lLUrAYq86OKj2VmLCobaEJ2fRXm8tYjy1EYSV/L nE7xe0GWkppDqIRlLy1uswDPA1gTjT/y8/JDC5vHjP9rntF/GbQ84tUc1e9HRM+4eI5j 0nXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r12si3594802edi.272.2019.10.23.14.19.49; Wed, 23 Oct 2019 14:20:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405740AbfJWNN2 (ORCPT + 99 others); Wed, 23 Oct 2019 09:13:28 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:33027 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405714AbfJWNN1 (ORCPT ); Wed, 23 Oct 2019 09:13:27 -0400 Received: by mail-ed1-f67.google.com with SMTP id c4so15728049edl.0; Wed, 23 Oct 2019 06:13:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=o54Jyg7LaPMTM/R2ezpXAUg6vHkjUZaxwTxf8dd6jXk=; b=qhqmL5gdouqSgD5QVpG81sTI3R3KOtcjzZIrNZIWSUG5ZNYdmCdOSslCn64pZVgdx/ fSNfEVAfob6EaqnuYgeqbxGu0U/g8vvB1wYTAd/4KfRUFvBglWwhAn1WZDBHvB6cYsDk 2GZL75nT+dNoVkm6qPGmFK7QCI55HwhXqqXm60tzluR75iHixp7SLOc3aUUK57XOrKqk QqO2PGSnGtdt4+J+sQ6HL4mgSthVMsER3kfgR3PWy0aneNGir1rpeCqnIOncIVDOgQSX mQf5zo7fKjgVVKnB48oRKlE0CupCC0ai0bo7HygthNy3BVQ1dnALnZeEEePGRvQSdda8 8v1w== X-Gm-Message-State: APjAAAXUEd9o+7iii/oUQVATVpHwGd/BlFGWRMWRpeWyp+0z9i7GHenX hrNctcFeighXUFUCCPY4WSA= X-Received: by 2002:a17:906:704:: with SMTP id y4mr32582518ejb.259.1571836404632; Wed, 23 Oct 2019 06:13:24 -0700 (PDT) Received: from pi3 ([194.230.155.217]) by smtp.googlemail.com with ESMTPSA id v5sm269620edd.90.2019.10.23.06.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 06:13:23 -0700 (PDT) Date: Wed, 23 Oct 2019 15:13:21 +0200 From: Krzysztof Kozlowski To: Arnd Bergmann Cc: Kukjin Kim , Bartlomiej Zolnierkiewicz , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: Re: [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency Message-ID: <20191023131321.GH11048@pi3> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> <20191010203043.1241612-28-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191010203043.1241612-28-arnd@arndb.de> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 10, 2019 at 10:30:12PM +0200, Arnd Bergmann wrote: > The s3c2410fb driver is too deeply intertwined with the s3c24xx > platform code. Change it in a way that avoids the use of platform > header files but having all interface data in a platform_data > header, and the private register definitions next to the driver > itself. > > One ugly bit here is that the driver pokes directly into gpio > registers, which are owned by another driver. Passing the > mapped addresses in platform_data is somewhat suboptimal, but > it is a small improvement over the previous version. > > Signed-off-by: Arnd Bergmann > --- > arch/arm/mach-s3c24xx/include/mach/fb.h | 2 -- > arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 ++-- > arch/arm/mach-s3c24xx/mach-anubis.c | 1 - > arch/arm/mach-s3c24xx/mach-at2440evb.c | 3 +- > arch/arm/mach-s3c24xx/mach-bast.c | 3 +- > arch/arm/mach-s3c24xx/mach-gta02.c | 2 +- > arch/arm/mach-s3c24xx/mach-h1940.c | 7 ++-- > arch/arm/mach-s3c24xx/mach-jive.c | 10 ++++-- > arch/arm/mach-s3c24xx/mach-mini2440.c | 9 +++-- > arch/arm/mach-s3c24xx/mach-n30.c | 3 +- > arch/arm/mach-s3c24xx/mach-osiris.c | 1 - > arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +- > arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +++-- > arch/arm/mach-s3c24xx/mach-rx3715.c | 7 ++-- > arch/arm/mach-s3c24xx/mach-smdk2413.c | 3 +- > arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 - > arch/arm/mach-s3c24xx/mach-smdk2440.c | 8 +++-- > arch/arm/mach-s3c24xx/mach-smdk2443.c | 3 +- > arch/arm/mach-s3c24xx/mach-vstms.c | 3 +- > arch/arm/plat-samsung/devs.c | 2 +- > .../video/fbdev/s3c2410fb-regs-lcd.h | 28 ++++------------ > drivers/video/fbdev/s3c2410fb.c | 16 +++++---- > .../linux/platform_data}/fb-s3c2410.h | 33 ++++++++++++++++++- > 23 files changed, 98 insertions(+), 65 deletions(-) > delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h > rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%) > rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%) > > diff --git a/arch/arm/mach-s3c24xx/include/mach/fb.h b/arch/arm/mach-s3c24xx/include/mach/fb.h > deleted file mode 100644 > index 4e539cb8b884..000000000000 > --- a/arch/arm/mach-s3c24xx/include/mach/fb.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#include > diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c > index 40ad23b52bc0..ef6de1b1d0c6 100644 > --- a/arch/arm/mach-s3c24xx/mach-amlm5900.c > +++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c > @@ -30,9 +30,8 @@ > #include > #include > #include > -#include > +#include > > -#include > #include > #include > > @@ -194,13 +193,17 @@ static struct s3c2410fb_mach_info __initdata amlm5900_fb_info = { > > .gpccon = 0xaaaaaaaa, > .gpccon_mask = 0xffffffff, > + .gpccon_reg = S3C2410_GPCCON, > .gpcup = 0x0000ffff, > .gpcup_mask = 0xffffffff, > + .gpcup_reg = S3C2410_GPCUP, > > .gpdcon = 0xaaaaaaaa, > .gpdcon_mask = 0xffffffff, > + .gpdcon_reg = S3C2410_GPDCON, > .gpdup = 0x0000ffff, > .gpdup_mask = 0xffffffff, > + .gpdup_reg = S3C2410_GPDUP, > }; > #endif > > diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c > index 072966dcad78..e1a73274e90b 100644 > --- a/arch/arm/mach-s3c24xx/mach-anubis.c > +++ b/arch/arm/mach-s3c24xx/mach-anubis.c > @@ -29,7 +29,6 @@ > #include > > #include > -#include > #include > #include > #include > diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c > index b2199906e678..bfda6dd2a9d5 100644 > --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c > +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c > @@ -25,12 +25,11 @@ > #include > > #include > -#include > +#include > #include > #include > > #include > -#include > #include > #include > #include > diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c > index a7c3955ae8f6..cc941b5030ea 100644 > --- a/arch/arm/mach-s3c24xx/mach-bast.c > +++ b/arch/arm/mach-s3c24xx/mach-bast.c > @@ -40,10 +40,9 @@ > #include > #include > > -#include > #include > +#include > #include > -#include > #include > > #include > diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c > index 61b8c6badeb8..1e42782dbd30 100644 > --- a/arch/arm/mach-s3c24xx/mach-gta02.c > +++ b/arch/arm/mach-s3c24xx/mach-gta02.c > @@ -57,8 +57,8 @@ > #include > #include > #include > +#include > > -#include > #include > #include > #include > diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c > index 446891e23511..d56e3befa459 100644 > --- a/arch/arm/mach-s3c24xx/mach-h1940.c > +++ b/arch/arm/mach-s3c24xx/mach-h1940.c > @@ -47,11 +47,10 @@ > > #include > > -#include > +#include > #include > #include > #include > -#include > #include > > #include > @@ -211,12 +210,16 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { > .lpcsel = 0x02, > .gpccon = 0xaa940659, > .gpccon_mask = 0xffffc0f0, > + .gpccon_reg = S3C2410_GPCCON, > .gpcup = 0x0000ffff, > .gpcup_mask = 0xffffffff, > + .gpcup_reg = S3C2410_GPCUP, > .gpdcon = 0xaa84aaa0, > .gpdcon_mask = 0xffffffff, > + .gpdcon_reg = S3C2410_GPDCON, > .gpdup = 0x0000faff, > .gpdup_mask = 0xffffffff, > + .gpdup_reg = S3C2410_GPDUP, > }; > > static int power_supply_init(struct device *dev) > diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c > index 885e8f12e4b9..3b33132b2334 100644 > --- a/arch/arm/mach-s3c24xx/mach-jive.c > +++ b/arch/arm/mach-s3c24xx/mach-jive.c > @@ -32,8 +32,7 @@ > #include > > #include > -#include > -#include > +#include > #include > > #include > @@ -321,6 +320,7 @@ static struct s3c2410fb_mach_info jive_lcd_config = { > * data. */ > > .gpcup = (0xf << 1) | (0x3f << 10), > + .gpcup_reg = S3C2410_GPCUP, Nits: indentation before/after '=' looks wrong. Tab should be before '=', one space after. Best regards, Krzysztof