Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[u-boot] / drivers / video / ivybridge_igd.c

diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 94db3dda4424e2d5c4e0c717b75174b995afa0ca..6b986e935838c785315f5b4ed6ddab87a52f26a3 100644 (file)
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
@@ -18,6 +17,8 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 struct gt_powermeter {
        u16 reg;
        u32 value;
@@ -126,62 +127,6 @@ static const struct gt_powermeter ivb_pm_gt1[] = {
        { 0 }
 };
 
-static const struct gt_powermeter ivb_pm_gt2[] = {
-       { 0xa800, 0x10000000 },
-       { 0xa804, 0x00033800 },
-       { 0xa808, 0x00000902 },
-       { 0xa80c, 0x0c002f00 },
-       { 0xa810, 0x12000400 },
-       { 0xa814, 0x00000000 },
-       { 0xa818, 0x00d20800 },
-       { 0xa81c, 0x00000002 },
-       { 0xa820, 0x03004b02 },
-       { 0xa824, 0x00000600 },
-       { 0xa828, 0x07000773 },
-       { 0xa82c, 0x00000000 },
-       { 0xa830, 0x00010032 },
-       { 0xa834, 0x1520040d },
-       { 0xa838, 0x00020105 },
-       { 0xa83c, 0x00083700 },
-       { 0xa840, 0x0000151d },
-       { 0xa844, 0x00000000 },
-       { 0xa848, 0x20001b00 },
-       { 0xa84c, 0x0a000010 },
-       { 0xa850, 0x00000000 },
-       { 0xa854, 0x00000008 },
-       { 0xa858, 0x00000008 },
-       { 0xa85c, 0x00000000 },
-       { 0xa860, 0x00020000 },
-       { 0xa248, 0x0000221e },
-       { 0xa900, 0x00000000 },
-       { 0xa904, 0x00003500 },
-       { 0xa908, 0x00000000 },
-       { 0xa90c, 0x0c000000 },
-       { 0xa910, 0x12000500 },
-       { 0xa914, 0x00000000 },
-       { 0xa918, 0x00b20000 },
-       { 0xa91c, 0x00000000 },
-       { 0xa920, 0x08004b02 },
-       { 0xa924, 0x00000200 },
-       { 0xa928, 0x07000820 },
-       { 0xa92c, 0x00000000 },
-       { 0xa930, 0x00030000 },
-       { 0xa934, 0x050f020d },
-       { 0xa938, 0x00020300 },
-       { 0xa93c, 0x00903900 },
-       { 0xa940, 0x00000000 },
-       { 0xa944, 0x00000000 },
-       { 0xa948, 0x20001b00 },
-       { 0xa94c, 0x0a000010 },
-       { 0xa950, 0x00000000 },
-       { 0xa954, 0x00000008 },
-       { 0xa960, 0x00110000 },
-       { 0xaa3c, 0x00003900 },
-       { 0xaa54, 0x00000008 },
-       { 0xaa60, 0x00110000 },
-       { 0 }
-};
-
 static const struct gt_powermeter ivb_pm_gt2_17w[] = {
        { 0xa800, 0x20000000 },
        { 0xa804, 0x000e3800 },
@@ -515,7 +460,7 @@ static int gma_pm_init_pre_vbios(void *gtt_bar, int rev)
 static int gma_pm_init_post_vbios(struct udevice *dev, int rev, void *gtt_bar)
 {
        const void *blob = gd->fdt_blob;
-       int node = dev->of_offset;
+       int node = dev_of_offset(dev);
        u32 reg32, cycle_delay;
 
        debug("GT Power Management Init (post VBIOS)\n");
@@ -800,7 +745,7 @@ static int gma_func0_init(struct udevice *dev)
        mtrr_add_request(MTRR_TYPE_WRCOMB, base, 256 << 20);
        mtrr_commit(true);
 
-       gtt_bar = (void *)dm_pci_read_bar32(dev, 0);
+       gtt_bar = (void *)(ulong)dm_pci_read_bar32(dev, 0);
        debug("GT bar %p\n", gtt_bar);
        ret = gma_pm_init_pre_vbios(gtt_bar, rev);
        if (ret)
@@ -822,7 +767,7 @@ static int bd82x6x_video_probe(struct udevice *dev)
                return ret;
 
        /* Post VBIOS init */
-       gtt_bar = (void *)dm_pci_read_bar32(dev, 0);
+       gtt_bar = (void *)(ulong)dm_pci_read_bar32(dev, 0);
        ret = gma_pm_init_post_vbios(dev, rev, gtt_bar);
        if (ret)
                return ret;