Guest User

Untitled

a guest
Oct 14th, 2014
276
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. //PATCH OUTPUT
  2.  
  3.  
  4.  
  5. patching file drivers/gpu/drm/i915/i915_drv.h
  6. Hunk #1 succeeded at 1691 (offset 67 lines).
  7. patching file drivers/gpu/drm/i915/intel_dsi.c
  8. Hunk #4 succeeded at 681 (offset 6 lines).
  9. Hunk #5 succeeded at 797 (offset 6 lines).
  10. patching file drivers/gpu/drm/i915/intel_panel.c
  11. Hunk #7 succeeded at 925 (offset 2 lines).
  12. Hunk #8 succeeded at 1022 (offset 22 lines).
  13. Hunk #9 succeeded at 1036 (offset 22 lines).
  14. Hunk #10 succeeded at 1045 with fuzz 1 (offset 22 lines).
  15. Hunk #11 FAILED at 1209.
  16. 1 out of 11 hunks FAILED -- saving rejects to file drivers/gpu/drm/i915/intel_panel.c.rej
  17. patching file drivers/hid/hid-rmi.c
  18. Hunk #1 succeeded at 964 (offset 32 lines).
  19. patching file drivers/mfd/Kconfig
  20. patching file drivers/mfd/Makefile
  21. patching file drivers/mfd/intel_mid_pmic.c
  22. patching file drivers/mmc/core/core.c
  23. patching file drivers/mmc/host/sdhci-acpi.c
  24. Hunk #3 FAILED at 70.
  25. Hunk #4 succeeded at 106 (offset 2 lines).
  26. Hunk #5 FAILED at 209.
  27. Hunk #6 FAILED at 360.
  28. 3 out of 6 hunks FAILED -- saving rejects to file drivers/mmc/host/sdhci-acpi.c.rej
  29. patching file drivers/mmc/host/sdhci.c
  30. Hunk #3 succeeded at 982 (offset 9 lines).
  31. Hunk #4 succeeded at 1247 (offset 9 lines).
  32. Hunk #5 succeeded at 1291 (offset 9 lines).
  33. Hunk #6 succeeded at 1319 (offset 9 lines).
  34. Hunk #7 succeeded at 1884 (offset 22 lines).
  35. Hunk #8 succeeded at 1942 (offset 22 lines).
  36. Hunk #9 succeeded at 1992 (offset 22 lines).
  37. Hunk #10 succeeded at 2028 (offset 22 lines).
  38. Hunk #11 succeeded at 2141 (offset 22 lines).
  39. Hunk #12 succeeded at 2212 (offset 22 lines).
  40. Hunk #13 succeeded at 2675 (offset 42 lines).
  41. Hunk #14 succeeded at 2777 (offset 42 lines).
  42. Hunk #15 succeeded at 2802 (offset 42 lines).
  43. Hunk #16 succeeded at 2863 (offset 42 lines).
  44. Hunk #17 succeeded at 2974 (offset 44 lines).
  45. Hunk #18 succeeded at 3206 (offset 53 lines).
  46. Hunk #19 succeeded at 3474 (offset 53 lines).
  47. patching file drivers/mmc/host/sdhci.h
  48. Hunk #1 succeeded at 253 (offset 1 line).
  49. Hunk #2 succeeded at 298 (offset 4 lines).
  50. patching file drivers/pinctrl/pinctrl-baytrail.c
  51. patching file include/linux/mfd/intel_mid_pmic.h
  52. patching file include/linux/mmc/host.h
  53. Hunk #2 succeeded at 376 with fuzz 2 (offset 10 lines).
  54. patching file include/linux/mmc/sdhci.h
  55. Hunk #1 FAILED at 98.
  56. 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mmc/sdhci.h.rej
  57.  
  58.  
  59.  
  60. //REJECTS
  61.  
  62.  
  63.  
  64. //$ cat ./drivers/gpu/drm/i915/intel_panel.c.rej
  65.  
  66. --- drivers/gpu/drm/i915/intel_panel.c
  67. +++ drivers/gpu/drm/i915/intel_panel.c
  68. @@ -1209,6 +1215,10 @@
  69.     enum pipe pipe;
  70.     u32 ctl, ctl2, val;
  71.  
  72. +   panel->backlight.enabled=1;
  73. +
  74. +        return 0;
  75. +
  76.     for_each_pipe(pipe) {
  77.         u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe));
  78.  
  79.  
  80.  
  81.  
  82.  
  83.  
  84. //$ cat ./drivers/mmc/host/sdhci-acpi.c.rej
  85.  
  86. --- drivers/mmc/host/sdhci-acpi.c
  87. +++ drivers/mmc/host/sdhci-acpi.c
  88. @@ -70,6 +73,7 @@
  89.     unsigned int    caps2;
  90.     mmc_pm_flag_t   pm_caps;
  91.     unsigned int    flags;
  92. +   int     (*probe_slot)(struct platform_device *pdev);
  93.  };
  94.  
  95.  struct sdhci_acpi_host {
  96. @@ -209,17 +293,19 @@
  97.     .chip    = &sdhci_acpi_chip_int,
  98.     .caps    = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
  99.            MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR,
  100. -   .caps2   = MMC_CAP2_HC_ERASE_SZ,
  101. +   .caps2   = MMC_CAP2_HC_ERASE_SZ | MMC_CAP2_HS200_1_8V_SDR,
  102.     .flags   = SDHCI_ACPI_RUNTIME_PM,
  103. -   .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
  104. +   .quirks2 = SDHCI_QUIRK2_CARD_CD_DELAY | SDHCI_QUIRK2_WAIT_FOR_IDLE |
  105. +       SDHCI_QUIRK2_PRESET_VALUE_BROKEN | SDHCI_QUIRK2_TUNING_POLL,
  106. +        .probe_slot = sdhci_acpi_emmc_probe_slot,
  107.  };
  108.  
  109.  static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
  110.     .quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
  111. -   .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
  112. +        .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON | SDHCI_QUIRK2_BROKEN_POWER_ENABLE,
  113.     .caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
  114. -   .flags   = SDHCI_ACPI_RUNTIME_PM,
  115. -   .pm_caps = MMC_PM_KEEP_POWER,
  116. +   .flags   = 0,//SDHCI_ACPI_RUNTIME_PM,
  117. +   .pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ,
  118.  };
  119.  
  120.  static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = {
  121. @@ -360,6 +446,12 @@
  122.     }
  123.  
  124.     if (c->slot) {
  125. +                if (c->slot->probe_slot) {
  126. +                        err = c->slot->probe_slot(pdev);
  127. +                        if (err)
  128. +                                goto err_free;
  129. +                }
  130. +
  131.         if (c->slot->chip) {
  132.             host->ops            = c->slot->chip->ops;
  133.             host->quirks        |= c->slot->chip->quirks;
  134.  
  135.  
  136.  
  137.  
  138.  
  139.  
  140. //$ cat ./include/linux/mmc/sdhci.h.rej
  141.  
  142. --- include/linux/mmc/sdhci.h
  143. +++ include/linux/mmc/sdhci.h
  144. @@ -98,6 +98,19 @@
  145.  #define SDHCI_QUIRK2_BROKEN_HS200          (1<<6)
  146.  /* Controller does not support DDR50 */
  147.  #define SDHCI_QUIRK2_BROKEN_DDR50          (1<<7)
  148. +/* Controller cannot initialize power (must use GPIO instead) */
  149. +#define SDHCI_QUIRK2_BROKEN_POWER_ENABLE               (1<<8)
  150. +
  151. +#define SDHCI_QUIRK2_TUNING_SLEEP                       (1<<23)
  152. +#define SDHCI_QUIRK2_CARD_CD_DELAY                      (1<<24)
  153. +#define SDHCI_QUIRK2_WAIT_FOR_IDLE                      (1<<25)
  154. +/* BAD sd cd in HOST IC. This will cause system hang when removing SD */
  155. +#define SDHCI_QUIRK2_BAD_SD_CD                          (1<<26)
  156. +#define SDHCI_QUIRK2_POWER_PIN_GPIO_MODE                (1<<27)
  157. +#define SDHCI_QUIRK2_NON_STD_CIS   (1<<29)
  158. +#define SDHCI_QUIRK2_TUNING_POLL                        (1<<30)
  159. +
  160. +
  161.  
  162.     int irq;        /* Device IRQ */
  163.     void __iomem *ioaddr;   /* Mapped address */
RAW Paste Data