Commit 966903a98fd80ae5f5c4a7ca121d36ea0ba23143
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'samsung-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/…
…kgene/linux-samsung into fixes Merge "Samsung fixes for v3.19" from Kukjin Kim: Samsung fixes for v3.19 - exynos_defconfig: enable LM90 driver and display panel support - HWMON - SENSORS_LM90 - Direct Rendering Manager (DRM) - DRM bridge registration and lookup framework - Parade ps8622/ps8625 eDP/LVDS bridge - NXP ptn3460 eDP/LVDS bridge - Exynos Fully Interactive Mobile Display controller (FIMD) - Panel registration and lookup framework - Simple panels - Backlight & LCD device support - use pmu_system_controller phandle for dp phy : DP PHY requires pmu_system_controller to handle PMU reg. now * tag 'samsung-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: exynos_defconfig: Enable LM90 driver ARM: exynos_defconfig: Enable options for display panel support arm: dts: Use pmu_system_controller phandle for dp phy Signed-off-by: Olof Johansson <olof@lixom.net>
Showing 3 changed files Side-by-side Diff
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
| ... | ... | @@ -503,8 +503,8 @@ |
| 503 | 503 | }; |
| 504 | 504 | |
| 505 | 505 | dp_phy: video-phy@10040728 { |
| 506 | - compatible = "samsung,exynos5250-dp-video-phy"; | |
| 507 | - reg = <0x10040728 4>; | |
| 506 | + compatible = "samsung,exynos5420-dp-video-phy"; | |
| 507 | + samsung,pmu-syscon = <&pmu_system_controller>; | |
| 508 | 508 | #phy-cells = <0>; |
| 509 | 509 | }; |
| 510 | 510 |
arch/arm/configs/exynos_defconfig
| ... | ... | @@ -84,7 +84,8 @@ |
| 84 | 84 | CONFIG_POWER_SUPPLY=y |
| 85 | 85 | CONFIG_BATTERY_SBS=y |
| 86 | 86 | CONFIG_CHARGER_TPS65090=y |
| 87 | -# CONFIG_HWMON is not set | |
| 87 | +CONFIG_HWMON=y | |
| 88 | +CONFIG_SENSORS_LM90=y | |
| 88 | 89 | CONFIG_THERMAL=y |
| 89 | 90 | CONFIG_EXYNOS_THERMAL=y |
| 90 | 91 | CONFIG_EXYNOS_THERMAL_CORE=y |
| 91 | 92 | |
| ... | ... | @@ -109,11 +110,26 @@ |
| 109 | 110 | CONFIG_REGULATOR_S2MPS11=y |
| 110 | 111 | CONFIG_REGULATOR_S5M8767=y |
| 111 | 112 | CONFIG_REGULATOR_TPS65090=y |
| 113 | +CONFIG_DRM=y | |
| 114 | +CONFIG_DRM_BRIDGE=y | |
| 115 | +CONFIG_DRM_PTN3460=y | |
| 116 | +CONFIG_DRM_PS8622=y | |
| 117 | +CONFIG_DRM_EXYNOS=y | |
| 118 | +CONFIG_DRM_EXYNOS_FIMD=y | |
| 119 | +CONFIG_DRM_EXYNOS_DP=y | |
| 120 | +CONFIG_DRM_PANEL=y | |
| 121 | +CONFIG_DRM_PANEL_SIMPLE=y | |
| 112 | 122 | CONFIG_FB=y |
| 113 | 123 | CONFIG_FB_MODE_HELPERS=y |
| 114 | 124 | CONFIG_FB_SIMPLE=y |
| 115 | 125 | CONFIG_EXYNOS_VIDEO=y |
| 116 | 126 | CONFIG_EXYNOS_MIPI_DSI=y |
| 127 | +CONFIG_BACKLIGHT_LCD_SUPPORT=y | |
| 128 | +CONFIG_LCD_CLASS_DEVICE=y | |
| 129 | +CONFIG_LCD_PLATFORM=y | |
| 130 | +CONFIG_BACKLIGHT_CLASS_DEVICE=y | |
| 131 | +CONFIG_BACKLIGHT_GENERIC=y | |
| 132 | +CONFIG_BACKLIGHT_PWM=y | |
| 117 | 133 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 118 | 134 | CONFIG_FONTS=y |
| 119 | 135 | CONFIG_FONT_7x14=y |