From patchwork Wed Feb 19 12:49:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peddell X-Patchwork-Id: 3680801 Return-Path: X-Original-To: patchwork-linux-arm@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 DA1689F2EC for ; Wed, 19 Feb 2014 12:54:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02ED3201CD for ; Wed, 19 Feb 2014 12:54:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11AF8201BA for ; Wed, 19 Feb 2014 12:54:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WG6ec-0005Sk-FN; Wed, 19 Feb 2014 12:53:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WG6eC-0007WK-2K; Wed, 19 Feb 2014 12:53:08 +0000 Received: from icp-osb-irony-out1.external.iinet.net.au ([203.59.1.210]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WG6dY-0007N4-Eo for linux-arm-kernel@lists.infradead.org; Wed, 19 Feb 2014 12:52:35 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArkfAEyoBFN8lk02/2dsb2JhbABZgwa8GoRrgR0WdIImAQV5EAgQOSE2BhOHcQMQxV8Nh34XFow5gUdOB4Q4BJZDAYhGFQOFbIVGgz8q X-IronPort-AV: E=Sophos;i="4.97,505,1389715200"; d="scan'208";a="190611782" Received: from unknown (HELO lurch) ([124.150.77.54]) by icp-osb-irony-out1.iinet.net.au with SMTP; 19 Feb 2014 20:49:51 +0800 Received: by lurch (sSMTP sendmail emulation); Wed, 19 Feb 2014 22:49:44 +1000 From: klightspeed@killerwolves.net To: Andrew Lunn Subject: [PATCH v5 4/5] ARM: Kirkwood: Fix qnap vendor prefix Date: Wed, 19 Feb 2014 22:49:13 +1000 Message-Id: <1392814154-11284-5-git-send-email-klightspeed@killerwolves.net> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392814154-11284-1-git-send-email-klightspeed@killerwolves.net> References: <1392814154-11284-1-git-send-email-klightspeed@killerwolves.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140219_075229_024248_2748A1B8 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: 1.0 (+) Cc: Mark Rutland , devicetree@vger.kernel.org, Ben Peddell , Jason Cooper , Pawel Moll , Ian Campbell , Dmitry Eremin-Solenikov , Anton Vorontsov , Rob Herring , Kumar Gala , David Woodhouse , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Correct the vendor prefix for qnap, which should be the stock ticker symbol qnapsz. Signed-off-by: Ben Peddell Cc: Anton Vorontsov Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse --- Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt | 2 +- arch/arm/boot/dts/kirkwood-ts219.dtsi | 4 ++-- drivers/power/reset/qnap-poweroff.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt index af25e77..aabda51 100644 --- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt +++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt @@ -10,7 +10,7 @@ Synology NAS devices use a similar scheme, but a different baud rate, 9600, and a different character, '1'. Required Properties: -- compatible: Should be "qnap,power-off" or "synology,power-off" +- compatible: Should be "qnapsz,power-off" or "synology,power-off" - reg: Address and length of the register set for UART1 - clocks: tclk clock diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi index 911f3a8..0f0892a 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -1,6 +1,6 @@ / { model = "QNAP TS219 family"; - compatible = "qnap,ts219", "marvell,kirkwood"; + compatible = "qnapsz,ts219", "marvell,kirkwood"; memory { device_type = "memory"; @@ -46,7 +46,7 @@ pinctrl-names = "default"; }; poweroff@12100 { - compatible = "qnap,power-off"; + compatible = "qnapsz,power-off"; reg = <0x12000 0x100>; clocks = <&gate_clk 7>; }; diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c index a75db7f..d350ece 100644 --- a/drivers/power/reset/qnap-poweroff.c +++ b/drivers/power/reset/qnap-poweroff.c @@ -41,7 +41,7 @@ static const struct power_off_cfg synology_power_off_cfg = { }; static const struct of_device_id qnap_power_off_of_match_table[] = { - { .compatible = "qnap,power-off", + { .compatible = "qnapsz,power-off", .data = &qnap_power_off_cfg, }, { .compatible = "synology,power-off",