Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / arch / arm / boot / dts / imx6sx.dtsi

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 2863c52..1a473e8 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -159,6 +159,16 @@
                        arm,data-latency = <4 2 3>;
                };
 
+               gpu: gpu@01800000 {
+                       compatible = "vivante,gc";
+                       reg = <0x01800000 0x4000>;
+                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&clks IMX6SX_CLK_GPU>,
+                                <&clks IMX6SX_CLK_GPU>,
+                                <&clks IMX6SX_CLK_GPU>;
+                       clock-names = "bus", "core", "shader";
+               };
+
                dma_apbh: dma-apbh@01804000 {
                        compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
                        reg = <0x01804000 0x2000>;
@@ -438,6 +448,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 5 26>;
                        };
 
                        gpio2: gpio@020a0000 {
@@ -449,6 +460,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 31 20>;
                        };
 
                        gpio3: gpio@020a4000 {
@@ -460,6 +472,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 51 29>;
                        };
 
                        gpio4: gpio@020a8000 {
@@ -471,6 +484,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 80 32>;
                        };
 
                        gpio5: gpio@020ac000 {
@@ -482,6 +496,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 112 24>;
                        };
 
                        gpio6: gpio@020b0000 {
@@ -493,6 +508,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 136 12>, <&iomuxc 12 158 11>;
                        };
 
                        gpio7: gpio@020b4000 {
@@ -504,6 +520,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 148 10>, <&iomuxc 10 169 2>;
                        };
 
                        kpp: kpp@020b8000 {
@@ -1273,4 +1290,9 @@
                        status = "disabled";
                };
        };
+
+       gpu-subsystem {
+               compatible = "fsl,imx-gpu-subsystem";
+               cores = <&gpu>;
+       };
 };