Merge tag 'usb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c5584f40ebfb28c1479216966bc152098a11f5a9..fc966c10cf498bb0a0b791329b089019bd0b15fc 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -328,6 +328,53 @@
                        iommus = <&sysmmu_rotator>;
                };
 
+               mali: gpu@11800000 {
+                       compatible = "samsung,exynos5250-mali", "arm,mali-t604";
+                       reg = <0x11800000 0x5000>;
+                       interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "job", "mmu", "gpu";
+                       clocks = <&clock CLK_G3D>;
+                       clock-names = "core";
+                       operating-points-v2 = <&gpu_opp_table>;
+                       power-domains = <&pd_g3d>;
+                       status = "disabled";
+
+                       gpu_opp_table: gpu-opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-100000000 {
+                                       opp-hz = /bits/ 64 <100000000>;
+                                       opp-microvolt = <925000>;
+                               };
+                               opp-160000000 {
+                                       opp-hz = /bits/ 64 <160000000>;
+                                       opp-microvolt = <925000>;
+                               };
+                               opp-266000000 {
+                                       opp-hz = /bits/ 64 <266000000>;
+                                       opp-microvolt = <1025000>;
+                               };
+                               opp-350000000 {
+                                       opp-hz = /bits/ 64 <350000000>;
+                                       opp-microvolt = <1075000>;
+                               };
+                               opp-400000000 {
+                                       opp-hz = /bits/ 64 <400000000>;
+                                       opp-microvolt = <1125000>;
+                               };
+                               opp-450000000 {
+                                       opp-hz = /bits/ 64 <450000000>;
+                                       opp-microvolt = <1150000>;
+                               };
+                               opp-533000000 {
+                                       opp-hz = /bits/ 64 <533000000>;
+                                       opp-microvolt = <1250000>;
+                               };
+                       };
+               };
+
                tmu: tmu@10060000 {
                        compatible = "samsung,exynos5250-tmu";
                        reg = <0x10060000 0x100>;
@@ -346,6 +393,7 @@
                        clock-names = "sata", "sclk_sata";
                        phys = <&sata_phy>;
                        phy-names = "sata-phy";
+                       ports-implemented = <0x1>;
                        status = "disabled";
                };