From patchwork Thu Feb 26 12:08:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 443890 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 105411400D5 for ; Thu, 26 Feb 2015 23:13:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Cp5u0q5N; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id CFF761A050E for ; Thu, 26 Feb 2015 23:13:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Cp5u0q5N; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yh0-x229.google.com (mail-yh0-x229.google.com [IPv6:2607:f8b0:4002:c01::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 72F9A1A00A5 for ; Thu, 26 Feb 2015 23:09:23 +1100 (AEDT) Received: by yhzz6 with SMTP id z6so4205138yhz.5 for ; Thu, 26 Feb 2015 04:09:21 -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=Yi9qSgomuyvdsbtYdbeOcOKxEtZkOUksnbqkE372Ipk=; b=Cp5u0q5NXXXsjteHuN3UDbLK205LGEtRhhWi6EN9iXwKiKtZWeqqy4FK6qULrypmnW dtm8WZEQm7cl/4sUYmzBTzQiYFdQkpXWGLQ8k5FPWs3ITrSDF6GagDwoaZLNnbb0l8Ht mnUyOyt0nuZjh0X5Hu94TbodpgE438e/9FhdVIfJSLHUcf6U5wzm21mWx71kUv6kxw6J MfuGEWitgbiIMBRMTVXT7gztzeStaB2j4m4SFKCY3Jd9hjzuKLhU2BlyE/Oxu/4KoCkI ObUDGou0nWTnxJzMEqGyFLHJqdUdlEA0M+vwZT8Gk6B3Ld5fm2UV4JaUKZS3p6tpIXZ1 tLiQ== X-Received: by 10.170.134.134 with SMTP id a128mr7246538ykc.103.1424952561249; Thu, 26 Feb 2015 04:09:21 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id m5sm402805yhb.24.2015.02.26.04.09.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2015 04:09:20 -0800 (PST) From: Kevin Hao To: Michael Ellerman Subject: [PATCH v2 02/11] fbdev: aty128fb: replace PPC_OF with PPC Date: Thu, 26 Feb 2015 20:08:14 +0800 Message-Id: <1424952503-8247-3-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1424952503-8247-1-git-send-email-haokexin@gmail.com> References: <1424952503-8247-1-git-send-email-haokexin@gmail.com> Cc: Paul Mackerras , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , linuxppc-dev@lists.ozlabs.org, linux-fbdev@vger.kernel.org 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 --- v2: No change. 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;