Commit f416c289 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'refs/heads/forward-upstream/next-20191018/gpu-thermal/v2' into...

Merge branch 'refs/heads/forward-upstream/next-20191018/gpu-thermal/v2' into f/next-20191018/devkit-drm-integration/v1-wip-Aev0fe7AhD2j

* refs/heads/forward-upstream/next-20191018/gpu-thermal/v2:
  dt-bindings: etnaviv: Add #cooling-cells
  librem5-devkit_defconfig: Enable imx8 mixel dphy
parents 94305d69 014a28bc
......@@ -21,6 +21,7 @@ Required properties:
Optional properties:
- power-domains: a power domain consumer specifier according to
Documentation/devicetree/bindings/power/power_domain.txt
- #cooling-cells: : If used as a cooling device, must be <2>
example:
......
......@@ -524,6 +524,7 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_MIXEL_MIPI_DPHY=y
CONFIG_POWERCAP=y
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_PHY_MIXEL_MIPI_DPHY=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment