//PATCH OUTPUT



patching file drivers/gpu/drm/i915/i915_drv.h
Hunk #1 succeeded at 1691 (offset 67 lines).
patching file drivers/gpu/drm/i915/intel_dsi.c
Hunk #4 succeeded at 681 (offset 6 lines).
Hunk #5 succeeded at 797 (offset 6 lines).
patching file drivers/gpu/drm/i915/intel_panel.c
Hunk #7 succeeded at 925 (offset 2 lines).
Hunk #8 succeeded at 1022 (offset 22 lines).
Hunk #9 succeeded at 1036 (offset 22 lines).
Hunk #10 succeeded at 1045 with fuzz 1 (offset 22 lines).
Hunk #11 FAILED at 1209.
1 out of 11 hunks FAILED -- saving rejects to file drivers/gpu/drm/i915/intel_panel.c.rej
patching file drivers/hid/hid-rmi.c
Hunk #1 succeeded at 964 (offset 32 lines).
patching file drivers/mfd/Kconfig
patching file drivers/mfd/Makefile
patching file drivers/mfd/intel_mid_pmic.c
patching file drivers/mmc/core/core.c
patching file drivers/mmc/host/sdhci-acpi.c
Hunk #3 FAILED at 70.
Hunk #4 succeeded at 106 (offset 2 lines).
Hunk #5 FAILED at 209.
Hunk #6 FAILED at 360.
3 out of 6 hunks FAILED -- saving rejects to file drivers/mmc/host/sdhci-acpi.c.rej
patching file drivers/mmc/host/sdhci.c
Hunk #3 succeeded at 982 (offset 9 lines).
Hunk #4 succeeded at 1247 (offset 9 lines).
Hunk #5 succeeded at 1291 (offset 9 lines).
Hunk #6 succeeded at 1319 (offset 9 lines).
Hunk #7 succeeded at 1884 (offset 22 lines).
Hunk #8 succeeded at 1942 (offset 22 lines).
Hunk #9 succeeded at 1992 (offset 22 lines).
Hunk #10 succeeded at 2028 (offset 22 lines).
Hunk #11 succeeded at 2141 (offset 22 lines).
Hunk #12 succeeded at 2212 (offset 22 lines).
Hunk #13 succeeded at 2675 (offset 42 lines).
Hunk #14 succeeded at 2777 (offset 42 lines).
Hunk #15 succeeded at 2802 (offset 42 lines).
Hunk #16 succeeded at 2863 (offset 42 lines).
Hunk #17 succeeded at 2974 (offset 44 lines).
Hunk #18 succeeded at 3206 (offset 53 lines).
Hunk #19 succeeded at 3474 (offset 53 lines).
patching file drivers/mmc/host/sdhci.h
Hunk #1 succeeded at 253 (offset 1 line).
Hunk #2 succeeded at 298 (offset 4 lines).
patching file drivers/pinctrl/pinctrl-baytrail.c
patching file include/linux/mfd/intel_mid_pmic.h
patching file include/linux/mmc/host.h
Hunk #2 succeeded at 376 with fuzz 2 (offset 10 lines).
patching file include/linux/mmc/sdhci.h
Hunk #1 FAILED at 98.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/mmc/sdhci.h.rej



//REJECTS



//$ cat ./drivers/gpu/drm/i915/intel_panel.c.rej

--- drivers/gpu/drm/i915/intel_panel.c
+++ drivers/gpu/drm/i915/intel_panel.c
@@ -1209,6 +1215,10 @@
    enum pipe pipe;
    u32 ctl, ctl2, val;

+   panel->backlight.enabled=1;
+
+        return 0;
+
    for_each_pipe(pipe) {
        u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe));






//$ cat ./drivers/mmc/host/sdhci-acpi.c.rej

--- drivers/mmc/host/sdhci-acpi.c
+++ drivers/mmc/host/sdhci-acpi.c
@@ -70,6 +73,7 @@
    unsigned int    caps2;
    mmc_pm_flag_t   pm_caps;
    unsigned int    flags;
+   int     (*probe_slot)(struct platform_device *pdev);
 };

 struct sdhci_acpi_host {
@@ -209,17 +293,19 @@
    .chip    = &sdhci_acpi_chip_int,
    .caps    = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
           MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR,
-   .caps2   = MMC_CAP2_HC_ERASE_SZ,
+   .caps2   = MMC_CAP2_HC_ERASE_SZ | MMC_CAP2_HS200_1_8V_SDR,
    .flags   = SDHCI_ACPI_RUNTIME_PM,
-   .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+   .quirks2 = SDHCI_QUIRK2_CARD_CD_DELAY | SDHCI_QUIRK2_WAIT_FOR_IDLE |
+       SDHCI_QUIRK2_PRESET_VALUE_BROKEN | SDHCI_QUIRK2_TUNING_POLL,
+        .probe_slot = sdhci_acpi_emmc_probe_slot,
 };

 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
    .quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
-   .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
+        .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON | SDHCI_QUIRK2_BROKEN_POWER_ENABLE,
    .caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
-   .flags   = SDHCI_ACPI_RUNTIME_PM,
-   .pm_caps = MMC_PM_KEEP_POWER,
+   .flags   = 0,//SDHCI_ACPI_RUNTIME_PM,
+   .pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ,
 };

 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = {
@@ -360,6 +446,12 @@
    }

    if (c->slot) {
+                if (c->slot->probe_slot) {
+                        err = c->slot->probe_slot(pdev);
+                        if (err)
+                                goto err_free;
+                }
+
        if (c->slot->chip) {
            host->ops            = c->slot->chip->ops;
            host->quirks        |= c->slot->chip->quirks;






//$ cat ./include/linux/mmc/sdhci.h.rej

--- include/linux/mmc/sdhci.h
+++ include/linux/mmc/sdhci.h
@@ -98,6 +98,19 @@
 #define SDHCI_QUIRK2_BROKEN_HS200          (1<<6)
 /* Controller does not support DDR50 */
 #define SDHCI_QUIRK2_BROKEN_DDR50          (1<<7)
+/* Controller cannot initialize power (must use GPIO instead) */
+#define SDHCI_QUIRK2_BROKEN_POWER_ENABLE               (1<<8)
+
+#define SDHCI_QUIRK2_TUNING_SLEEP                       (1<<23)
+#define SDHCI_QUIRK2_CARD_CD_DELAY                      (1<<24)
+#define SDHCI_QUIRK2_WAIT_FOR_IDLE                      (1<<25)
+/* BAD sd cd in HOST IC. This will cause system hang when removing SD */
+#define SDHCI_QUIRK2_BAD_SD_CD                          (1<<26)
+#define SDHCI_QUIRK2_POWER_PIN_GPIO_MODE                (1<<27)
+#define SDHCI_QUIRK2_NON_STD_CIS   (1<<29)
+#define SDHCI_QUIRK2_TUNING_POLL                        (1<<30)
+
+

    int irq;        /* Device IRQ */
    void __iomem *ioaddr;   /* Mapped address */