Merge tag 'docs-5.11-2' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ls1021a.dtsi

diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 827373e..007dd2b 100644 (file)
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -173,7 +173,7 @@
 
                dcfg: dcfg@1ee0000 {
                        compatible = "fsl,ls1021a-dcfg", "syscon";
-                       reg = <0x0 0x1ee0000 0x0 0x10000>;
+                       reg = <0x0 0x1ee0000 0x0 0x1000>;
                        big-endian;
                };
 
@@ -288,46 +288,43 @@
                        compatible = "fsl,qoriq-tmu";
                        reg = <0x0 0x1f00000 0x0 0x10000>;
                        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
-                       fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x30061>;
-                       fsl,tmu-calibration = <0x00000000 0x0000000f
-                                              0x00000001 0x00000017
-                                              0x00000002 0x0000001e
-                                              0x00000003 0x00000026
-                                              0x00000004 0x0000002e
-                                              0x00000005 0x00000035
-                                              0x00000006 0x0000003d
-                                              0x00000007 0x00000044
-                                              0x00000008 0x0000004c
-                                              0x00000009 0x00000053
-                                              0x0000000a 0x0000005b
-                                              0x0000000b 0x00000064
-
-                                              0x00010000 0x00000011
-                                              0x00010001 0x0000001c
-                                              0x00010002 0x00000024
-                                              0x00010003 0x0000002b
-                                              0x00010004 0x00000034
-                                              0x00010005 0x00000039
-                                              0x00010006 0x00000042
-                                              0x00010007 0x0000004c
-                                              0x00010008 0x00000051
-                                              0x00010009 0x0000005a
-                                              0x0001000a 0x00000063
-
-                                              0x00020000 0x00000013
-                                              0x00020001 0x00000019
-                                              0x00020002 0x00000024
-                                              0x00020003 0x0000002c
-                                              0x00020004 0x00000035
-                                              0x00020005 0x0000003d
-                                              0x00020006 0x00000046
-                                              0x00020007 0x00000050
-                                              0x00020008 0x00000059
-
-                                              0x00030000 0x00000002
-                                              0x00030001 0x0000000d
-                                              0x00030002 0x00000019
-                                              0x00030003 0x00000024>;
+                       fsl,tmu-range = <0xb0000 0x9002c 0x6004e 0x30066>;
+                       fsl,tmu-calibration = <0x00000000 0x00000020
+                                              0x00000001 0x00000024
+                                              0x00000002 0x0000002a
+                                              0x00000003 0x00000032
+                                              0x00000004 0x00000038
+                                              0x00000005 0x0000003e
+                                              0x00000006 0x00000043
+                                              0x00000007 0x0000004a
+                                              0x00000008 0x00000050
+                                              0x00000009 0x00000059
+                                              0x0000000a 0x0000005f
+                                              0x0000000b 0x00000066
+
+                                              0x00010000 0x00000023
+                                              0x00010001 0x0000002b
+                                              0x00010002 0x00000033
+                                              0x00010003 0x0000003a
+                                              0x00010004 0x00000042
+                                              0x00010005 0x0000004a
+                                              0x00010006 0x00000054
+                                              0x00010007 0x0000005c
+                                              0x00010008 0x00000065
+                                              0x00010009 0x0000006f
+
+                                              0x00020000 0x00000029
+                                              0x00020001 0x00000033
+                                              0x00020002 0x0000003d
+                                              0x00020003 0x00000048
+                                              0x00020004 0x00000054
+                                              0x00020005 0x00000060
+                                              0x00020006 0x0000006c
+
+                                              0x00030000 0x00000025
+                                              0x00030001 0x00000033
+                                              0x00030002 0x00000043
+                                              0x00030003 0x00000055>;
                        #thermal-sensor-cells = <1>;
                };
 
@@ -1013,7 +1010,7 @@
                        compatible = "fsl,ls1021a-ftm-alarm";
                        reg = <0x0 0x29d0000 0x0 0x10000>;
                        reg-names = "ftm";
-                       fsl,rcpm-wakeup = <&rcpm 0x20000 0x0>;
+                       fsl,rcpm-wakeup = <&rcpm 0x0 0x20000000>;
                        interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
                        big-endian;
                };