From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 8CA111A0007 for ; Fri, 27 Feb 2015 11:11:40 +1100 (AEDT) Message-ID: <1424995875.4645.42.camel@kernel.crashing.org> Subject: Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC From: Benjamin Herrenschmidt To: Kevin Hao Date: Fri, 27 Feb 2015 11:11:15 +1100 In-Reply-To: <1422712065-9403-4-git-send-email-haokexin@gmail.com> References: <1422712065-9403-1-git-send-email-haokexin@gmail.com> <1422712065-9403-4-git-send-email-haokexin@gmail.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: linux-fbdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Tomi Valkeinen , Paul Mackerras , Jean-Christophe Plagniol-Villard List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sat, 2015-01-31 at 21:47 +0800, Kevin Hao wrote: > The PPC_OF is a ppc specific option which is used to mean that the > firmware device tree access functions are available. Since all the > ppc platforms have a device tree, it is aways set to 'y' for ppc. > So it makes no sense to keep a such option in the current kernel. > Replace it with PPC. > > Signed-off-by: Kevin Hao For this and generally the whole series, Acked-by: Benjamin Herrenschmidt Which tree do we expect this to go through ? Cheers, Ben. > --- > drivers/video/fbdev/aty/aty128fb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c > index aedf2fbf9bf6..0156954bf340 100644 > --- a/drivers/video/fbdev/aty/aty128fb.c > +++ b/drivers/video/fbdev/aty/aty128fb.c > @@ -965,7 +965,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par) > /* fill in known card constants if pll_block is not available */ > static void aty128_timings(struct aty128fb_par *par) > { > -#ifdef CONFIG_PPC_OF > +#ifdef CONFIG_PPC > /* instead of a table lookup, assume OF has properly > * setup the PLL registers and use their values > * to set the XCLK values and reference divider values */ > @@ -979,7 +979,7 @@ static void aty128_timings(struct aty128fb_par *par) > if (!par->constants.ref_clk) > par->constants.ref_clk = 2950; > > -#ifdef CONFIG_PPC_OF > +#ifdef CONFIG_PPC > x_mpll_ref_fb_div = aty_ld_pll(X_MPLL_REF_FB_DIV); > xclk_cntl = aty_ld_pll(XCLK_CNTL) & 0x7; > Nx = (x_mpll_ref_fb_div & 0x00ff00) >> 8;