From patchwork Sat Jan 31 13:47:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 435131 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7F9EB1402D9 for ; Sun, 1 Feb 2015 00:51:07 +1100 (AEDT) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 6DF281A1485 for ; Sun, 1 Feb 2015 00:51:07 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yk0-x231.google.com (mail-yk0-x231.google.com [IPv6:2607:f8b0:4002:c07::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0794F1A0EE1 for ; Sun, 1 Feb 2015 00:48:22 +1100 (AEDT) Received: by mail-yk0-f177.google.com with SMTP id 19so19088810ykq.8 for ; Sat, 31 Jan 2015 05:48:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ykLPXL+dEuEdsVye2ZMoG/3eUZ0Z1eDs2Oi4f+z/v6E=; b=evafRafdauK2bumxYeQLTREx8pTpfgmrPTe91zm7RSghdRpHvGbtsCDJxYz7BvL061 gtcebRPo5jGewkvZHQSrf2qVtOGJsu3DcMb1IjxKBVCdsyv9vI2CNbFAKW7+oBACsdGZ /UHFvQofqqot3LNZJsrntIAFQ4N5zVX1WGxtgoz+97sbus/NODajj7TPurbPlH/Vw3jI m6PxAzrt3MaDmZHHSdzFiO7Ker+ia6efx4J3IyG0/NtHXfwlgx+6z+s41yzQTi+Vh2DJ Mm5tEGMsZs59pSuEReV2G4mi2fgRAW+Lcu7qtJ3tMlpuE44cLDBT1aW1juHt1b2Lqaf2 zxGQ== X-Received: by 10.236.17.109 with SMTP id i73mr5218854yhi.107.1422712099801; Sat, 31 Jan 2015 05:48:19 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id z23sm8423995yhz.35.2015.01.31.05.48.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 05:48:19 -0800 (PST) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org, linux-fbdev@vger.kernel.org Subject: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC Date: Sat, 31 Jan 2015 21:47:33 +0800 Message-Id: <1422712065-9403-4-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1422712065-9403-1-git-send-email-haokexin@gmail.com> References: <1422712065-9403-1-git-send-email-haokexin@gmail.com> Cc: Kevin Hao , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Paul Mackerras X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 Acked-by: Benjamin Herrenschmidt --- 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;