Merge tag 'sound-fix-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 35d4298da83dd70d4104100840e732c3f37c3350..732b61a0e9904816b21661eac65e4726738ab1e3 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -55,8 +55,6 @@
                        clock-latency = <300000>; /* From omap-cpufreq driver */
 
                        /* cooling options */
-                       cooling-min-level = <0>;
-                       cooling-max-level = <2>;
                        #cooling-cells = <2>; /* min followed by max */
                };
                cpu@1 {
@@ -289,6 +287,28 @@
                                pinctrl-single,register-width = <16>;
                                pinctrl-single,function-mask = <0x7fff>;
                        };
+
+                       omap5_scm_wkup_pad_conf: omap5_scm_wkup_pad_conf@cda0 {
+                               compatible = "ti,omap5-scm-wkup-pad-conf",
+                                            "simple-bus";
+                               reg = <0xcda0 0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0 0xcda0 0x60>;
+
+                               scm_wkup_pad_conf: scm_conf@0 {
+                                       compatible = "syscon", "simple-bus";
+                                       reg = <0x0 0x60>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       ranges = <0 0x0 0x60>;
+
+                                       scm_wkup_pad_conf_clocks: clocks@0 {
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
+                                       };
+                               };
+                       };
                };
 
                ocmcram: ocmcram@40300000 {