From patchwork Fri Dec 27 20:15:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3412481 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BAF7C9F380 for ; Fri, 27 Dec 2013 20:16:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 707702014A for ; Fri, 27 Dec 2013 20:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A4F320144 for ; Fri, 27 Dec 2013 20:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754786Ab3L0UQY (ORCPT ); Fri, 27 Dec 2013 15:16:24 -0500 Received: from juliette.telenet-ops.be ([195.130.137.74]:39307 "EHLO juliette.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754766Ab3L0UQT (ORCPT ); Fri, 27 Dec 2013 15:16:19 -0500 Received: from ayla.of.borg ([84.193.72.141]) by juliette.telenet-ops.be with bizsmtp id 6kGH1n00s32ts5g06kGH2T; Fri, 27 Dec 2013 21:16:17 +0100 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1VwdpR-0004af-B2; Fri, 27 Dec 2013 21:16:17 +0100 From: Geert Uytterhoeven To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 4/8] ARM: shmobile: genmai: Add RSPI children Date: Fri, 27 Dec 2013 21:15:58 +0100 Message-Id: <1388175362-17132-5-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388175362-17132-1-git-send-email-geert@linux-m68k.org> References: <1388175362-17132-1-git-send-email-geert@linux-m68k.org> 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Geert Uytterhoeven On this board, only rspi4 is in use. Its bus contains a single device (a wm8978 audio codec). As the RSPI driver itself doesn't use DT yet, we have to instantiate the SPI child device in C code, too, for both genmai and genmai-reference. Signed-off-by: Geert Uytterhoeven --- New in v2 arch/arm/mach-shmobile/board-genmai-reference.c | 11 +++++++++++ arch/arm/mach-shmobile/board-genmai.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c index 7630c1053e32..2f8094b3add2 100644 --- a/arch/arm/mach-shmobile/board-genmai-reference.c +++ b/arch/arm/mach-shmobile/board-genmai-reference.c @@ -21,11 +21,21 @@ #include #include #include +#include #include #include #include #include +static const struct spi_board_info spi_info[] __initconst = { + { + .modalias = "wm8978", + .max_speed_hz = 5000000, + .bus_num = 4, + .chip_select = 0, + }, +}; + static void __init genmai_add_standard_devices(void) { #ifdef CONFIG_COMMON_CLK @@ -34,6 +44,7 @@ static void __init genmai_add_standard_devices(void) r7s72100_clock_init(); #endif r7s72100_add_dt_devices(); + spi_register_board_info(spi_info, ARRAY_SIZE(spi_info)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index a1f6fe1fb06f..7c912d337828 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -41,11 +42,21 @@ static const struct resource ether_resources[] __initconst = { DEFINE_RES_IRQ(gic_iid(359)), }; +static const struct spi_board_info spi_info[] __initconst = { + { + .modalias = "wm8978", + .max_speed_hz = 5000000, + .bus_num = 4, + .chip_select = 0, + }, +}; + static void __init genmai_add_standard_devices(void) { r7s72100_clock_init(); r7s72100_add_dt_devices(); + spi_register_board_info(spi_info, ARRAY_SIZE(spi_info)); platform_device_register_resndata(&platform_bus, "r7s72100-ether", -1, ether_resources, ARRAY_SIZE(ether_resources),