From patchwork Mon Oct 12 10:24:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 7373991 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7BB7C9F1B9 for ; Mon, 12 Oct 2015 10:24:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A377A207DB for ; Mon, 12 Oct 2015 10:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9E90207D4 for ; Mon, 12 Oct 2015 10:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751896AbbJLKYs (ORCPT ); Mon, 12 Oct 2015 06:24:48 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:42362 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751887AbbJLKYs (ORCPT ); Mon, 12 Oct 2015 06:24:48 -0400 Received: from localhost (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B8B1328C13D; Mon, 12 Oct 2015 12:23:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Virus-Scanned: at arrakis.dune.hu Received: from localhost.localdomain (dslb-088-073-016-160.088.073.pools.vodafone-ip.de [88.73.16.160]) by arrakis.dune.hu (Postfix) with ESMTPSA id E7E5B28B43F; Mon, 12 Oct 2015 12:23:04 +0200 (CEST) From: Jonas Gorski To: linux-spi@vger.kernel.org Cc: Mark Brown , Florian Fainelli Subject: [PATCH V3 1/3] spi/bcm63xx: fix standard accessors and compile guard Date: Mon, 12 Oct 2015 12:24:21 +0200 Message-Id: <1444645463-20915-2-git-send-email-jogo@openwrt.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444645463-20915-1-git-send-email-jogo@openwrt.org> References: <1444645463-20915-1-git-send-email-jogo@openwrt.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the correct guard CONFIG_CPU_BIG_ENDIAN and the *be accessors to follow native endianness on big endian systems. Signed-off-by: Jonas Gorski --- v2 -> v3: * Squash in revert of applied v1. v1 -> v2: * Use the right guard and io*be. drivers/spi/spi-bcm63xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index ef05387..461891f 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -62,8 +62,8 @@ static inline u8 bcm_spi_readb(struct bcm63xx_spi *bs, static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs, unsigned int offset) { -#ifdef CONFIG_BIG_ENDIAN - return ioread16(bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_CPU_BIG_ENDIAN + return ioread16be(bs->regs + bcm63xx_spireg(offset)); #else return readw(bs->regs + bcm63xx_spireg(offset)); #endif @@ -78,8 +78,8 @@ static inline void bcm_spi_writeb(struct bcm63xx_spi *bs, static inline void bcm_spi_writew(struct bcm63xx_spi *bs, u16 value, unsigned int offset) { -#ifdef CONFIG_BIG_ENDIAN - iowrite16(value, bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_CPU_BIG_ENDIAN + iowrite16be(value, bs->regs + bcm63xx_spireg(offset)); #else writew(value, bs->regs + bcm63xx_spireg(offset)); #endif