From patchwork Wed Aug 22 13:58:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1361401 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D719D3FC71 for ; Wed, 22 Aug 2012 13:57:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751766Ab2HVN5q (ORCPT ); Wed, 22 Aug 2012 09:57:46 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:38569 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751866Ab2HVN5p (ORCPT ); Wed, 22 Aug 2012 09:57:45 -0400 Received: by dady13 with SMTP id y13so804953dad.19 for ; Wed, 22 Aug 2012 06:57:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=cJ78Sh1ybanP1Qc5mndCtSXcV5Ki8XGbliDVeLmS9t8=; b=g85ntyXEnAPH/qhJ65vsno1SjLw7MTSYakfk5dgdKSJYQ/WL3e1gG2WeLT1tu/uvRh CwbEVWyxXLJUiEdBF7WiTj3h7cs3BIiznnV/qq9+X7S2xpGH8c5rPEzDeIoYVl+37cDt rw7SQHESt/qqbC2IsGldyP2trsMvbUTAjZGF/Hzq9H2mx+jLmH71+rVGYmSnSFeRUJFp GOLbwI4lRB4oZ0s79PX58Vy1LXlU/Cjf1EgrKA5yHt0mFv8gsXk5+2/sVQMjzFm3Z9O0 JjCtoMya4JZLcOw5K2BezW41uwfIAyM6l/vhFwiuTot3WiKJOGlELMbu/HSTmQsQlviZ g21A== Received: by 10.68.227.163 with SMTP id sb3mr53396416pbc.74.1345643864297; Wed, 22 Aug 2012 06:57:44 -0700 (PDT) Received: from localhost.localdomain ([114.216.232.42]) by mx.google.com with ESMTPS id ox5sm3755473pbc.75.2012.08.22.06.57.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 06:57:42 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: linux-mmc@vger.kernel.org, Chris Ball , Shawn Guo , Subject: [PATCH] ARM: dts: imx51-babbage: fix esdhc cd/wp properties Date: Wed, 22 Aug 2012 21:58:07 +0800 Message-Id: <1345643887-30606-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQl4nSemwp85H/eJ3xP6eTMmtmIRTnb0zl3utdN4qa6k/kjdN1BtvL8ZVmq45l3bYcx6irJs Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The binding doc and dts use properties "fsl,{cd,wp}-internal" while esdhc driver uses "fsl,{cd,wp}-controller". Fix binding doc and dts to get them match driver code. Reported-by: Chris Ball Signed-off-by: Shawn Guo Cc: Acked-by: Chris Ball --- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 ++++---- arch/arm/boot/dts/imx51-babbage.dts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index 70cd49b..1dd6225 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -10,8 +10,8 @@ Required properties: - compatible : Should be "fsl,-esdhc" Optional properties: -- fsl,cd-internal : Indicate to use controller internal card detection -- fsl,wp-internal : Indicate to use controller internal write protection +- fsl,cd-controller : Indicate to use controller internal card detection +- fsl,wp-controller : Indicate to use controller internal write protection Examples: @@ -19,8 +19,8 @@ esdhc@70004000 { compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; - fsl,cd-internal; - fsl,wp-internal; + fsl,cd-controller; + fsl,wp-controller; }; esdhc@70008000 { diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index cd86177..59d9789 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -25,8 +25,8 @@ aips@70000000 { /* aips-1 */ spba@70000000 { esdhc@70004000 { /* ESDHC1 */ - fsl,cd-internal; - fsl,wp-internal; + fsl,cd-controller; + fsl,wp-controller; status = "okay"; };