From e36b70bfaacea3836fcbd9a762a10009171b4736 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 5 Mar 2020 13:12:55 +0000 Subject: Update Pinebook Pro DT patch to v4 --- Add-support-for-the-pine64-Pinebook-Pro.patch | 210 +++++++++++++------------- kernel.spec | 2 +- 2 files changed, 103 insertions(+), 109 deletions(-) diff --git a/Add-support-for-the-pine64-Pinebook-Pro.patch b/Add-support-for-the-pine64-Pinebook-Pro.patch index 0b11d8bc1..e612a90d4 100644 --- a/Add-support-for-the-pine64-Pinebook-Pro.patch +++ b/Add-support-for-the-pine64-Pinebook-Pro.patch @@ -1,27 +1,27 @@ -From patchwork Sat Feb 29 14:48:16 2020 +From patchwork Wed Mar 4 21:30:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Schramm -X-Patchwork-Id: 11413869 +X-Patchwork-Id: 11420805 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EF2492A + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82C16139A for ; - Sat, 29 Feb 2020 14:49:45 +0000 (UTC) + Wed, 4 Mar 2020 21:31:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 77180246B6 + by mail.kernel.org (Postfix) with ESMTPS id 6132920828 for ; - Sat, 29 Feb 2020 14:49:45 +0000 (UTC) + Wed, 4 Mar 2020 21:31:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="RHsOi5hi" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77180246B6 + header.i=@lists.infradead.org header.b="HKFX/pPT" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6132920828 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=manjaro.org Authentication-Results: mail.kernel.org; @@ -30,41 +30,39 @@ Authentication-Results: mail.kernel.org; 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:Cc:List-Subscribe:List-Help:List-Post: - List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=h/bjgfr91fZ1KZuzWySbDMgfYlU9zrxcpzCo6rLIKjo=; b=RHsOi5hiJBlboe - 7ru5614nnG35xhPZXrji4oqJJQprDe4ZKdxlD+1WaPtfloPwy9qyrCe+omFdiwajjHHvXqOgYlAXh - CSfc6swRfl/U4pVnZ/lUkfVOjMxjOLbhwWtsJTgpVWzrx54MZV3h+GCRhGuyL2ExXv3nTtsWlb+VC - 5bDLE8YkSZKs89+uuj8Tp9TnIaGRXq0A+gFRFM4AhyrArlH/jBCPCcpjqR0Nlk9lKCxJdAwQFimQh - Zm+Ge5Y7MobQdbO97Ajfo50dMMPczxqDZMaTQjYrZCUX1irgZjN6sTqK2gMJXbujfaWB9gYGlBPFU - euENlsPFZV3/E3I9tJtw==; + List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: + List-Owner; bh=w5RNMezlBKSJB0tCSEk4sJPOWhOWYWdtbkVGYQNDXFI=; b=HKFX/pPTL0fcDF + R9qC74ZcvmWsNe9+XRGoe/CFa6E5wpufnBwGVBlWAMf6TP3NxrI2eK9XCD6TAmQW18/85HychEgId + qGCU/seUa+UV6WOVWgQ5g3Ea+6kBaMM4cYYgsYaK3h3VlUQQtM3SvPArRNF1VYcj1uZiwX1ek7PO6 + B8Btks26iWloBhYYW62B5FA9wYcw0+Bcg2DE9NyPZ1i63GA6P8esgYpDnGLkmWehpZDYy8tJK00rE + ABbvK0xNgIIKCbbomExLAdMHg8PO14V/BNR1Bf9QBVZpnxt8xfr7GG33Znp7N1Nf19YJecmdUw5e2 + FnFUvjvPmLh4pIdxyp6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1j83R2-00067V-NF; Sat, 29 Feb 2020 14:49:44 +0000 + id 1j9bbh-0003te-QG; Wed, 04 Mar 2020 21:31:09 +0000 Received: from mail.manjaro.org ([176.9.38.148]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1j83Qp-0005ww-Mw; Sat, 29 Feb 2020 14:49:33 +0000 + id 1j9bbe-0003tI-SU; Wed, 04 Mar 2020 21:31:08 +0000 Received: from localhost (localhost [127.0.0.1]) - by mail.manjaro.org (Postfix) with ESMTP id 581173C40D8B; - Sat, 29 Feb 2020 15:49:30 +0100 (CET) + by mail.manjaro.org (Postfix) with ESMTP id 9C0823701125; + Wed, 4 Mar 2020 22:31:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at manjaro.org Received: from mail.manjaro.org ([127.0.0.1]) by localhost (manjaro.org [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id LUE0dUV5ZXet; Sat, 29 Feb 2020 15:49:28 +0100 (CET) + with ESMTP id fkagLefmcj9V; Wed, 4 Mar 2020 22:31:03 +0100 (CET) From: Tobias Schramm To: Rob Herring , Mark Rutland , Heiko Stuebner , Andy Yan , Johan Jonker -Subject: [PATCH v3 1/2] dt-bindings: Add doc for pine64 Pinebook Pro -Date: Sat, 29 Feb 2020 15:48:16 +0100 -Message-Id: <20200229144817.355678-2-t.schramm@manjaro.org> -In-Reply-To: <20200229144817.355678-1-t.schramm@manjaro.org> -References: <20200229144817.355678-1-t.schramm@manjaro.org> +Subject: [PATCH v4 1/2] dt-bindings: Add doc for Pine64 Pinebook Pro +Date: Wed, 4 Mar 2020 22:30:22 +0100 +Message-Id: <20200304213023.689983-2-t.schramm@manjaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20200229_064931_972132_5A8F359D -X-CRM114-Status: UNSURE ( 7.40 ) +X-CRM114-CacheID: sfid-20200304_133107_065063_D9B62F20 +X-CRM114-Status: UNSURE ( 6.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: @@ -74,8 +72,8 @@ X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [176.9.38.148 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -90,7 +88,8 @@ List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, - Alexis Ballier , Tobias Schramm , + Emmanuel Vadot , Alexis Ballier , + Tobias Schramm , Rob Herring , Katsuhiro Suzuki , linux-kernel@vger.kernel.org, Douglas Anderson , Kever Yang , @@ -102,54 +101,57 @@ Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -This commit adds a compatible for the Pinebook Pro. +From: Emmanuel Vadot -Signed-off-by: Tobias Schramm +Add a compatible for Pine64 Pinebook Pro + +Signed-off-by: Emmanuel Vadot +Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml -index 874b0eaa2a75..482a0cbfb18a 100644 +index 874b0eaa2a75..17f0ab0b8832 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml -@@ -402,6 +402,11 @@ properties: - - const: phytec,rk3288-phycore-som - - const: rockchip,rk3288 +@@ -415,6 +415,11 @@ properties: + - const: pine64,rockpro64 + - const: rockchip,rk3399 -+ - description: Pine64 Pinebook Pro ++ - description: Pine64 PinebookPro + items: + - const: pine64,pinebook-pro + - const: rockchip,rk3399 + - - description: Pine64 Rock64 + - description: Radxa Rock items: - - const: pine64,rock64 + - const: radxa,rock -From patchwork Sat Feb 29 14:48:17 2020 +From patchwork Wed Mar 4 21:30:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Schramm -X-Patchwork-Id: 11413875 +X-Patchwork-Id: 11420809 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8087592A + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F1D201395 for ; - Sat, 29 Feb 2020 14:50:09 +0000 (UTC) + Wed, 4 Mar 2020 21:31:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 442A12469C + by mail.kernel.org (Postfix) with ESMTPS id C71432084E for ; - Sat, 29 Feb 2020 14:50:09 +0000 (UTC) + Wed, 4 Mar 2020 21:31:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="FlyBUQCX" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 442A12469C + header.i=@lists.infradead.org header.b="aaCRZACh" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C71432084E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=manjaro.org Authentication-Results: mail.kernel.org; @@ -161,39 +163,39 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=mDLDmKMxYTjLx5H/b22LNHT76K+B14bbv7jWdIjIykg=; b=FlyBUQCXysktd8 - ET9+7KGBQLutUm6LEwJiI9hZoZmM014frNwK6UAv08zPTFTMuBrITLVO4ienTLwEZUHmtpo4t5uUi - OGPeWMPGZhFfkU2h3V4Kze+co3lxtBq3brL/O+8fnwX7GI75Jw8wUhzopbPjq9XJsNhrMOB74OGy3 - qoimmR8pubT3ag0ngt35GX5DIlWNxzfDTz6x8h1JsRov4pD8rfJgQsnEbt3chjz8C8EazS3sdcuEF - Ggo7qM7oAVhzc9AUdmtFx5xL+5VDUgTcdMlqyA7qIODAEayc2mNtXuUSK9dvhmdZ2z2QFi8kvZVTN - jaRIzBTusM70Wql4uTLQ==; + List-Owner; bh=T4TZmXOPB1yBA/Cy6SktfxnDKyf4qoHPOaLfabPHwCI=; b=aaCRZAChIzBlJw + Ccci1IXygLymnzWTblUo/AuYY6tojwziDu90m20Ec1bJbXl27yBAYEeR3CEj4ELNSOiGKzqSpqE+k + rb7uRA7jjVfvj/gJJ2IFxGtd1CKBI6e0S+1qyN/l8ET6UykVavViDDtrsFHt7iD3X2+Bgbs9R8VLi + hB6gZwnuOsWb8JqpNLfrOPiCrkqTega/z2olbgct2T/Mb/85eH/l+SvyINCfyQCQyuOk9d2blYcA9 + 1i4TJi3MpRw7Pa68BnGPO7zK/ttk4SRxKYPi3On226GN5bGg9jNgSEpALbI+CK0wrYS0mIxGg0q7k + Gy09LxFJP7I1IxV6BR2w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1j83RP-0006jj-B8; Sat, 29 Feb 2020 14:50:07 +0000 + id 1j9bbv-00047c-LS; Wed, 04 Mar 2020 21:31:23 +0000 Received: from mail.manjaro.org ([176.9.38.148]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1j83R2-00066x-Bh; Sat, 29 Feb 2020 14:49:47 +0000 + id 1j9bbk-0003vp-EA; Wed, 04 Mar 2020 21:31:15 +0000 Received: from localhost (localhost [127.0.0.1]) - by mail.manjaro.org (Postfix) with ESMTP id 4B9FD3C40D8B; - Sat, 29 Feb 2020 15:49:42 +0100 (CET) + by mail.manjaro.org (Postfix) with ESMTP id 26030370112C; + Wed, 4 Mar 2020 22:31:11 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at manjaro.org Received: from mail.manjaro.org ([127.0.0.1]) by localhost (manjaro.org [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id hzqNYgsWfm-j; Sat, 29 Feb 2020 15:49:39 +0100 (CET) + with ESMTP id OKG7wH7ZOt7o; Wed, 4 Mar 2020 22:31:07 +0100 (CET) From: Tobias Schramm To: Rob Herring , Mark Rutland , Heiko Stuebner , Andy Yan , Johan Jonker -Subject: [PATCH v3 2/2] arm64: dts: rockchip: Add initial support for Pinebook +Subject: [PATCH v4 2/2] arm64: dts: rockchip: Add initial support for Pinebook Pro -Date: Sat, 29 Feb 2020 15:48:17 +0100 -Message-Id: <20200229144817.355678-3-t.schramm@manjaro.org> -In-Reply-To: <20200229144817.355678-1-t.schramm@manjaro.org> -References: <20200229144817.355678-1-t.schramm@manjaro.org> +Date: Wed, 4 Mar 2020 22:30:23 +0100 +Message-Id: <20200304213023.689983-3-t.schramm@manjaro.org> +In-Reply-To: <20200304213023.689983-2-t.schramm@manjaro.org> +References: <20200304213023.689983-2-t.schramm@manjaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20200229_064944_758882_2960AFAB -X-CRM114-Status: GOOD ( 13.83 ) +X-CRM114-CacheID: sfid-20200304_133112_802914_89F85872 +X-CRM114-Status: GOOD ( 13.85 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) @@ -202,8 +204,8 @@ X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [176.9.38.148 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -218,7 +220,8 @@ List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, - Alexis Ballier , Tobias Schramm , + Emmanuel Vadot , Alexis Ballier , + Tobias Schramm , Katsuhiro Suzuki , linux-kernel@vger.kernel.org, Douglas Anderson , Kever Yang , @@ -235,8 +238,8 @@ This commit adds initial dt support for the rk3399 based Pinebook Pro. Signed-off-by: Tobias Schramm --- arch/arm64/boot/dts/rockchip/Makefile | 1 + - .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1105 +++++++++++++++++ - 2 files changed, 1106 insertions(+) + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1096 +++++++++++++++++ + 2 files changed, 1097 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile @@ -253,10 +256,10 @@ index 60d9437096c7..ae7621309e92 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts new file mode 100644 -index 000000000000..dfade7e00051 +index 000000000000..8f77ee4f256c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -@@ -0,0 +1,1105 @@ +@@ -0,0 +1,1096 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. @@ -299,7 +302,12 @@ index 000000000000..dfade7e00051 + #address-cells = <1>; + #size-cells = <0>; + port@0 { ++ reg = <0>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ + panel_in_edp: endpoint@0 { ++ reg = <0>; + remote-endpoint = <&edp_out_panel>; + }; + }; @@ -630,6 +638,14 @@ index 000000000000..dfade7e00051 + status = "okay"; +}; + ++&cpu_b0 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ ++&cpu_b1 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ +&cpu_l0 { + cpu-supply = <&vdd_cpu_l>; +}; @@ -646,14 +662,6 @@ index 000000000000..dfade7e00051 + cpu-supply = <&vdd_cpu_l>; +}; + -+&cpu_b0 { -+ cpu-supply = <&vdd_cpu_b>; -+}; -+ -+&cpu_b1 { -+ cpu-supply = <&vdd_cpu_b>; -+}; -+ +&edp { + force-hpd; + pinctrl-names = "default"; @@ -689,8 +697,8 @@ index 000000000000..dfade7e00051 + +&i2c0 { + clock-frequency = <400000>; -+ i2c-scl-rising-time-ns = <168>; + i2c-scl-falling-time-ns = <4>; ++ i2c-scl-rising-time-ns = <168>; + status = "okay"; + + rk808: pmic@1b { @@ -949,11 +957,11 @@ index 000000000000..dfade7e00051 + fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&fusb0_int_gpio>; -+ status = "okay"; + vbus-supply = <&vbus_typec>; + + connector { + compatible = "usb-c-connector"; ++ data-role = "host"; + label = "USB-C"; + op-sink-microwatt = <1000000>; + power-role = "dual"; @@ -968,6 +976,8 @@ index 000000000000..dfade7e00051 + #size-cells = <0>; + + port@0 { ++ reg = <0>; ++ + usbc_hs: endpoint { + remote-endpoint = + <&u2phy0_typec_hs>; @@ -975,6 +985,8 @@ index 000000000000..dfade7e00051 + }; + + port@1 { ++ reg = <1>; ++ + usbc_ss: endpoint { + remote-endpoint = + <&tcphy0_typec_ss>; @@ -982,6 +994,8 @@ index 000000000000..dfade7e00051 + }; + + port@2 { ++ reg = <2>; ++ + usbc_dp: endpoint { + remote-endpoint = + <&tcphy0_typec_dp>; @@ -996,8 +1010,8 @@ index 000000000000..dfade7e00051 + #sound-dai-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>; -+ rockchip,playback-channels = <8>; + rockchip,capture-channels = <8>; ++ rockchip,playback-channels = <8>; + status = "okay"; +}; + @@ -1030,6 +1044,7 @@ index 000000000000..dfade7e00051 + pwrbtn_gpio: pwrbtn-gpio { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; ++ + lidbtn_gpio: lidbtn-gpio { + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; + }; @@ -1130,6 +1145,7 @@ index 000000000000..dfade7e00051 + bt_wake_gpio: bt-wake-gpio { + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; + }; ++ + bt_host_wake_gpio: bt-host-wake-gpio { + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; @@ -1196,31 +1212,9 @@ index 000000000000..dfade7e00051 + + spiflash: flash@0 { + compatible = "jedec,spi-nor"; -+ m25p,fast-read; + reg = <0>; ++ m25p,fast-read; + spi-max-frequency = <10000000>; -+ status = "okay"; -+ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ loader@8000 { -+ label = "loader"; -+ reg = <0x0 0x3F8000>; -+ }; -+ -+ env@3f8000 { -+ label = "env"; -+ reg = <0x3F8000 0x8000>; -+ }; -+ -+ vendor@7c0000 { -+ label = "vendor"; -+ reg = <0x7C0000 0x40000>; -+ }; -+ }; + }; +}; + diff --git a/kernel.spec b/kernel.spec index 168a12fc8..74a88ca94 100644 --- a/kernel.spec +++ b/kernel.spec @@ -856,7 +856,7 @@ Patch342: Add-LCD-support-for-Pine64-Pinebook-1080p.patch Patch343: arm64-pine64-pinetab.patch # https://www.spinics.net/lists/arm-kernel/msg789135.html Patch344: arm64-pine64-pinephone.patch -# v2 https://patchwork.kernel.org/cover/11413255/ +# v4 https://patchwork.kernel.org/cover/11420797/ Patch345: Add-support-for-the-pine64-Pinebook-Pro.patch # 400 - IBM (ppc/s390x) patches -- cgit