API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 4th, 2016
149
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 25.53 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/arch/arm/mach-msm/lge/awifi/board-awifi.c b/arch/arm/mach-msm/lge/awifi/board-awifi.c
  2. index ec43e66..e720453 100644
  3. --- a/arch/arm/mach-msm/lge/awifi/board-awifi.c
  4. +++ b/arch/arm/mach-msm/lge/awifi/board-awifi.c
  5. @@ -100,14 +100,12 @@
  6. #if defined(CONFIG_LGE_IRDA)
  7. #include <mach/clk-provider.h>
  8. #endif
  9. -// [[LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  10. +//
  11. #if defined(CONFIG_SND_SOC_ES325_SLIM)
  12. #include <sound/esxxx.h>
  13. #endif /* CONFIG_SND_SOC_ES325_SLIM */
  14. -// ]]LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  15. +//
  16.  
  17. -#define MHL_GPIO_INT 30
  18. -#define MHL_GPIO_RESET 35
  19.  
  20. #define MSM_PMEM_ADSP_SIZE 0x7800000
  21. #define MSM_PMEM_AUDIO_SIZE 0x4CF000
  22. @@ -315,17 +313,17 @@ static struct ion_cp_heap_pdata cp_mm_apq8064_ion_pdata = {
  23. .reusable = FMEM_ENABLED,
  24. .mem_is_fmem = FMEM_ENABLED,
  25. .fixed_position = FIXED_MIDDLE,
  26. -// jungjoo.nahm@lge.com [START]
  27. +//
  28. // As per QC case #01116834, adjust is_cma value based on CONFIG_CMA kernel feature.
  29. // To QC integrator, please keep this SW change. It impacts to playback a widevine DRM contents
  30. -//20130401, justin.yun@lge.com, To avoid memory fail when starting Miracast [START]
  31. +//
  32. //#ifdef CONFIG_CMA
  33. // .is_cma = 1,
  34. //#else
  35. .is_cma = 0,
  36. //#endif
  37. -//20130401, justin.yun@lge.com, To avoid memory fail when starting Miracast [END]
  38. -// jungjoo.nahm@lge.com [END]
  39. +//
  40. +//
  41. .no_nonsecure_alloc = 1,
  42. };
  43.  
  44. @@ -760,7 +758,7 @@ static void __init apq8064_reserve(void)
  45. #ifndef CONFIG_MACH_LGE
  46. apq8064_set_display_params(prim_panel_name, ext_panel_name,
  47. ext_resolution);
  48. -#endif /* CONFIG_MACH_LGE */
  49. +#endif /* */
  50. msm_reserve();
  51. lge_reserve();
  52. }
  53. @@ -936,7 +934,7 @@ struct platform_device lge_android_usb_device = {
  54. .platform_data = &lge_android_usb_pdata,
  55. },
  56. };
  57. -#endif /* CONFIG_USB_G_LGE_ANDROID */
  58. +#endif /* */
  59.  
  60. #ifdef CONFIG_LGE_USB_DIAG_DISABLE
  61. static struct platform_device lg_diag_cmd_device = {
  62. @@ -946,7 +944,7 @@ static struct platform_device lg_diag_cmd_device = {
  63. .platform_data = 0, //&lg_diag_cmd_pdata
  64. },
  65. };
  66. -#endif //#ifdef CONFIG_LGE_USB_DIAG_DISABLE
  67. +#endif //
  68.  
  69. /* Bandwidth requests (zero) if no vote placed */
  70. static struct msm_bus_vectors usb_init_vectors[] = {
  71. @@ -986,17 +984,28 @@ static struct msm_bus_scale_pdata usb_bus_scale_pdata = {
  72. };
  73.  
  74. static int phy_init_seq[] = {
  75. - 0x38, 0x81, /* update DC voltage level */
  76. - 0x24, 0x82, /* set pre-emphasis and rise/fall time */
  77. + 0x44, 0x80, /* update DC voltage level */
  78. + 0x39, 0x81, /* set pre-emphasis and rise/fall time */
  79. + 0x21, 0x82,
  80. + 0x33, 0x83,
  81. -1
  82. };
  83.  
  84. +static int phy_init_host_seq[] = {
  85. + 0x44, 0x80,
  86. + 0x36, 0x81,
  87. + 0x24, 0x82,
  88. + 0x13, 0x83,
  89. + -1
  90. +};
  91. +
  92. +
  93. #define PMIC_GPIO_DP 27 /* PMIC GPIO for D+ change */
  94. #define PMIC_GPIO_DP_IRQ PM8921_GPIO_IRQ(PM8921_IRQ_BASE, PMIC_GPIO_DP)
  95. #define MSM_MPM_PIN_USB1_OTGSESSVLD 40
  96.  
  97. #ifdef CONFIG_USB_OTG
  98. -static bool msm_hsusb_vbus_power(bool on)
  99. +static int msm_hsusb_vbus_power(bool on)
  100. {
  101. static struct regulator *votg_5v_switch;
  102. static struct regulator *ext_5v_reg;
  103. @@ -1049,7 +1058,7 @@ static struct msm_otg_platform_data msm_otg_pdata = {
  104. #ifdef CONFIG_USB_OTG
  105. .mode = USB_OTG,
  106. #else
  107. - .mode = USB_PERIPHERAL,
  108. + .mode = USB_PERIPHERAL,
  109. #endif
  110. #else //QCT origin
  111. .mode = USB_OTG,
  112. @@ -1060,6 +1069,7 @@ static struct msm_otg_platform_data msm_otg_pdata = {
  113. .power_budget = 750,
  114. .bus_scale_table = &usb_bus_scale_pdata,
  115. .phy_init_seq = phy_init_seq,
  116. + .phy_init_host_seq = phy_init_host_seq,
  117. .mpm_otgsessvld_int = MSM_MPM_PIN_USB1_OTGSESSVLD,
  118. #ifdef CONFIG_USB_OTG
  119. .vbus_power = msm_hsusb_vbus_power,
  120. @@ -1200,7 +1210,7 @@ static struct lp5521_led_pattern board_led_patterns[] = {
  121. .size_g = ARRAY_SIZE(mode7_green),
  122. .size_b = ARRAY_SIZE(mode7_blue),
  123. },
  124. -#if defined(CONFIG_MACH_APQ8064_GK_KR) || defined(CONFIG_MACH_APQ8064_GKATT) || defined(CONFIG_MACH_APQ8064_GKOPENHK) || defined(CONFIG_MACH_APQ8064_GV_KR) || defined(CONFIG_MACH_APQ8064_GKOPENTW) || defined(CONFIG_MACH_APQ8064_GKSHBSG) || defined(CONFIG_MACH_APQ8064_AWIFI)
  125. +#if defined(CONFIG_MACH_APQ8064_GK_KR) || defined(CONFIG_MACH_APQ8064_GKATT) || defined(CONFIG_MACH_APQ8064_GKGLOBAL) || defined(CONFIG_MACH_APQ8064_GV_KR) || defined(CONFIG_MACH_APQ8064_AWIFI)
  126. /* for dummy pattern IDs (defined LGLedRecord.java) */
  127. {
  128. /* ID_ALARM = 8 */
  129. @@ -1346,7 +1356,7 @@ static struct i2c_board_info lp5521_board_info[] __initdata = {
  130. .platform_data = &lp5521_pdata,
  131. },
  132. };
  133. -#if defined(CONFIG_MACH_APQ8064_GKATT) || defined(CONFIG_MACH_APQ8064_GKOPENHK) || defined(CONFIG_MACH_APQ8064_GKOPENTW) || defined(CONFIG_MACH_APQ8064_GKSHBSG) || defined(CONFIG_MACH_APQ8064_AWIFI)
  134. +#if defined(CONFIG_MACH_APQ8064_GKATT) || defined(CONFIG_MACH_APQ8064_GKGLOBAL) || defined(CONFIG_MACH_APQ8064_AWIFI)
  135. static struct i2c_board_info lp5521_board_info_rev_f[] __initdata = {
  136. {
  137. I2C_BOARD_INFO("lp5521", 0x33),
  138. @@ -1540,7 +1550,7 @@ static struct slim_device apq8064_slim_tabla20 = {
  139. },
  140. };
  141.  
  142. -// [[LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  143. +//
  144. #if defined(CONFIG_SND_SOC_ES325_SLIM)
  145. static struct esxxx_platform_data apq8064_es325_data = {
  146. .reset_gpio = ES325_RESET_GPIO,
  147. @@ -1563,7 +1573,7 @@ static struct slim_device apq8064_slim_es325_gen0 = {
  148. },
  149. };
  150. #endif /* CONFIG_SND_SOC_ES325_SLIM */
  151. -// ]]LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  152. +//
  153.  
  154. #ifdef CONFIG_SND_SOC_CS8427
  155. /* enable the level shifter for cs8427 to make sure the I2C
  156. @@ -1707,7 +1717,7 @@ static struct i2c_board_info isa1200_board_info[] __initdata = {
  157. .platform_data = &isa1200_1_pdata,
  158. },
  159. };
  160. -#endif /* LGE Not Used */
  161. +#endif /* */
  162.  
  163. #ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT
  164. /* configuration data for mxt1386e using V2.1 firmware */
  165. @@ -1930,7 +1940,7 @@ static struct i2c_board_info cyttsp_info[] __initdata = {
  166. },
  167. };
  168. #endif
  169. -#ifndef CONFIG_BCMDHD
  170. +
  171.  
  172. #define MSM_WCNSS_PHYS 0x03000000
  173. #define MSM_WCNSS_SIZE 0x280000
  174. @@ -1973,7 +1983,7 @@ static struct platform_device msm_device_wcnss_wlan = {
  175. .resource = resources_wcnss_wlan,
  176. .dev = {.platform_data = &qcom_wcnss_pdata},
  177. };
  178. -#endif
  179. +
  180.  
  181. #ifdef CONFIG_RADIO_IRIS
  182. static struct platform_device msm_device_iris_fm __devinitdata = {
  183. @@ -2215,7 +2225,7 @@ static struct platform_device qcedev_device = {
  184. };
  185. #endif
  186.  
  187. -#ifdef CONFIG_MACH_APQ8064_ALTEV /* sangyup.kim@lge.com To remove mdm modem */
  188. +#if defined(CONFIG_MACH_APQ8064_ALTEV) /* */
  189. static struct mdm_vddmin_resource mdm_vddmin_rscs = {
  190. .rpm_id = MSM_RPM_ID_VDDMIN_GPIO,
  191. .ap2mdm_vddmin_gpio = 30,
  192. @@ -2299,7 +2309,7 @@ static struct mdm_platform_data sglte2_mdm_platform_data = {
  193. static struct mdm_platform_data sglte2_qsc_platform_data = {
  194. .mdm_version = "3.0",
  195. .ramdump_delay_ms = 2000,
  196. - /* delay between two PS_HOLDs */
  197. + /* delay between two PS_HOLDs */
  198. .ps_hold_delay_ms = 500,
  199. .ramdump_timeout_ms = 600000,
  200. .no_powerdown_after_ramdumps = 1,
  201. @@ -2328,9 +2338,6 @@ static struct msm_thermal_data msm_thermal_pdata = {
  202. #ifdef CONFIG_MACH_LGE
  203. .poll_ms = 1000,
  204. .limit_temp_degC = 93,
  205. -#if defined(CONFIG_MACH_APQ8064_GK_KR)||defined(CONFIG_MACH_APQ8064_GKATT) || defined(CONFIG_MACH_APQ8064_GKOPENHK) || defined(CONFIG_MACH_APQ8064_GKOPENTW) || defined(CONFIG_MACH_APQ8064_GKSHBSG) || defined(CONFIG_MACH_APQ8064_AWIFI)
  206. - .limit_temp_degC_low = 20,
  207. -#endif
  208. #else
  209. .poll_ms = 250,
  210. .limit_temp_degC = 60,
  211. @@ -2344,6 +2351,7 @@ static struct msm_thermal_data msm_thermal_pdata = {
  212. .core_limit_temp_degC = 80,
  213. #endif
  214. .core_temp_hysteresis_degC = 10,
  215. +
  216. .core_control_mask = 0xe,
  217. };
  218.  
  219. @@ -2402,8 +2410,8 @@ static struct platform_device msm8064_device_saw_regulator_core3 = {
  220. },
  221. };
  222.  
  223. -// [S] LGE_BT: ADD/ilbeom.kim/'12-10-24 - [GK] BRCM Solution bring-up
  224. -//BEGIN: 0019632 chanha.park@lge.com 2012-05-31
  225. +//
  226. +//
  227. //ADD: 0019632: [F200][BT] Bluetooth board bring-up
  228. #ifdef CONFIG_LGE_BLUESLEEP
  229. static struct resource bluesleep_resources[] = {
  230. @@ -2432,9 +2440,9 @@ static struct platform_device msm_bluesleep_device = {
  231. .num_resources = ARRAY_SIZE(bluesleep_resources),
  232. .resource = bluesleep_resources,
  233. };
  234. -#endif // CONFIG_LGE_BLUESLEEP
  235. -//END: 0019632 chanha.park@lge.com 2012-05-31
  236. -// [E] LGE_BT: ADD/ilbeom.kim/'12-10-24 - [GK] BRCM Solution bring-up
  237. +#endif //
  238. +//
  239. +//
  240.  
  241. static struct msm_rpmrs_level msm_rpmrs_levels[] = {
  242. {
  243. @@ -2808,7 +2816,7 @@ static void __init mpq8064_pcie_init(void)
  244. }
  245. }
  246.  
  247. -#ifdef CONFIG_USB_OTG //#if defined(CONFIG_MACH_LGE)
  248. +#ifdef CONFIG_USB_OTG //
  249. static struct platform_device apq8064_device_ext_5v_vreg __devinitdata = {
  250. .name = GPIO_REGULATOR_DEV_NAME,
  251. .id = PM8921_MPP_PM_TO_SYS(7),
  252. @@ -2880,7 +2888,7 @@ static struct platform_device gpio_ir_recv_pdev = {
  253. static struct platform_device *common_not_mpq_devices[] __initdata = {
  254. &apq8064_device_qup_i2c_gsbi1,
  255. &apq8064_device_qup_i2c_gsbi3,
  256. -#ifdef CONFIG_BQ24262_CHARGER
  257. +#if defined(CONFIG_BQ24262_CHARGER)
  258. &apq8064_device_qup_i2c_gsbi5,
  259. #endif
  260. #if defined(CONFIG_SND_SOC_TPA2028D_DUAL_SPEAKER) || (defined (CONFIG_MACH_LGE)&& defined(CONFIG_TOUCHSCREEN_S340010_SYNAPTICS_TK))
  261. @@ -2933,28 +2941,25 @@ static struct platform_device *common_devices[] __initdata = {
  262. &apq8064_device_gadget_peripheral,
  263. &apq8064_device_hsusb_host,
  264. &android_usb_device,
  265. -#ifdef CONFIG_WIRELESS_CHARGER
  266. - &wireless_charger,
  267. -#endif
  268. #if defined(CONFIG_LGE_BROADCAST_ONESEG)
  269. &apq8064_device_qup_spi_gsbi5,
  270. -#endif /* CONFIG_LGE_BROADCAST_ONESEG */
  271. +#endif /* */
  272. #ifdef CONFIG_USB_G_LGE_ANDROID
  273. &lge_android_usb_device,
  274. #endif
  275.  
  276. -// [S] LGE_BT: ADD/ilbeom.kim/'12-10-24 - [GK] BRCM Solution bring-up
  277. -//BEGIN: 0019632 chanha.park@lge.com 2012-05-31
  278. +//
  279. +//
  280. //ADD: 0019632: [F200][BT] Bluetooth board bring-up
  281. #ifdef CONFIG_LGE_BLUESLEEP
  282. &msm_bluesleep_device,
  283. -#endif // CONFIG_LGE_BLUESLEEP
  284. -//END: 0019632 chanha.park@lge.com 2012-05-31
  285. -// [E] LGE_BT: ADD/ilbeom.kim/'12-10-24 - [GK] BRCM Solution bring-up
  286. +#endif //
  287. +//
  288. +//
  289.  
  290. #ifdef CONFIG_LGE_USB_DIAG_DISABLE
  291. &lg_diag_cmd_device,
  292. -#endif //#ifdef CONFIG_LGE_USB_DIAG_DISABLE
  293. +#endif //
  294.  
  295. #ifndef CONFIG_BCMDHD
  296. &msm_device_wcnss_wlan,
  297. @@ -3077,7 +3082,6 @@ static struct platform_device *common_devices[] __initdata = {
  298. &battery_bcl_device,
  299. #endif
  300. &apq8064_msm_mpd_device,
  301. - &adsp_loader_device,
  302. };
  303.  
  304. static struct platform_device *cdp_devices[] __initdata = {
  305. @@ -3089,7 +3093,7 @@ static struct platform_device *cdp_devices[] __initdata = {
  306. #ifdef CONFIG_MSM_ROTATOR
  307. &msm_rotator_device,
  308. #endif
  309. - &msm8960_cpu_slp_status,
  310. + &msm8064_pc_cntr,
  311. };
  312.  
  313. static struct platform_device
  314. @@ -3181,30 +3185,30 @@ late_initcall(rf4ce_gpio_init);
  315. /* GK Broadcom BCM4334 */
  316. #if defined(CONFIG_LGE_BLUESLEEP)
  317. #ifdef CONFIG_SERIAL_MSM_HS
  318. -/* daeon.shon@lge.com temp block for build error
  319. -static int configure_uart_gpios(int on)
  320. -{
  321. - int ret = 0, i;
  322. - int uart_gpios[] = {14, 15, 16, 17};
  323. -
  324. - for (i = 0; i < ARRAY_SIZE(uart_gpios); i++) {
  325. - if (on) {
  326. - ret = gpio_request(uart_gpios[i], NULL);
  327. - if (ret) {
  328. - pr_err("%s:unable to request uart gpio[%d]\n",
  329. - __func__, uart_gpios[i]);
  330. - break;
  331. - }
  332. - } else {
  333. - gpio_free(uart_gpios[i]);
  334. - }
  335. - }
  336. -
  337. - if (ret && on && i)
  338. - for (; i >= 0; i--)
  339. - gpio_free(uart_gpios[i]);
  340. - return ret;
  341. -}
  342. +/*
  343. +
  344. +
  345. +
  346. +
  347. +
  348. +
  349. +
  350. +
  351. +
  352. +
  353. +
  354. +
  355. +
  356. +
  357. +
  358. +
  359. +
  360. +
  361. +
  362. +
  363. +
  364. +
  365. +
  366. */
  367. static struct msm_serial_hs_platform_data mpq8064_gsbi6_uartdm_pdata = {
  368. // .gpio_config = configure_uart_gpios,
  369. @@ -3245,7 +3249,7 @@ static struct platform_device *irrc_uart_devices[] __initdata = {
  370. &apq8064_device_uart_gsbi7,
  371. };
  372. #endif
  373. -#if 0//sangwooha.ha@lge.com 20120813 GK ES3 UART bring up
  374. +#if 0//
  375. static struct msm_spi_platform_data apq8064_qup_spi_gsbi5_pdata = {
  376. .max_clock_speed = 1100000,
  377. };
  378. @@ -3275,7 +3279,7 @@ static struct spi_board_info spi_broadcast_board_info[] __initdata = {
  379.  
  380.  
  381. };
  382. -#endif /* CONFIG_LGE_BROADCAST */
  383. +#endif /* */
  384.  
  385. static struct spi_board_info spi_board_info[] __initdata = {
  386. #if !(CONFIG_MACH_LGE)
  387. @@ -3288,8 +3292,8 @@ static struct spi_board_info spi_board_info[] __initdata = {
  388. .chip_select = 2,
  389. .mode = SPI_MODE_0,
  390. },
  391. -#endif /* LGE Not Used */
  392. -#endif /* CONFIG_MACH_LGE */
  393. +#endif /* */
  394. +#endif /* */
  395. #ifdef CONFIG_SENSORS_EPM_ADC
  396. {
  397. .modalias = "epm_adc",
  398. @@ -3312,7 +3316,7 @@ static struct slim_boardinfo apq8064_slim_devices[] = {
  399. .bus_num = 1,
  400. .slim_slave = &apq8064_slim_tabla20,
  401. },
  402. -// [[LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  403. +//
  404. #if defined(CONFIG_SND_SOC_ES325_SLIM)
  405. {
  406. .bus_num = 1,
  407. @@ -3324,13 +3328,13 @@ static struct slim_boardinfo apq8064_slim_devices[] = {
  408. .slim_slave = &apq8064_slim_es325_gen0
  409. },
  410. #endif /* CONFIG_SND_SOC_ES325_SLIM */
  411. -// ]]LGE_BSP_AUDIO, jeremy.pi@lge.com, Audience eS325 ALSA SoC Audio driver
  412. +//
  413.  
  414. /* add more slimbus slaves as needed */
  415. };
  416.  
  417. static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi1_pdata = {
  418. - .clk_freq = 384000,//sangwooha.ha@lge.com GK ES3 bring up
  419. + .clk_freq = 384000,//
  420. .src_clk_rate = 24000000,
  421. };
  422.  
  423. @@ -3340,7 +3344,7 @@ static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi3_pdata = {
  424. };
  425.  
  426. static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi4_pdata = {
  427. - .clk_freq = 200000, /* LGE_CHANGE, decrease i2c speed a bit from max. to avoid stability issue., 2013-06-19, john.park@lge.com */
  428. + .clk_freq = 200000, /* */
  429. .src_clk_rate = 24000000,
  430. };
  431.  
  432. @@ -3358,7 +3362,7 @@ static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi7_pdata = {
  433. };
  434. #endif
  435.  
  436. -#if 0//sangwooha.ha@lge.com 20120813 GK ES3 UART bring up
  437. +#if 0//
  438. static struct msm_i2c_platform_data mpq8064_i2c_qup_gsbi5_pdata = {
  439. .clk_freq = 100000,
  440. .src_clk_rate = 24000000,
  441. @@ -3392,10 +3396,10 @@ static void __init apq8064_i2c_init(void)
  442. //apq8064_i2c_qup_gsbi7_pdata.use_gsbi_shared_mode = 1;
  443.  
  444. #endif
  445. - /* LGE_UPDATE_S GV DCM
  446. - * Setting protocol code to 0x60 for dual UART/I2C in GSBI3
  447. - * - Rev.B
  448. - */
  449. + /*
  450. +
  451. +
  452. + */
  453. #if defined(CONFIG_LGE_FELICA) || defined(CONFIG_LGE_NFC_SONY_CXD2235AGG)
  454. gsbi_mem = ioremap_nocache(MSM_GSBI3_PHYS, 4);
  455. writel_relaxed(GSBI_DUAL_MODE_CODE, gsbi_mem);
  456. @@ -3430,7 +3434,7 @@ static void __init apq8064_i2c_init(void)
  457. &apq8064_i2c_qup_gsbi5_pdata;
  458. #endif
  459.  
  460. -//sangwooha.ha@lge.com 20120813 GK ES3 UART bring up
  461. +//
  462. /* Setting protocol code to 0x60 for dual UART/I2C in GSBI4 */
  463. gsbi_mem = ioremap_nocache(MSM_GSBI4_PHYS, 4);
  464. if (lge_get_uart_mode()) {
  465. @@ -3701,7 +3705,7 @@ static struct platform_device mpq_keypad_device = {
  466. .platform_data = &mpq_keypad_data,
  467. },
  468. };
  469. -#endif /* LGE Not Used */
  470. +#endif /* */
  471.  
  472. /* Sensors DSPS platform data */
  473. #define DSPS_PIL_GENERIC_NAME "dsps"
  474. @@ -3762,7 +3766,7 @@ static struct i2c_registry apq8064_i2c_devices[] __initdata = {
  475. isa1200_board_info,
  476. ARRAY_SIZE(isa1200_board_info),
  477. },
  478. -#endif /* CONFIG_MACH_LGE */
  479. +#endif /* */
  480. #ifdef CONFIG_SND_SOC_CS8427
  481. {
  482. I2C_MPQ_CDP,
  483. @@ -3859,17 +3863,17 @@ static void __init register_i2c_devices(void)
  484. apq8064_camera_board_info.board_info,
  485. apq8064_camera_board_info.num_i2c_board_info,
  486. };
  487. -/* LGE_CHANGE_S, For awifi Rev.A bring-up , 2013-06-11, seungmin.hong@lge.com */
  488. +/* */
  489. struct i2c_registry apq8064_camera_i2c_devices_revA = {
  490. I2C_SURF | I2C_FFA | I2C_LIQUID | I2C_RUMI,
  491. APQ_8064_GSBI4_QUP_I2C_BUS_ID,
  492. apq8064_camera_board_info_revA.board_info,
  493. apq8064_camera_board_info_revA.num_i2c_board_info,
  494. };
  495. -/* LGE_CHANGE_E, For awifi Rev.A bring-up , 2013-06-11, seungmin.hong@lge.com */
  496. +/* */
  497.  
  498. -/* [patch for Enabling flash LED for camera]
  499. - * 2012-03-14, jinsool.lee@lge.com
  500. +/*
  501. +
  502. */
  503. struct i2c_registry apq8064_lge_camera_i2c_devices = {
  504. I2C_SURF | I2C_FFA | I2C_RUMI | I2C_SIM | I2C_LIQUID | I2C_MPQ_CDP,
  505. @@ -3903,7 +3907,7 @@ static void __init register_i2c_devices(void)
  506. apq8064_i2c_devices[i].len);
  507. }
  508. #ifdef CONFIG_MSM_CAMERA
  509. -/* LGE_CHANGE_S, For awifi Rev.A bring-up , 2013-06-11, seungmin.hong@lge.com */
  510. +/* */
  511. if(lge_get_board_revno() >= HW_REV_A){
  512. if (apq8064_camera_i2c_devices_revA.machs & mach_mask)
  513. i2c_register_board_info(apq8064_camera_i2c_devices_revA.bus,
  514. @@ -3914,7 +3918,7 @@ static void __init register_i2c_devices(void)
  515. apq8064_lge_camera_i2c_devices.info,
  516. apq8064_lge_camera_i2c_devices.len);
  517. }else{
  518. -/* LGE_CHANGE_E, For awifi Rev.A bring-up , 2013-06-11, seungmin.hong@lge.com */
  519. +/* */
  520. if (apq8064_camera_i2c_devices.machs & mach_mask)
  521. i2c_register_board_info(apq8064_camera_i2c_devices.bus,
  522. apq8064_camera_i2c_devices.info,
  523. @@ -3990,9 +3994,9 @@ static void __init gvdcm_uart_clock_update(void)
  524. }
  525. #endif
  526.  
  527. -#if 0
  528. +#if defined(CONFIG_MACH_APQ8064_ALTEV)
  529. #ifdef CONFIG_SERIAL_MSM_HS
  530. -static int configure_uartdm_gsbi4_gpios(int on)
  531. +/*static int configure_uartdm_gsbi4_gpios(int on)
  532. {
  533. int ret = 0, i;
  534. int uart_gpios[] = {10, 11, 12, 13};
  535. @@ -4015,26 +4019,20 @@ static int configure_uartdm_gsbi4_gpios(int on)
  536. gpio_free(uart_gpios[i]);
  537. return ret;
  538. }
  539. -
  540. +*/
  541. static struct msm_serial_hs_platform_data apq8064_uartdm_gsbi4_pdata = {
  542. - .gpio_config = configure_uartdm_gsbi4_gpios,
  543. +// .gpio_config = configure_uartdm_gsbi4_gpios, build error - temporaty code
  544. + .config_gpio = 4,
  545. + .uart_tx_gpio = 10,
  546. + .uart_rx_gpio = 11,
  547. + .uart_cts_gpio = 12,
  548. + .uart_rfr_gpio = 13,
  549. };
  550. #else
  551. static struct msm_serial_hs_platform_data apq8064_uartdm_gsbi4_pdata;
  552. #endif
  553. #endif
  554.  
  555. -#ifdef CONFIG_MACH_APQ8064_ALTEV
  556. -static struct msm_serial_hs_platform_data apq8064_uartdm_gsbi4_pdata = {
  557. -// .gpio_config = configure_uartdm_gsbi4_gpios, build error - temporaty code
  558. - .config_gpio = 4,
  559. - .uart_tx_gpio = 10,
  560. - .uart_rx_gpio = 11,
  561. - .uart_cts_gpio = 12,
  562. - .uart_rfr_gpio = 13,
  563. -};
  564. -#endif
  565. -
  566. static void __init apq8064ab_update_retention_spm(void)
  567. {
  568. int i;
  569. @@ -4054,7 +4052,7 @@ static void __init apq8064ab_update_retention_spm(void)
  570.  
  571. static void __init apq8064_common_init(void)
  572. {
  573. -#ifdef CONFIG_MACH_APQ8064_ALTEV /* sangyup.kim@lge.com To remove mdm modem */
  574. +#if defined(CONFIG_MACH_APQ8064_ALTEV) /* */
  575. u32 platform_version = socinfo_get_platform_version();
  576. #endif
  577.  
  578. @@ -4066,12 +4064,11 @@ static void __init apq8064_common_init(void)
  579. if (cpu_is_apq8064ab())
  580. apq8064ab_update_krait_spm();
  581. if (cpu_is_krait_v3()) {
  582. - struct msm_pm_init_data_type *pdata =
  583. - msm8064_pm_8x60.dev.platform_data;
  584. - pdata->retention_calls_tz = false;
  585. + msm_pm_set_tz_retention_flag(0);
  586. apq8064ab_update_retention_spm();
  587. + } else {
  588. + msm_pm_set_tz_retention_flag(1);
  589. }
  590. - platform_device_register(&msm8064_pm_8x60);
  591. msm_spm_init(msm_spm_data, ARRAY_SIZE(msm_spm_data));
  592. msm_spm_l2_init(msm_spm_l2_data);
  593. msm_tsens_early_init(&apq_tsens_pdata);
  594. @@ -4098,14 +4095,15 @@ static void __init apq8064_common_init(void)
  595. register_i2c_devices();
  596. register_i2c_backlight_devices();
  597. lge_add_sound_devices();
  598. -/* ehee.lee@lge.com [START] for NFC */
  599. +/* */
  600. #if defined(CONFIG_LGE_NFC)
  601. lge_add_nfc_devices();
  602. #endif
  603. #if defined(CONFIG_BATTERY_MAX17043) || defined(CONFIG_BATTERY_MAX17047) || defined(CONFIG_BATTERY_MAX17048)
  604. lge_add_i2c_pm_subsystem_devices();
  605. #endif
  606. -#ifdef CONFIG_BQ24262_CHARGER
  607. +
  608. +#if defined(CONFIG_BQ24262_CHARGER)
  609. lge_add_i2c_pm_subsystem_charger_devices();
  610. #endif
  611.  
  612. @@ -4151,7 +4149,7 @@ static void __init apq8064_common_init(void)
  613.  
  614. msm_hsic_pdata.swfi_latency =
  615. msm_rpmrs_levels[0].latency_us;
  616. - if (machine_is_apq8064_mtp() || machine_is_apq8064_awifi()) {
  617. + if (machine_is_apq8064_mtp()) {
  618. msm_hsic_pdata.log2_irq_thresh = 5,
  619. apq8064_device_hsic_host.dev.platform_data = &msm_hsic_pdata;
  620. device_initialize(&apq8064_device_hsic_host.dev);
  621. @@ -4164,8 +4162,8 @@ static void __init apq8064_common_init(void)
  622. apq8064_pm8xxx_gpio_mpp_init();
  623. apq8064_init_mmc();
  624.  
  625. -#ifdef CONFIG_MACH_APQ8064_ALTEV /* sangyup.kim@lge.com To remove mdm modem */
  626. - if (machine_is_apq8064_mtp() || machine_is_apq8064_awifi()) {
  627. +#if defined(CONFIG_MACH_APQ8064_ALTEV) /* */
  628. + if (machine_is_apq8064_mtp()) {
  629. if (socinfo_get_platform_subtype() == PLATFORM_SUBTYPE_DSDA2) {
  630. amdm_8064_device.dev.platform_data =
  631. &amdm_platform_data;
  632. @@ -4193,10 +4191,10 @@ static void __init apq8064_common_init(void)
  633. platform_device_register(&i2s_mdm_8064_device);
  634. } else {
  635. mdm_8064_device.dev.platform_data = &mdm_platform_data;
  636. - //LGE_Change_S jaseseung.noh MDM2AP_PBLRDY set to 81 -> altev 46
  637. + //
  638. mdm_8064_device.resource[6].start = 46; // MDM2AP_PBLRDY
  639. mdm_8064_device.resource[6].end = 46; // MDM2AP_PBLRDY
  640. - //LGE_Change_E jaseseung.noh MDM2AP_PBLRDY set to 81 -> altev 46
  641. + //
  642. platform_device_register(&mdm_8064_device);
  643. }
  644. }
  645. @@ -4227,7 +4225,7 @@ static void __init apq8064_common_init(void)
  646. apq8064_epm_adc_init();
  647. #endif
  648.  
  649. -//2013-04-12 Meehwa-yun(meehwa.yun@lge.com) [Temporary_LGE] Enable modem power to fix the audio issue due to shared slimbus lines [START]
  650. +//
  651. #ifdef CONFIG_MACH_APQ8064_GK_KR
  652. if (!gpio_request(27, "AP2MDM_KPDPWR_N")) {
  653. gpio_direction_output(27, 1);
  654. @@ -4235,7 +4233,7 @@ static void __init apq8064_common_init(void)
  655. gpio_direction_output(27, 0);
  656. }
  657. #endif
  658. -//2013-04-12 Meehwa-yun(meehwa.yun@lge.com) [Temporary_LGE] Enable modem power to fix the audio issue due to shared slimbus lines [END] }
  659. +//
  660. }
  661.  
  662. static void __init apq8064_allocate_memory_regions(void)
  663. @@ -4310,13 +4308,7 @@ static void __init apq8064_cdp_init(void)
  664. }
  665. //pr_info("[NORMAL-DEBUG] apq8064_device_uart_gsbi4.id : %d", apq8064_device_uart_gsbi4.id);
  666. //pr_info("[DEBUG] uart_enable : %d", lge_get_uart_mode() );
  667. -#if defined(CONFIG_LGE_BROADCAST_TDMB) || defined(CONFIG_LGE_BROADCAST_ONESEG)
  668. - apq8064_device_qup_spi_gsbi5.dev.platform_data =
  669. - &apq8064_qup_spi_gsbi5_pdata;
  670.  
  671. - spi_register_board_info(spi_broadcast_board_info,
  672. - ARRAY_SIZE(spi_broadcast_board_info));
  673. -#endif /* CONFIG_LGE_BROADCAST */
  674.  
  675. apq8064_init_fb();
  676. apq8064_init_gpu();
  677. @@ -4353,18 +4345,21 @@ static void __init apq8064_cdp_init(void)
  678. platform_device_register(&mpq_gpio_keys_pdev);
  679. platform_device_register(&mpq_keypad_device);
  680. }
  681. -#endif /* LGE Not Used */
  682. -//2013-05-29 goensoo.kim@lge.com [AWIFI/Touch] Enable atmel touchscreen driver for REV_A [START]
  683. -#ifndef CONFIG_MACH_APQ8064_ALTEV
  684. +#endif /* */
  685. +
  686. +#if !defined(CONFIG_MACH_APQ8064_ALTEV)
  687. +//
  688. if (lge_get_board_revno() >= HW_REV_A) {
  689. apq8064_awifi_init_input();
  690. } else {
  691. apq8064_init_input();
  692. }
  693. +//
  694. #else
  695. + /* */
  696. apq8064_awifi_init_input();
  697. #endif
  698. -//2013-05-29 goensoo.kim@lge.com [AWIFI/Touch] Enable atmel touchscreen driver for REV_A [END]
  699. +
  700. apq8064_init_misc();
  701. #ifdef CONFIG_LGE_ECO_MODE
  702. lge_add_lge_kernel_devices();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!