diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 21:13:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 21:13:15 +0200 |
| commit | 022ff62c3d8c3758d15ccc6b58615fd8f257ba85 (patch) | |
| tree | 97ec89d86810c0188df1bd584467cc1c516c8624 /drivers/gpu/drm/msm/msm_gpu.h | |
| parent | Merge tag 'drm-next-2018-08-17' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | Merge tag 'drm-msm-next-2018-08-10' of git://people.freedesktop.org/~robclark... (diff) | |
| download | linux-022ff62c3d8c3758d15ccc6b58615fd8f257ba85.tar.xz linux-022ff62c3d8c3758d15ccc6b58615fd8f257ba85.zip | |
Merge tag 'drm-next-2018-08-17-1' of git://anongit.freedesktop.org/drm/drm
Pull drm msm support for adreno a6xx from Dave Airlie:
"This is the support for new Qualcomm Snapdragon SoCs with the A6xx
core. Userspace support is in mesa now"
* tag 'drm-next-2018-08-17-1' of git://anongit.freedesktop.org/drm/drm:
drm/msm: a6xx: fix spelling mistake: "initalization" -> "initialization"
drm/msm: Add A6XX device support
drm/msm: update generated headers
drm/msm/adreno: Load the firmware before bringing up the hardware
drm/msm: Add a helper function to parse clock names
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 1c6105bc55c7..9122ee6e55e4 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -112,7 +112,7 @@ struct msm_gpu { /* Power Control: */ struct regulator *gpu_reg, *gpu_cx; - struct clk **grp_clks; + struct clk_bulk_data *grp_clks; int nr_clocks; struct clk *ebi1_clk, *core_clk, *rbbmtimer_clk; uint32_t fast_rate; |