[src-draft/trunk]: src/sys/arch/arm/dts Consolidate rk3399 crypto binding int...

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/916454be3a53
branches:  trunk
changeset: 932918:916454be3a53
user:      Taylor R Campbell <riastradh%NetBSD.org@localhost>
date:      Sun May 17 19:15:11 2020 +0000

description:
Consolidate rk3399 crypto binding into rk3399-crypto.dtsi.

There doesn't seem to be a better place to put it at the moment, among
this twisty maze of inclusions, all different.

diffstat:

 sys/arch/arm/dts/rk3399-crypto.dtsi      |  41 ++++++++++++++++++++++++++++++++
 sys/arch/arm/dts/rk3399-pinebook-pro.dts |  14 +----------
 sys/arch/arm/dts/rk3399-rockpro64.dts    |  14 +----------
 3 files changed, 43 insertions(+), 26 deletions(-)

diffs (107 lines):

diff -r ec8f07745c2e -r 916454be3a53 sys/arch/arm/dts/rk3399-crypto.dtsi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/dts/rk3399-crypto.dtsi       Sun May 17 19:15:11 2020 +0000
@@ -0,0 +1,41 @@
+/*     $NetBSD$        */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/ {
+       crypto: crypto@ff8b8000 {
+               compatible = "rockchip,rk3288-crypto";
+               reg = <0x0 0xff8b8000 0x0 0x1000>;
+               clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>,
+                        <&cru SCLK_CRYPTO1>, <&cru ACLK_DMAC1_PERILP>;
+               clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+               assigned-clocks = <&cru SCLK_CRYPTO1>, <&cru HCLK_S_CRYPTO1>;
+               assigned-clock-rates = <150000000>, <100000000>;
+               resets = <&cru SRST_CRYPTO1>;
+               reset-names = "crypto-rst";
+       };
+};
diff -r ec8f07745c2e -r 916454be3a53 sys/arch/arm/dts/rk3399-pinebook-pro.dts
--- a/sys/arch/arm/dts/rk3399-pinebook-pro.dts  Sun May 17 18:18:24 2020 +0000
+++ b/sys/arch/arm/dts/rk3399-pinebook-pro.dts  Sun May 17 19:15:11 2020 +0000
@@ -12,6 +12,7 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
+#include "rk3399-crypto.dtsi"
 
 / {
        model = "Pine64 Pinebook Pro";
@@ -344,19 +345,6 @@
                compatible = "universal-charger";
                extcon = <&fusb0>;
        };
-
-       // XXX Sync with rk3399-rockpro64.dts.
-       crypto: crypto@ff8b8000 {
-               compatible = "rockchip,rk3288-crypto";
-               reg = <0x0 0xff8b8000 0x0 0x1000>;
-               clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>,
-                        <&cru SCLK_CRYPTO1>, <&cru ACLK_DMAC1_PERILP>;
-               clock-names = "aclk", "hclk", "sclk", "apb_pclk";
-               assigned-clocks = <&cru SCLK_CRYPTO1>, <&cru HCLK_S_CRYPTO1>;
-               assigned-clock-rates = <150000000>, <100000000>;
-               resets = <&cru SRST_CRYPTO1>;
-               reset-names = "crypto-rst";
-       };
 };
 
 &edp {
diff -r ec8f07745c2e -r 916454be3a53 sys/arch/arm/dts/rk3399-rockpro64.dts
--- a/sys/arch/arm/dts/rk3399-rockpro64.dts     Sun May 17 18:18:24 2020 +0000
+++ b/sys/arch/arm/dts/rk3399-rockpro64.dts     Sun May 17 19:15:11 2020 +0000
@@ -27,6 +27,7 @@
  */
 
 #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts"
+#include "rk3399-crypto.dtsi"
 
 / {
        pwm-fan {
@@ -147,19 +148,6 @@
                status = "okay";
        };
 #endif
-
-       // XXX Sync with rk3399-pinebook-pro.dts.
-       crypto: crypto@ff8b8000 {
-               compatible = "rockchip,rk3288-crypto";
-               reg = <0x0 0xff8b8000 0x0 0x1000>;
-               clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>,
-                        <&cru SCLK_CRYPTO1>, <&cru ACLK_DMAC1_PERILP>;
-               clock-names = "aclk", "hclk", "sclk", "apb_pclk";
-               assigned-clocks = <&cru SCLK_CRYPTO1>, <&cru HCLK_S_CRYPTO1>;
-               assigned-clock-rates = <150000000>, <100000000>;
-               resets = <&cru SRST_CRYPTO1>;
-               reset-names = "crypto-rst";
-       };
 };
 
 &pinctrl {