From patchwork Fri Dec 18 02:29:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7878491 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FA369F1C2 for ; Fri, 18 Dec 2015 02:30:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96CAF20155 for ; Fri, 18 Dec 2015 02:30:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2DED2040F for ; Fri, 18 Dec 2015 02:30:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966131AbbLRCaK (ORCPT ); Thu, 17 Dec 2015 21:30:10 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:39133 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966117AbbLRCaJ (ORCPT ); Thu, 17 Dec 2015 21:30:09 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p1027-ipbfp1401kobeminato.hyogo.ocn.ne.jp [114.152.28.27]) by kirsty.vergenet.net (Postfix) with ESMTPA id C5FDB25BE76; Fri, 18 Dec 2015 13:30:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1450405800; bh=Y7X2yMv3kZxCJ/pUg/YvXKP1pFDeLNfw5zEjk/jJ+8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pdzRevDo/1SP14n4fSlB1AXKhmq+9NPx6mA06u4ILX8vF39DnZ/LBecQdnP2MDP7h fG+jV6/Ws/AbDivoVLEcvnEA3qQysoao7H5WsFGoUtJ+LkaQzzc1qufLCuEm2UF17r lFetfWdGAUQiQtCDmc6DUouS4ks8PdsD4WXKLLo0= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id B16D094091C; Fri, 18 Dec 2015 11:29:58 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Simon Horman Subject: [PATCH 06/25] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero Date: Fri, 18 Dec 2015 11:29:36 +0900 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 The default value of #sound-dai-cells in r8a7778.dtsi is one, while the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a phandle without any extra cells ("<&rcar_sound>"), causing: /sound/simple-audio-card,cpu: arguments longer than property asoc-simple-card sound: parse error -22 asoc-simple-card: probe of sound failed with error -22 Override #sound-dai-cells to zero to fix this. Signed-off-by: Geert Uytterhoeven Acked-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7778-bockw.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts index 3c03e6b8261e..158ad94fd4d1 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -172,6 +172,11 @@ }; }; +&rcar_sound { + /* Single DAI */ + #sound-dai-cells = <0>; +}; + &sdhi0 { pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>; pinctrl-names = "default";