From patchwork Mon Sep 14 18:54:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 7177951 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 4F7009F336 for ; Mon, 14 Sep 2015 18:54:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7EF8220629 for ; Mon, 14 Sep 2015 18:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8792620608 for ; Mon, 14 Sep 2015 18:54:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751760AbbINSyi (ORCPT ); Mon, 14 Sep 2015 14:54:38 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:35709 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbbINSyh (ORCPT ); Mon, 14 Sep 2015 14:54:37 -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 1ZbYta-0005Qb-VB; Mon, 14 Sep 2015 18:54:34 +0000 Received: from broonie by finisterre with local (Exim 4.86) (envelope-from ) id 1ZbYtX-0002JQ-V0; Mon, 14 Sep 2015 19:54:27 +0100 From: Mark Brown To: Jonas Gorski , Mark Brown Cc: linux-spi@vger.kernel.org In-Reply-To: <1441894304-22316-5-git-send-email-jogo@openwrt.org> Message-Id: Date: Mon, 14 Sep 2015 19:54:27 +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: replace custom io accessors with standard ones" 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: replace custom io accessors with standard ones 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 158fcc4e050a75b609bbef1007cf7bf2a01ca043 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 10 Sep 2015 16:11:42 +0200 Subject: [PATCH] spi/bcm63xx: replace custom io accessors with standard ones Replace all bcm_read* with (io)read. Due to this block following system endianness, make sure we match that. Signed-off-by: Jonas Gorski Signed-off-by: Mark Brown --- drivers/spi/spi-bcm63xx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index c1364a8..ef05387 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -56,25 +56,33 @@ struct bcm63xx_spi { static inline u8 bcm_spi_readb(struct bcm63xx_spi *bs, unsigned int offset) { - return bcm_readb(bs->regs + bcm63xx_spireg(offset)); + return readb(bs->regs + bcm63xx_spireg(offset)); } static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs, unsigned int offset) { - return bcm_readw(bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_BIG_ENDIAN + return ioread16(bs->regs + bcm63xx_spireg(offset)); +#else + return readw(bs->regs + bcm63xx_spireg(offset)); +#endif } static inline void bcm_spi_writeb(struct bcm63xx_spi *bs, u8 value, unsigned int offset) { - bcm_writeb(value, bs->regs + bcm63xx_spireg(offset)); + writeb(value, bs->regs + bcm63xx_spireg(offset)); } static inline void bcm_spi_writew(struct bcm63xx_spi *bs, u16 value, unsigned int offset) { - bcm_writew(value, bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_BIG_ENDIAN + iowrite16(value, bs->regs + bcm63xx_spireg(offset)); +#else + writew(value, bs->regs + bcm63xx_spireg(offset)); +#endif } static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = {