Merge tag 'scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sunxi-h3-h5.dtsi

diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 8d40c00d64bb39a893d2f74c3d859ea42db59589..7a83b15225c7ce4d1d181cdc9d7671e5479b1dc7 100644 (file)
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -40,9 +40,11 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <dt-bindings/clock/sun8i-de2.h>
 #include <dt-bindings/clock/sun8i-h3-ccu.h>
 #include <dt-bindings/clock/sun8i-r-ccu.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/sun8i-de2.h>
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
 #include <dt-bindings/reset/sun8i-r-ccu.h>
 
@@ -51,6 +53,30 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       chosen {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               framebuffer-hdmi {
+                       compatible = "allwinner,simple-framebuffer",
+                                    "simple-framebuffer";
+                       allwinner,pipeline = "mixer0-lcd0-hdmi";
+                       clocks = <&display_clocks CLK_MIXER0>,
+                                <&ccu CLK_TCON0>, <&ccu CLK_HDMI>;
+                       status = "disabled";
+               };
+
+               framebuffer-tve {
+                       compatible = "allwinner,simple-framebuffer",
+                                    "simple-framebuffer";
+                       allwinner,pipeline = "mixer1-lcd1-tve";
+                       clocks = <&display_clocks CLK_MIXER1>,
+                                <&ccu CLK_TVE>;
+                       status = "disabled";
+               };
+       };
+
        clocks {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -85,6 +111,18 @@
                #size-cells = <1>;
                ranges;
 
+               display_clocks: clock@1000000 {
+                       /* compatible is in per SoC .dtsi file */
+                       reg = <0x01000000 0x100000>;
+                       clocks = <&ccu CLK_DE>,
+                                <&ccu CLK_BUS_DE>;
+                       clock-names = "mod",
+                                     "bus";
+                       resets = <&ccu RST_BUS_DE>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+               };
+
                syscon: syscon@1c00000 {
                        compatible = "allwinner,sun8i-h3-system-controller",
                                "syscon";