From patchwork Mon Oct 12 16:59:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 7377951 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 37F9B9F1D5 for ; Mon, 12 Oct 2015 16:59:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EE13208CA for ; Mon, 12 Oct 2015 16:59:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D824208D4 for ; Mon, 12 Oct 2015 16:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452AbbJLQ7r (ORCPT ); Mon, 12 Oct 2015 12:59:47 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:55364 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751086AbbJLQ7q (ORCPT ); Mon, 12 Oct 2015 12:59:46 -0400 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZlgRm-0002a6-4Z; Mon, 12 Oct 2015 16:59:43 +0000 Received: from broonie by finisterre with local (Exim 4.86) (envelope-from ) id 1ZlgRj-00052q-22; Mon, 12 Oct 2015 17:59:35 +0100 From: Mark Brown To: Jonas Gorski , Mark Brown Cc: linux-spi@vger.kernel.org In-Reply-To: <1444645463-20915-2-git-send-email-jogo@openwrt.org> Message-Id: Date: Mon, 12 Oct 2015 17:59:35 +0100 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk 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=unavailable version=3.3.1 Subject: Applied "spi/bcm63xx: fix standard accessors and compile guard" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) 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 The patch spi/bcm63xx: fix standard accessors and compile guard has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 682b5280bf00c0618606ecb26cf4a9342d5e282e Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 12 Oct 2015 12:24:21 +0200 Subject: [PATCH] spi/bcm63xx: fix standard accessors and compile guard 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 Signed-off-by: Mark Brown --- 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