diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 08:57:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 09:00:20 +0200 |
commit | b491f8091eec92cd00723082a68b48e38c4f41fa (patch) | |
tree | 1b8b3647470b05ddb0522387c86d844b2579011b /0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | |
parent | 0ebd93898b5f0a0fa9697e1c85ebe60e67ae81cc (diff) | |
parent | d70892345222ea163abe0fdc7cf500be5fd8dfb8 (diff) | |
download | kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.gz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.xz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.zip |
merge 5.9 release
Diffstat (limited to '0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch')
-rw-r--r-- | 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch b/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch deleted file mode 100644 index f212fb501..000000000 --- a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Emmanuel Vadot <manu@freebsd.org> -Date: Wed, 4 Mar 2020 22:30:22 +0100 -Subject: [PATCH] dt-bindings: Add doc for Pine64 Pinebook Pro - -Add a compatible for Pine64 Pinebook Pro - -Signed-off-by: Emmanuel Vadot <manu@freebsd.org> -Reviewed-by: Rob Herring <robh@kernel.org> ---- - 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 715586dea9bb..fff0439c6b78 100644 ---- a/Documentation/devicetree/bindings/arm/rockchip.yaml -+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml -@@ -420,6 +420,11 @@ properties: - - const: pine64,rockpro64 - - const: rockchip,rk3399 - -+ - description: Pine64 PinebookPro -+ items: -+ - const: pine64,pinebook-pro -+ - const: rockchip,rk3399 -+ - - description: Radxa Rock - items: - - const: radxa,rock --- -2.26.2 - |