From patchwork Tue Nov 27 00:02:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1807441 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6263FDF2EB for ; Tue, 27 Nov 2012 00:02:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932745Ab2K0AC3 (ORCPT ); Mon, 26 Nov 2012 19:02:29 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:48914 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932805Ab2K0AC3 (ORCPT ); Mon, 26 Nov 2012 19:02:29 -0500 Received: from avalon.ideasonboard.com (unknown [91.178.20.73]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8AE4835AA8; Tue, 27 Nov 2012 01:02:26 +0100 (CET) From: Laurent Pinchart To: linux-sh@vger.kernel.org Cc: Paul Mundt , Magnus Damm , Simon Horman , Linus Walleij , Kuninori Morimoto , Phil Edworthy , Nobuhiro Iwamatsu Subject: [PATCH v2 21/77] sh: sh7264: Register PFC platform device Date: Tue, 27 Nov 2012 01:02:20 +0100 Message-Id: <1353974596-30033-22-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart --- arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 023b2ad..0626044 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -297,6 +297,7 @@ config CPU_SUBTYPE_SH7264 select CPU_HAS_FPU select SYS_SUPPORTS_CMT select SYS_SUPPORTS_MTU2 + select PINCTRL config CPU_SUBTYPE_SH7269 bool "Support SH7269 processor" diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c index b055b55..80b9544 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c @@ -11,6 +11,7 @@ #include #include #include +#include #include enum { @@ -2131,6 +2132,6 @@ static struct pinmux_info sh7264_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7264_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7264_pinmux_info); } arch_initcall(plat_pinmux_setup);