From patchwork Sat Dec 15 22:51:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1883691 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 78969DF2EF for ; Sat, 15 Dec 2012 22:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754706Ab2LOWvF (ORCPT ); Sat, 15 Dec 2012 17:51:05 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:40094 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754402Ab2LOWvF (ORCPT ); Sat, 15 Dec 2012 17:51:05 -0500 Received: from avalon.quadriga.com (unknown [194.136.87.226]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3DE9435A88; Sat, 15 Dec 2012 23:51:04 +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 v3 31/81] sh: sh7203: Register PFC platform device Date: Sat, 15 Dec 2012 23:51:05 +0100 Message-Id: <1355611915-25060-32-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1355611915-25060-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1355611915-25060-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-sh7203.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8451317..fe970c0 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -278,6 +278,7 @@ config CPU_SUBTYPE_SH7203 select SYS_SUPPORTS_CMT select SYS_SUPPORTS_MTU2 select ARCH_WANT_OPTIONAL_GPIOLIB + select PINCTRL config CPU_SUBTYPE_SH7206 bool "Support SH7206 processor" diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c index c465af7..814926e 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c @@ -11,6 +11,7 @@ #include #include #include +#include #include enum { @@ -1592,6 +1593,6 @@ static struct pinmux_info sh7203_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7203_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7203_pinmux_info); } arch_initcall(plat_pinmux_setup);