From patchwork Mon Feb 19 23:11:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Bergas X-Patchwork-Id: 10229191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF3CA602B7 for ; Mon, 19 Feb 2018 23:12:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9ABA26E4A for ; Mon, 19 Feb 2018 23:12:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE43126E79; Mon, 19 Feb 2018 23:12:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 54CD226E4A for ; Mon, 19 Feb 2018 23:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9+cGrMEUD7VLSnZMJeVrbEALpcNDcpwVzrVDD/rRNd4=; b=SnnfQF3gtqStIl36DyW8u+PFLd NXWlSN5ffzFtPjAbxfSOsyX0G15Ht885F7qsaUN1KHnzNuMbincjbQ2xuvmjhksc11jt92KZkqDmj n6hQs9fRep6mcfDwiduk4KBbVaL/cXUaidPm9Na3Q41CrvNbQNfKdmSmxWwNxvBId7xLuE4WOw+8Z BCW3hs5N8wEl1p6afT9x24pd9wDHNr/cYFUcknhWccjN6/ts60RkmKsCwpWTQzxTsVAu1TkJlMTdM jkqpA1l/J8OXf0UvLFbuoEAJ9hx9NJPrlaCqWmh5XWMOMpuzf5y/lIUXYY3jqKMBsYLwrl3WCULMr 2zvn+eYQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1enubI-0002IZ-7h; Mon, 19 Feb 2018 23:12:00 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1enubF-0002E3-08 for linux-rockchip@lists.infradead.org; Mon, 19 Feb 2018 23:11:58 +0000 Received: by mail-lf0-x241.google.com with SMTP id j193so1671430lfe.0 for ; Mon, 19 Feb 2018 15:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FObdFMd07IaJRypBU4UWHUmFuXymioqHGoujazuEOPs=; b=ctP1hvN/6W+Dg1e0+5R1p/ul6iyItjbWsJeLr8q243d96IVN72MVPJ3IOLutciShQk BBKmtzifCk1z9QW73+QvaVdeEMXjFXQOX2YePLKwSYBOA1Jju6q4235TOAL98T/IVTfi xiZiO61xdf8Z+EOxNCSXguvFmIXwCUYhhXRZTi8haQvNBnPpEEcyNHqcDobYht6cbuNe 6Fw+yMAgAiAGw6I2lVLuVhBoJluhXEeGEzgqy0JYBb+pc0lv8lYth6WA7/OsM0l1WflY Bq+1TQ6HPmSHjjw7wOAKmh53A1LlEAOsOVqq/gCbJSXR1zQSADoAePFBQMAFDzIrKbIL l1gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FObdFMd07IaJRypBU4UWHUmFuXymioqHGoujazuEOPs=; b=iaziW3fMr1IzVQ7mt7Wy5og2AnJgIdJBlyDDJKcA+h8Et9h17sT9KjELwWcYYLIqhC 3yyueKIPXzSQMjtu4o3qwNvqb27EWHwuooZtfZp7TKNfeL+FasK9oIp1wqllhY6Yi8P+ YSa46LQRklKo0yI9/3F8M1Aoul2u2SFsjTFghiyS2CwqC8MR1ZwV2JuK2MgXH2rXiOHN uyRax+Cxtdf5Vtqbqfz+N+nlKN8juGfGIXdcYZDbZWVLeXWGZB/P2hf1HPiEm4GyUQ6l 02fKSAlLevdhV3jLa4YG1W1MEWMrSYOLrFe231qqNYHwUjvUAczfpj/zj/s03dyp+lrI x7oQ== X-Gm-Message-State: APf1xPCMau8RsK6eeR8zYmbZpy7LOZjq1w5DSpVxDNQv7alLpMWe54Cq fVMtQMLC8h6HISrq1amPkts/xw== X-Google-Smtp-Source: AH8x226oMlLWXhS8VULYMURjmYDXHWIgauhUoq35ia3NT1YYMeLahldCH2p18qSAwsvunOMUxyhFJw== X-Received: by 10.46.25.130 with SMTP id 2mr10392748ljz.9.1519081903681; Mon, 19 Feb 2018 15:11:43 -0800 (PST) Received: from localhost.localdomain (x1-6-c4-3d-c7-28-62-d2.cpe.webspeed.dk. [80.198.72.241]) by smtp.gmail.com with ESMTPSA id 74sm2789510ljq.32.2018.02.19.15.11.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Feb 2018 15:11:42 -0800 (PST) From: Vicente Bergas To: =?UTF-8?q?Heiko=20St=C3=BCbner?= , linux-rockchip@lists.infradead.org Subject: [PATCH 2/2] arm64: dts: rockchip: move rk3399-sapphire pwr_btn to daughterboard Date: Tue, 20 Feb 2018 00:11:02 +0100 Message-Id: <20180219231102.9090-2-vicencb@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180219231102.9090-1-vicencb@gmail.com> References: <3840224.sEPfbROKII@phil> <20180219231102.9090-1-vicencb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180219_151157_051632_F9F8FED3 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vicente Bergas MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The power button is located on the daughterboard. Signed-off-by: Vicente Bergas Tested-by: Vicente Bergas --- .../dts/rockchip/rk3399-sapphire-excavator.dts | 23 ---------------------- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts index 6027846ffd3e..6ff9d222d839 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts @@ -41,7 +41,6 @@ */ /dts-v1/; -#include #include "rk3399-sapphire.dtsi" / { @@ -95,22 +94,6 @@ }; }; - keys: gpio-keys { - compatible = "gpio-keys"; - autorepeat; - - power { - debounce-interval = <100>; - gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; - label = "GPIO Power"; - linux,code = ; - linux,input-type = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pwr_btn>; - wakeup-source; - }; - }; - rt5651-sound { compatible = "simple-audio-card"; simple-audio-card,name = "realtek,rt5651-codec"; @@ -208,12 +191,6 @@ }; &pinctrl { - buttons { - pwr_btn: pwr-btn { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - sdio-pwrseq { wifi_enable_h: wifi-enable-h { rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 21b05601f04a..6918eb2d1390 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -41,6 +41,7 @@ */ #include "dt-bindings/pwm/pwm.h" +#include "dt-bindings/input/input.h" #include "rk3399.dtsi" #include "rk3399-opp.dtsi" @@ -102,6 +103,22 @@ regulator-max-microvolt = <12000000>; }; + keys: gpio-keys { + compatible = "gpio-keys"; + autorepeat; + + power { + debounce-interval = <100>; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; + label = "GPIO Power"; + linux,code = ; + linux,input-type = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pwr_btn>; + wakeup-source; + }; + }; + /* switched by pmic_sleep */ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { compatible = "regulator-fixed"; @@ -475,6 +492,12 @@ }; &pinctrl { + buttons { + pwr_btn: pwr-btn { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + pmic { pmic_int_l: pmic-int-l { rockchip,pins =