Commit 966903a9 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-fixes-3.19' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 41544f9f 26d13bf7
...@@ -736,7 +736,7 @@ mixer { ...@@ -736,7 +736,7 @@ mixer {
dp_phy: video-phy@10040720 { dp_phy: video-phy@10040720 {
compatible = "samsung,exynos5250-dp-video-phy"; compatible = "samsung,exynos5250-dp-video-phy";
reg = <0x10040720 4>; samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <0>; #phy-cells = <0>;
}; };
......
...@@ -503,8 +503,8 @@ pwm: pwm@12dd0000 { ...@@ -503,8 +503,8 @@ pwm: pwm@12dd0000 {
}; };
dp_phy: video-phy@10040728 { dp_phy: video-phy@10040728 {
compatible = "samsung,exynos5250-dp-video-phy"; compatible = "samsung,exynos5420-dp-video-phy";
reg = <0x10040728 4>; samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <0>; #phy-cells = <0>;
}; };
......
...@@ -84,7 +84,8 @@ CONFIG_DEBUG_GPIO=y ...@@ -84,7 +84,8 @@ CONFIG_DEBUG_GPIO=y
CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY=y
CONFIG_BATTERY_SBS=y CONFIG_BATTERY_SBS=y
CONFIG_CHARGER_TPS65090=y CONFIG_CHARGER_TPS65090=y
# CONFIG_HWMON is not set CONFIG_HWMON=y
CONFIG_SENSORS_LM90=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_EXYNOS_THERMAL=y CONFIG_EXYNOS_THERMAL=y
CONFIG_EXYNOS_THERMAL_CORE=y CONFIG_EXYNOS_THERMAL_CORE=y
...@@ -109,11 +110,26 @@ CONFIG_REGULATOR_S2MPA01=y ...@@ -109,11 +110,26 @@ CONFIG_REGULATOR_S2MPA01=y
CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS65090=y CONFIG_REGULATOR_TPS65090=y
CONFIG_DRM=y
CONFIG_DRM_BRIDGE=y
CONFIG_DRM_PTN3460=y
CONFIG_DRM_PS8622=y
CONFIG_DRM_EXYNOS=y
CONFIG_DRM_EXYNOS_FIMD=y
CONFIG_DRM_EXYNOS_DP=y
CONFIG_DRM_PANEL=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_MODE_HELPERS=y CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_SIMPLE=y CONFIG_FB_SIMPLE=y
CONFIG_EXYNOS_VIDEO=y CONFIG_EXYNOS_VIDEO=y
CONFIG_EXYNOS_MIPI_DSI=y CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y CONFIG_FONTS=y
CONFIG_FONT_7x14=y CONFIG_FONT_7x14=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