From patchwork Sat Dec 15 22:51:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1883761 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 65C98DF2EF for ; Sat, 15 Dec 2012 22:51:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755627Ab2LOWvJ (ORCPT ); Sat, 15 Dec 2012 17:51:09 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:40146 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754402Ab2LOWvJ (ORCPT ); Sat, 15 Dec 2012 17:51:09 -0500 Received: from avalon.quadriga.com (unknown [194.136.87.226]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D96B35A8B; Sat, 15 Dec 2012 23:51:08 +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 38/81] sh: sh7734: Register PFC platform device Date: Sat, 15 Dec 2012 23:51:12 +0100 Message-Id: <1355611915-25060-39-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/sh4a/pinmux-sh7734.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ef1fbf7..8b5b399 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -458,6 +458,7 @@ config CPU_SUBTYPE_SH7734 select ARCH_WANT_OPTIONAL_GPIOLIB select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_EHCI + select PINCTRL help Select SH7734 if you have a SH4A SH7734 CPU. diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c index eed3b9d..fa33583 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #define CPU_32_PORT(fn, pfx, sfx) \ @@ -2467,9 +2468,6 @@ static struct resource sh7734_pfc_resources[] = { static struct pinmux_info sh7734_pinmux_info = { .name = "sh7734_pfc", - .resource = sh7734_pfc_resources, - .num_resources = ARRAY_SIZE(sh7734_pfc_resources), - .unlock_reg = 0xFFFC0000, .reserved_id = PINMUX_RESERVED, @@ -2492,6 +2490,8 @@ static struct pinmux_info sh7734_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7734_pinmux_info); + return sh_pfc_register_info(NULL, sh7734_pfc_resources, + ARRAY_SIZE(sh7734_pfc_resources), + &sh7734_pinmux_info); } arch_initcall(plat_pinmux_setup);