Merge "platform: msm8974: Clock support for hs400"
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 71c6128..a8a7e66 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1454,7 +1454,7 @@
check_aboot_addr_range_overlap(hdr->ramdisk_addr, ramdisk_actual))
{
dprintf(CRITICAL, "kernel/ramdisk addresses overlap with aboot addresses.\n");
- return -1;
+ return;
}
/* sz should have atleast raw boot image */
@@ -1472,7 +1472,7 @@
if (check_aboot_addr_range_overlap(hdr->tags_addr, MAX_TAGS_SIZE))
{
dprintf(CRITICAL, "Tags addresses overlap with aboot addresses.\n");
- return -1;
+ return;
}
#endif
@@ -1502,7 +1502,7 @@
if (check_aboot_addr_range_overlap(hdr->tags_addr, MAX_TAGS_SIZE))
{
dprintf(CRITICAL, "Tags addresses overlap with aboot addresses.\n");
- return -1;
+ return;
}
#endif
diff --git a/dev/gcdb/display/include/panel.h b/dev/gcdb/display/include/panel.h
index f7f1f7f..60de8ce 100755
--- a/dev/gcdb/display/include/panel.h
+++ b/dev/gcdb/display/include/panel.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -150,7 +150,6 @@
BL_PWM = 0,
BL_WLED,
BL_DCS,
- BL_LPG,
};
typedef struct panel_reset_sequence {
@@ -166,6 +165,8 @@
uint16_t bl_step;
uint16_t bl_pmic_controltype;
char *bl_pmic_model;
+ uint16_t bl_pwm_gpio_num;
+ uint16_t bl_lpg_chan_id;
};
#endif /*_PANEL_H_ */
diff --git a/dev/gcdb/display/include/panel_jdi_qhd_dualdsi_video.h b/dev/gcdb/display/include/panel_jdi_qhd_dualdsi_video.h
index cd0301c..73a3c46 100644
--- a/dev/gcdb/display/include/panel_jdi_qhd_dualdsi_video.h
+++ b/dev/gcdb/display/include/panel_jdi_qhd_dualdsi_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -220,7 +220,7 @@
/* Backlight setting */
/*---------------------------------------------------------------------------*/
static struct backlight jdi_qhd_dualdsi_video_backlight = {
- 0, 1, 4095, 100, 0, 0
+ 0, 1, 4095, 100, 0, 0, 7, 3
};
#endif /*_PANEL_JDI_QHD_DUALDSI_VIDEO_H_*/
diff --git a/target/msm8226/oem_panel.c b/target/msm8226/oem_panel.c
index 9f3127b..a0fcc41 100755
--- a/target/msm8226/oem_panel.c
+++ b/target/msm8226/oem_panel.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -72,6 +72,7 @@
HW_PLATFORM_SUBTYPE_SKUF = 2,
HW_PLATFORM_SUBTYPE_1080P = 2,
HW_PLATFORM_SUBTYPE_SKUAB = 3,
+ HW_PLATFORM_SUBTYPE_1080P_EXT_BUCK = 3,
HW_PLATFORM_SUBTYPE_SKUG = 5,
};
@@ -349,11 +350,11 @@
break;
case HW_PLATFORM_MTP:
case HW_PLATFORM_SURF:
- if (hw_subtype == HW_PLATFORM_SUBTYPE_1080P) {
+ if ((hw_subtype == HW_PLATFORM_SUBTYPE_1080P) ||
+ (hw_subtype == HW_PLATFORM_SUBTYPE_1080P_EXT_BUCK))
panel_id = JDI_1080P_VIDEO_PANEL;
- } else {
+ else
panel_id = nt35590_panel_id;
- }
break;
default:
dprintf(CRITICAL, "Display not enabled for %d HW type\n"