Skip to content

Commit 966903a

Browse files
committed
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>
2 parents 41544f9 + 26d13bf commit 966903a

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

arch/arm/boot/dts/exynos5250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@
736736

737737
dp_phy: video-phy@10040720 {
738738
compatible = "samsung,exynos5250-dp-video-phy";
739-
reg = <0x10040720 4>;
739+
samsung,pmu-syscon = <&pmu_system_controller>;
740740
#phy-cells = <0>;
741741
};
742742

arch/arm/boot/dts/exynos5420.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@
503503
};
504504

505505
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>;
508508
#phy-cells = <0>;
509509
};
510510

arch/arm/configs/exynos_defconfig

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ CONFIG_DEBUG_GPIO=y
8484
CONFIG_POWER_SUPPLY=y
8585
CONFIG_BATTERY_SBS=y
8686
CONFIG_CHARGER_TPS65090=y
87-
# CONFIG_HWMON is not set
87+
CONFIG_HWMON=y
88+
CONFIG_SENSORS_LM90=y
8889
CONFIG_THERMAL=y
8990
CONFIG_EXYNOS_THERMAL=y
9091
CONFIG_EXYNOS_THERMAL_CORE=y
@@ -109,11 +110,26 @@ CONFIG_REGULATOR_S2MPA01=y
109110
CONFIG_REGULATOR_S2MPS11=y
110111
CONFIG_REGULATOR_S5M8767=y
111112
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
112122
CONFIG_FB=y
113123
CONFIG_FB_MODE_HELPERS=y
114124
CONFIG_FB_SIMPLE=y
115125
CONFIG_EXYNOS_VIDEO=y
116126
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
117133
CONFIG_FRAMEBUFFER_CONSOLE=y
118134
CONFIG_FONTS=y
119135
CONFIG_FONT_7x14=y

0 commit comments

Comments
 (0)