From patchwork Tue Oct 15 15:35:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3046241 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A0842BF924 for ; Tue, 15 Oct 2013 15:35:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65E8D202E6 for ; Tue, 15 Oct 2013 15:35:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D150D2018A for ; Tue, 15 Oct 2013 15:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932228Ab3JOPfm (ORCPT ); Tue, 15 Oct 2013 11:35:42 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:45103 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759343Ab3JOPfl (ORCPT ); Tue, 15 Oct 2013 11:35:41 -0400 Received: from avalon.ideasonboard.com (unknown [91.177.131.201]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BDC2935A26; Tue, 15 Oct 2013 17:35:06 +0200 (CEST) From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: linux-sh@vger.kernel.org Subject: [PATCH] v4l: vsp1: Replace ioread32/iowrite32 I/O accessors with readl/writel Date: Tue, 15 Oct 2013 17:35:54 +0200 Message-Id: <1381851354-11925-1-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.8.1.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ioread32() and iowrite32() I/O accessors are not available on all architectures. Replace them with readl() and writel() to avoid compilation failures. Although VSP1 devices are only available on Renesas ARM platforms, allowing the driver to compile on all architectures is useful to catch compilation-time issues. Signed-off-by: Laurent Pinchart --- drivers/media/platform/vsp1/vsp1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) This fix is a candidate for v3.12, as building the kernel with allyesconfig on architectures without ioread32/iowrite32 support currently fails on v3.12-rc5. I'll send a pull request to the media tree shortly along with another v3.12 fix that has previously been posted to the linux-media mailing list. diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/vsp1/vsp1.h index d6c6ecd..7dab256 100644 --- a/drivers/media/platform/vsp1/vsp1.h +++ b/drivers/media/platform/vsp1/vsp1.h @@ -63,12 +63,12 @@ void vsp1_device_put(struct vsp1_device *vsp1); static inline u32 vsp1_read(struct vsp1_device *vsp1, u32 reg) { - return ioread32(vsp1->mmio + reg); + return readl(vsp1->mmio + reg); } static inline void vsp1_write(struct vsp1_device *vsp1, u32 reg, u32 data) { - iowrite32(data, vsp1->mmio + reg); + writel(data, vsp1->mmio + reg); } #endif /* __VSP1_H__ */