From patchwork Sat Dec 1 10:08:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Oskari_Lemmel=C3=A4?= X-Patchwork-Id: 10707575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A68AF17F0 for ; Sat, 1 Dec 2018 10:09:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9475D2DADE for ; Sat, 1 Dec 2018 10:09:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 888962DAFE; Sat, 1 Dec 2018 10:09:48 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 309402DADE for ; Sat, 1 Dec 2018 10:09:48 +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=kO7O1dKXWTfWeZwEL6SwMjhQ9otszi4fAtEOYGXobPA=; b=C6DOffmAuyo8qhmZVxwXsEfhEb aqm9LIWxSVnkEID4Gicw8V30I7LTOY9bQJLA+hz5kCSka5LKWV+MyjX0aKzdCOtunALQ6K0AZVkb4 TtN3Ftl8m5WECG0yP1hjK3EjOdAoM0xsWx2aMmd6GkKdCHO7E6gEEliNMq0gK9bIrTVgY+z7jMTXH jCYGcq/CJ7uKwBXELsKBVKs6VlvW9XLARxrL8kTANZT8e68Gv9jwGPOhT/m+wld6a1/wdfgSC8pir sddxMmeGsQvsQRVHAb5XO9GzJgoSm+5FSKFwy4/dROkGWdIx91Vae0CTUDTCYvKK0NAGO+0tysrNX mrXHiflA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT2Da-0004fC-L7; Sat, 01 Dec 2018 10:09:46 +0000 Received: from mail1.kuutio.org ([2001:41d0:401:3100::431a]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT2DB-0004Bt-22; Sat, 01 Dec 2018 10:09:23 +0000 Received: from localhost (localhost [127.0.0.1]) by mail1.kuutio.org (Postfix) with ESMTP id 68A621F99C; Sat, 1 Dec 2018 11:09:06 +0100 (CET) Authentication-Results: mail1.kuutio.org (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=lemmela.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lemmela.net; h= references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received; s=dkim; t=1543658944; x= 1546250945; bh=Zd/AWxIfbWdt/qWvfiCuUYpYVi3/kqdU2pohdc2Cix4=; b=H dwFqe9z7LbbDSVYpvN61g8vY6l8sfAIY1b9NI64Ub/19+FkVmyrSb96pxjWcccJb eYuYVK9H8VopRqBM2vAjp3i3qfiiCGKDzlIcJohBHQ3dD/hfZ3vG7EPaxKGoRODZ iILKhPq+7cNSUqqG4kvTnkvDHJI/uKeBl2Smjp/iWzF9ITSb/2/PNGC0qGzecXFR L6VEr6VomNKzfhMFVvfKLx56Bor1Nv4JefVcAlU+vCVTr3FeKkeyv7Yeh77lKy0p HCUIVEBcFVOu9Eas4l0OH1tbsWN85ADZCTYNLmJyZ1lPDWWMg1zZxue99OZdZ5vg Mx9l+cRh52OpNghDtOFnxSAX+Nr/4ikeRJiNG5X4UjLDFIxtV5CRd7kyJWR3Q/Cv WXxZpYm9ZgFCDp/O/GIQ7zP2LHHEu6Xh51fnn4WnyYqLCehRD7f0/7HxwHUXsCBt +SJ167dgJWLhoGGCfQu3CEaBKOyuuLiU557qDqQestl18ifM5ltc66mg7KUVcJ3A kzFqtDpgTxT4cGz6TUJm7/ROj61lcbgqPnjnLWzFQiHGafxk4vP51F0B77xwVI1w 8X8O1ekjrLEVkzv1h6giAuXgeFzCUj5tpzlmfKIHCm5FVwYKU3tvbAcjZoM75zZ2 rE0M0Zucqdxjjmv8jHaXDCRdosUJJ0AsS4rAMQYiNI= X-Virus-Scanned: amavisd-new at kuutio.org Received: from mail1.kuutio.org ([127.0.0.1]) by localhost (mail1.kuutio.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id HN7-eesPge4d; Sat, 1 Dec 2018 11:09:04 +0100 (CET) Received: from build.kuutio.org (unknown [IPv6:2001:998:13:e4::69]) by mail1.kuutio.org (Postfix) with ESMTPSA id 2F3911F955; Sat, 1 Dec 2018 11:09:04 +0100 (CET) From: Oskari Lemmela To: Rob Herring , Mark Rutland , Heiko Stuebner Subject: [PATCH 1/2] arm64: dts: rockchip: rockpro64 fix regulator gpios Date: Sat, 1 Dec 2018 12:08:16 +0200 Message-Id: <20181201100817.20688-2-oskari@lemmela.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181201100817.20688-1-oskari@lemmela.net> References: <20181201100817.20688-1-oskari@lemmela.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181201_020921_386311_84900BB3 X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Akash Gajjar , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Oskari Lemmela , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Rockpro64 is not able boot if GPIO1_C1 pin is pulled high before loading linux kernel. In rockpro64 GPIO1_C1 pin is connected vdd_cpu_b regulator VSEL pin. Pin should be pulled down in normal operation and pulled high in suspend. PMIC LDO_REG2 is connected to touch panel connector. Rename regulator and set it to correct voltage. PCIe power is controller by GPIO1_D0. Schematics can be downloaded from: http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf Signed-off-by: Oskari Lemmela Acked-by: Akash Gajjar --- .../boot/dts/rockchip/rk3399-rockpro64.dts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts index 1d35f5406b5e..5bd4d69914bd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts @@ -97,7 +97,7 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie_pwr_en>; regulator-name = "vcc3v3_pcie"; @@ -293,12 +293,12 @@ }; }; - vcc2v8_dvp: LDO_REG2 { - regulator-name = "vcc2v8_dvp"; + vcc3v0_touch: LDO_REG2 { + regulator-name = "vcc3v0_touch"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; regulator-state-mem { regulator-off-in-suspend; }; @@ -397,7 +397,9 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; - fcs,suspend-voltage-selector = <0>; + fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel1_gpio>; regulator-name = "vdd_cpu_b"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>; @@ -415,6 +417,8 @@ compatible = "silergy,syr828"; reg = <0x41>; fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel2_gpio>; regulator-name = "vdd_gpu"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>; @@ -519,7 +523,7 @@ pcie { pcie_pwr_en: pcie-pwr-en { - rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -529,7 +533,7 @@ }; vsel1_gpio: vsel1-gpio { - rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; }; vsel2_gpio: vsel2-gpio { From patchwork Sat Dec 1 10:08:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Oskari_Lemmel=C3=A4?= X-Patchwork-Id: 10707569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 81D7D16B1 for ; Sat, 1 Dec 2018 10:09:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 604132DAD8 for ; Sat, 1 Dec 2018 10:09:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51F752DAF2; Sat, 1 Dec 2018 10:09:27 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 684222DAD8 for ; Sat, 1 Dec 2018 10:09:26 +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=RRkg1KG5HszT26Q+BmqOh7RNogrim745gltdLxL+pes=; b=IhyVqGlGjBNTQq5cmBqSuFFRuH Okl8U6pb79igzsy5OmEbZaMHremy5ioFlo6/rcmiGIHSVbYHOEkzUUyEWwIdKyTp5YiMGd2QMy0xC npnJ7aRZSmcQQZTWGHgiz7OV1L7S39vK9LJ9megsF2IN7IMzASPaL1580YLJp63SNSiWgaVAjY/iL HrC+ML2uP0madGUjBPop53ycP3N4AIB4NZ+Luj6QaUzJLXMx3ULhpM/HTE6+DwpRmd0JRt3C+Ij0y 9QqDy1goehGDUjhJx6c/3oiDYVPbH5zCJtiG+/4Oa5fIAe//ckb6imOcJ1f2gl7aDg4LorduX9zCQ Q4U3PpnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT2DC-0004Dl-Cm; Sat, 01 Dec 2018 10:09:22 +0000 Received: from mail1.kuutio.org ([92.222.216.83]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT2D9-0004Bs-QW; Sat, 01 Dec 2018 10:09:21 +0000 Received: from localhost (localhost [127.0.0.1]) by mail1.kuutio.org (Postfix) with ESMTP id 0D8F31F978; Sat, 1 Dec 2018 11:09:06 +0100 (CET) Authentication-Results: mail1.kuutio.org (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=lemmela.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lemmela.net; h= references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received; s=dkim; t=1543658945; x= 1546250946; bh=MzMBlHLkwiO/Fjwv4OAmFkPbUn6e8VQqxVxiqId1keM=; b=r 7DoDvYKXp1GnJysyhAmB34LtkVCKF2PK66Fubxq/fmSxV+EIQwsX2qZoZvJ7TE6r hvYuOothTRbr2qXUFXEQYHtv0mMWoivuqJoXtZOqzAaa5dnDLBfPa+dbLmKEI+XN TGLD+AwTtS7VqY2DH/Z02OCpB41DuBzmmvfOCEQnEFzRpb18PNeit8f3nwv+cJyQ oqnwA/wTQA2j1ugGzXUL43NVZHSIvwfcfBAXoNlOpyUb9vWJ14pkMEd9OcojkhNq aDAQf840O5zEGjXkOEIEBIP1WeyBWEiw+UbO4QVzrKpRDDEleerjjbkuy9pxqzVh 1d0WkpkjEeHyjTYltNW0g4dB0DgGKVMKcV1x6PPdmQDjl3vybaL++yOHDQg7HYdN mojHaupm+NsYrewiNWtRYVyZ47oFy7MXGcXZDyy5KNpmZqq2TcieIePax7A/aQYg yBibI1tT/LzJKc5GNBle3K59LscJZ1+qZ3kCi3R+j7Bw6cJiBfsmet1mD2QXznaa UbkI6A2VQY4a4Yx9S+4FC24n4zgxkb5k8fZWVuGM95otNcmd0B1tfYxL2AXhzOGn gG3zy1UkZrhSuZXr1aqAg9db35m3uv5IMvqMvrt2H+9/4jfWvaJzEkzxPN8urdcV R1CyMjjfrp4Q8rU3KaMJEVV2wmT5fjx32TPS5Krw04= X-Virus-Scanned: amavisd-new at kuutio.org Received: from mail1.kuutio.org ([127.0.0.1]) by localhost (mail1.kuutio.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 6Uhxi4Dz5h0S; Sat, 1 Dec 2018 11:09:05 +0100 (CET) Received: from build.kuutio.org (unknown [IPv6:2001:998:13:e4::69]) by mail1.kuutio.org (Postfix) with ESMTPSA id 988B41F99C; Sat, 1 Dec 2018 11:09:04 +0100 (CET) From: Oskari Lemmela To: Rob Herring , Mark Rutland , Heiko Stuebner Subject: [PATCH 2/2] arm64: dts: rockchip: rockpro64 fix video output chain Date: Sat, 1 Dec 2018 12:08:17 +0200 Message-Id: <20181201100817.20688-3-oskari@lemmela.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181201100817.20688-1-oskari@lemmela.net> References: <20181201100817.20688-1-oskari@lemmela.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181201_020920_025687_A77E9DAD X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Akash Gajjar , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Oskari Lemmela , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Rockpro64 is not able boot if kernel is compiled with CONFIG_DRM_ROCKCHIP=m Enable Rockpro64 board HDMI output to fix issue. Signed-off-by: Oskari Lemmela --- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts index 5bd4d69914bd..be78172abc09 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts @@ -205,6 +205,13 @@ status = "okay"; }; +&hdmi { + ddc-i2c-bus = <&i2c3>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_cec>; + status = "okay"; +}; + &i2c0 { clock-frequency = <400000>; i2c-scl-rising-time-ns = <168>;