From patchwork Fri Jan 22 02:45:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 571456 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7B77B140662 for ; Fri, 22 Jan 2016 14:02:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=J1bOjL05; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 174BEA7658; Fri, 22 Jan 2016 04:02:51 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VhBBnd943UME; Fri, 22 Jan 2016 04:02:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 69D0AA7550; Fri, 22 Jan 2016 03:55:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D35DD4BA64 for ; Fri, 22 Jan 2016 03:46:29 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0lyFnRQ-nCLy for ; Fri, 22 Jan 2016 03:46:28 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by theia.denx.de (Postfix) with ESMTPS id 8C2EC4BB9C for ; Fri, 22 Jan 2016 03:45:41 +0100 (CET) Received: by mail-ob0-f180.google.com with SMTP id yo10so26986155obb.2 for ; Thu, 21 Jan 2016 18:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tTIPINajiVHsuVWbJ/BmUHb0d+RQpt55Uu6yMK9ulR0=; b=J1bOjL051Y3yc3orZ1DC2uJMniRPBSiMY6+9W0rz37uzkT/T3FVL9MVQWQ6grtBtnu CqPzPKpOdwrqHtLLYoz15wR/UT5nW2YpDYFk5Qyp8lgx3Hyb2+PZY1un5KgHetGAmNBS smBu9szPjkmJwM2LTUFO0E7zu6Ra4Ewhgf1oY6hukUhfBjk/hsiojz9JPEcxGDtSaC+L 0xK0eYP883xbxXtveKvxbAqzSSCVVkllJKEveirRuw05j10477SKgNIyMAd7nJLL2yBb QE8eG6JQKHtOqeotTUN6fIBfw8Fps2KV/tVqkBo33ThTBFyCchrREys/7X+cwUrrDD7F i+Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tTIPINajiVHsuVWbJ/BmUHb0d+RQpt55Uu6yMK9ulR0=; b=bQEzr5dChm+ojSkZ38OspB6gY1J78blG41Tgu1XQsJHMOLF4gMnC9pLzviPvnPvQPR H87D3W3pMI8l55mjIsdNL1+236eW7F815rikX5+wcHn3NIPeLDlXLUHaiWye1EouI/Yq fh/piDUegPJfBLBcCTEILHHkA+8KvaWcuObkP058Jvi5Kgmnt4XmLUWiSWbCj9rDpRtT SAzyYdxbauEfTPorGJ7mb3J7PYyucLrg//PS9GCfk84yU49PVMi1cGEX/0nUcK9mdkhY Kz4fa6UO/eXiXXAufRXbJL49nGxJk6HnhSXQtVavYRLY1iS9xX+jcKKRUFk3+sNjT1D7 fgMQ== X-Gm-Message-State: AG10YOQkFpHG5SkXbX/e+eh+Qebf+exw99zlVzuHutNv3Pi8q8orIbmqSL6ww/iqhROO9q3r X-Received: by 10.60.92.97 with SMTP id cl1mr525364oeb.12.1453430739831; Thu, 21 Jan 2016 18:45:39 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id u2sm2079773oej.4.2016.01.21.18.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jan 2016 18:45:38 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id F1C45221AB0; Thu, 21 Jan 2016 19:45:30 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 21 Jan 2016 19:45:12 -0700 Message-Id: <1453430725-4641-25-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1453430725-4641-1-git-send-email-sjg@chromium.org> References: <1453430725-4641-1-git-send-email-sjg@chromium.org> Cc: Tom Cubie , Jeffy Chen Subject: [U-Boot] [PATCH v2 24/37] rockchip: Tidy up the register-access macros X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" These work reasonable well, but there are a few errors: - Brackets should be used to avoid unexpected side-effects - When setting bits, the corresponding upper 16 bits should be set also Signed-off-by: Simon Glass --- Changes in v2: None arch/arm/include/asm/arch-rockchip/hardware.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/hardware.h b/arch/arm/include/asm/arch-rockchip/hardware.h index d5af5b8..08a66ef 100644 --- a/arch/arm/include/asm/arch-rockchip/hardware.h +++ b/arch/arm/include/asm/arch-rockchip/hardware.h @@ -7,14 +7,15 @@ #ifndef _ASM_ARCH_HARDWARE_H #define _ASM_ARCH_HARDWARE_H -#define RK_CLRSETBITS(clr, set) ((((clr) | (set)) << 16) | set) +#define RK_CLRSETBITS(clr, set) ((((clr) | (set)) << 16) | (set)) #define RK_SETBITS(set) RK_CLRSETBITS(0, set) #define RK_CLRBITS(clr) RK_CLRSETBITS(clr, 0) #define TIMER7_BASE 0xff810020 -#define rk_clrsetreg(addr, clr, set) writel((clr) << 16 | (set), addr) +#define rk_clrsetreg(addr, clr, set) \ + writel(((clr) | (set)) << 16 | (set), addr) #define rk_clrreg(addr, clr) writel((clr) << 16, addr) -#define rk_setreg(addr, set) writel(set, addr) +#define rk_setreg(addr, set) writel((set) << 16 | (set), addr) #endif