diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:24:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:24:52 +1000 |
| commit | b4eac5465b23a9bcb4a66376a5664086b4913288 (patch) | |
| tree | ece5cb45bbb01fab9621678c3fb8c722ed3e34db /drivers/gpu/drm/sun4i/sun4i_backend.h | |
| parent | 1f8ee720cebd2a4988e2627aa0c45465778c3171 (diff) | |
| parent | 0c3ff44cc23cbede56aa1ca5916b126e681ca69b (diff) | |
Merge tag 'sunxi-drm-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next
Allwinner DRM changes for 4.9
This tag adds the support of a new SoC to sun4i-drm (the Allwinner A33),
and the usual few fixes and enhancements
* tag 'sunxi-drm-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
drm/sun4i: add missing header dependencies
drm/sun4i: Add a DRC driver
drm/sun4i: backend: Handle the SAT
drm/sun4i: support A33 tcon
drm/sun4i: support TCONs without channel 1
drm/sun4i: Clear encoder->bridge if a bridge is not found
drm/sun4i: rgb: add missing calls to drm_panel_{prepare,unprepare}
drm/sun4i: Remove redundant dev_err call in sun4i_tcon_init_regmap()
drm/sun4i: Add bridge support
drm/sun4i: Move panel retrieval in RGB connector
drm/sun4i: Store TCON's device structure pointer
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun4i_backend.h')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_backend.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.h b/drivers/gpu/drm/sun4i/sun4i_backend.h index 7070bb3434e5..e00718627748 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.h +++ b/drivers/gpu/drm/sun4i/sun4i_backend.h @@ -146,6 +146,9 @@ struct sun4i_backend { struct clk *bus_clk; struct clk *mod_clk; struct clk *ram_clk; + + struct clk *sat_clk; + struct reset_control *sat_reset; }; void sun4i_backend_apply_color_correction(struct sun4i_backend *backend); |