Update KERNEL_VERSION to 3.10.107
diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index aeac766..9c6e5ab 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.10.102
+3.10.107
diff --git a/patches.baytrail/0001-xhci-Refactor-port-status-into-a-new-function.patch b/patches.baytrail/0001-xhci-Refactor-port-status-into-a-new-function.patch
index c5b839e..18ff0a8 100644
--- a/patches.baytrail/0001-xhci-Refactor-port-status-into-a-new-function.patch
+++ b/patches.baytrail/0001-xhci-Refactor-port-status-into-a-new-function.patch
@@ -15,7 +15,7 @@
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
-@@ -539,6 +539,118 @@ void xhci_del_comp_mod_timer(struct xhci
+@@ -542,6 +542,118 @@ void xhci_del_comp_mod_timer(struct xhci
}
}
@@ -134,7 +134,7 @@
int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
u16 wIndex, char *buf, u16 wLength)
{
-@@ -603,104 +715,20 @@ int xhci_hub_control(struct usb_hcd *hcd
+@@ -606,104 +718,20 @@ int xhci_hub_control(struct usb_hcd *hcd
if (!wIndex || wIndex > max_ports)
goto error;
wIndex--;
diff --git a/patches.baytrail/0002-usb-Fix-xHCI-host-issues-on-remote-wakeup.patch b/patches.baytrail/0002-usb-Fix-xHCI-host-issues-on-remote-wakeup.patch
index 04dda39..87afd28 100644
--- a/patches.baytrail/0002-usb-Fix-xHCI-host-issues-on-remote-wakeup.patch
+++ b/patches.baytrail/0002-usb-Fix-xHCI-host-issues-on-remote-wakeup.patch
@@ -54,7 +54,7 @@
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
-@@ -547,11 +547,15 @@ void xhci_del_comp_mod_timer(struct xhci
+@@ -550,11 +550,15 @@ void xhci_del_comp_mod_timer(struct xhci
* - Mark a port as being done with device resume,
* and ring the endpoint doorbells.
* - Stop the Synopsys redriver Compliance Mode polling.
@@ -71,7 +71,7 @@
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
u32 status = 0;
-@@ -586,21 +590,42 @@ static u32 xhci_get_port_status(struct u
+@@ -589,21 +593,42 @@ static u32 xhci_get_port_status(struct u
return 0xffffffff;
if (time_after_eq(jiffies,
bus_state->resume_done[wIndex])) {
@@ -122,7 +122,7 @@
bus_state->port_c_suspend |= 1 << wIndex;
bus_state->suspended_ports &= ~(1 << wIndex);
} else {
-@@ -721,7 +746,7 @@ int xhci_hub_control(struct usb_hcd *hcd
+@@ -724,7 +749,7 @@ int xhci_hub_control(struct usb_hcd *hcd
break;
}
status = xhci_get_port_status(hcd, bus_state, port_array,
@@ -133,7 +133,7 @@
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
-@@ -2453,6 +2453,8 @@ int xhci_mem_init(struct xhci_hcd *xhci,
+@@ -2487,6 +2487,8 @@ int xhci_mem_init(struct xhci_hcd *xhci,
for (i = 0; i < USB_MAXCHILDREN; ++i) {
xhci->bus_state[0].resume_done[i] = 0;
xhci->bus_state[1].resume_done[i] = 0;
diff --git a/patches.baytrail/0003-usb-xhci-check-usb2-port-capabilities-before-adding-.patch b/patches.baytrail/0003-usb-xhci-check-usb2-port-capabilities-before-adding-.patch
index 41bb64b..91ada7c 100644
--- a/patches.baytrail/0003-usb-xhci-check-usb2-port-capabilities-before-adding-.patch
+++ b/patches.baytrail/0003-usb-xhci-check-usb2-port-capabilities-before-adding-.patch
@@ -28,7 +28,7 @@
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
-@@ -1860,6 +1860,7 @@ no_bw:
+@@ -1894,6 +1894,7 @@ no_bw:
kfree(xhci->usb3_ports);
kfree(xhci->port_array);
kfree(xhci->rh_bw);
@@ -36,7 +36,7 @@
xhci->usb2_ports = NULL;
xhci->usb3_ports = NULL;
-@@ -2052,7 +2053,7 @@ static void xhci_set_hc_event_deq(struct
+@@ -2086,7 +2087,7 @@ static void xhci_set_hc_event_deq(struct
}
static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports,
@@ -45,7 +45,7 @@
{
u32 temp, port_offset, port_count;
int i;
-@@ -2077,6 +2078,10 @@ static void xhci_add_in_port(struct xhci
+@@ -2111,6 +2112,10 @@ static void xhci_add_in_port(struct xhci
/* WTF? "Valid values are ‘1’ to MaxPorts" */
return;
@@ -56,7 +56,7 @@
/* Check the host's USB2 LPM capability */
if ((xhci->hci_version == 0x96) && (major_revision != 0x03) &&
(temp & XHCI_L1C)) {
-@@ -2134,10 +2139,11 @@ static void xhci_add_in_port(struct xhci
+@@ -2168,10 +2173,11 @@ static void xhci_add_in_port(struct xhci
*/
static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
{
@@ -70,7 +70,7 @@
addr = &xhci->cap_regs->hcc_params;
offset = XHCI_HCC_EXT_CAPS(xhci_readl(xhci, addr));
-@@ -2170,13 +2176,32 @@ static int xhci_setup_port_arrays(struct
+@@ -2204,13 +2210,32 @@ static int xhci_setup_port_arrays(struct
* See section 5.3.6 for offset calculation.
*/
addr = &xhci->cap_regs->hc_capbase + offset;
@@ -106,7 +106,7 @@
== num_ports)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -4063,15 +4063,40 @@ int xhci_set_usb2_hardware_lpm(struct us
+@@ -4065,15 +4065,40 @@ int xhci_set_usb2_hardware_lpm(struct us
return 0;
}
@@ -150,7 +150,7 @@
if (!ret)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
-@@ -1548,6 +1548,9 @@ struct xhci_hcd {
+@@ -1549,6 +1549,9 @@ struct xhci_hcd {
unsigned sw_lpm_support:1;
/* support xHCI 1.0 spec USB2 hardware LPM */
unsigned hw_lpm_support:1;
diff --git a/patches.baytrail/0004-usb-xhci-define-port-register-names-and-use-them-ins.patch b/patches.baytrail/0004-usb-xhci-define-port-register-names-and-use-them-ins.patch
index fba3ad3..ce942d2 100644
--- a/patches.baytrail/0004-usb-xhci-define-port-register-names-and-use-them-ins.patch
+++ b/patches.baytrail/0004-usb-xhci-define-port-register-names-and-use-them-ins.patch
@@ -23,7 +23,7 @@
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
-@@ -925,18 +925,18 @@ int xhci_hub_control(struct usb_hcd *hcd
+@@ -928,18 +928,18 @@ int xhci_hub_control(struct usb_hcd *hcd
case USB_PORT_FEAT_U1_TIMEOUT:
if (hcd->speed != HCD_USB3)
goto error;
@@ -46,7 +46,7 @@
break;
default:
goto error;
-@@ -1156,10 +1156,8 @@ int xhci_bus_suspend(struct usb_hcd *hcd
+@@ -1159,10 +1159,8 @@ int xhci_bus_suspend(struct usb_hcd *hcd
__le32 __iomem *addr;
u32 tmp;
@@ -59,7 +59,7 @@
tmp = xhci_readl(xhci, addr);
tmp |= PORT_RWE;
xhci_writel(xhci, tmp, addr);
-@@ -1251,7 +1249,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
+@@ -1254,7 +1252,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
/* Add one to the port status register address to get
* the port power control register address.
*/
@@ -70,7 +70,7 @@
xhci_writel(xhci, tmp, addr);
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3941,7 +3941,7 @@ static int xhci_usb2_software_lpm_test(s
+@@ -3943,7 +3943,7 @@ static int xhci_usb2_software_lpm_test(s
* Check device's USB 2.0 extension descriptor to determine whether
* HIRD or BESL shoule be used. See USB2.0 LPM errata.
*/
@@ -79,7 +79,7 @@
hird = xhci_calculate_hird_besl(xhci, udev);
temp = PORT_L1DS(udev->slot_id) | PORT_HIRD(hird);
xhci_writel(xhci, temp, pm_addr);
-@@ -4039,7 +4039,7 @@ int xhci_set_usb2_hardware_lpm(struct us
+@@ -4041,7 +4041,7 @@ int xhci_set_usb2_hardware_lpm(struct us
port_array = xhci->usb2_ports;
port_num = udev->portnum - 1;
diff --git a/patches.baytrail/0005-usb-xhci-add-USB2-Link-power-management-BESL-support.patch b/patches.baytrail/0005-usb-xhci-add-USB2-Link-power-management-BESL-support.patch
index d010f23..50f45cc 100644
--- a/patches.baytrail/0005-usb-xhci-add-USB2-Link-power-management-BESL-support.patch
+++ b/patches.baytrail/0005-usb-xhci-add-USB2-Link-power-management-BESL-support.patch
@@ -41,7 +41,7 @@
/* start/stop HC execution - do not write unless HC is halted*/
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3845,6 +3845,64 @@ int xhci_find_raw_port_number(struct usb
+@@ -3847,6 +3847,64 @@ int xhci_find_raw_port_number(struct usb
return raw_port;
}
@@ -106,7 +106,7 @@
#ifdef CONFIG_PM_RUNTIME
/* BESL to HIRD Encoding array for USB2 LPM */
-@@ -3886,6 +3944,28 @@ static int xhci_calculate_hird_besl(stru
+@@ -3888,6 +3946,28 @@ static int xhci_calculate_hird_besl(stru
return besl;
}
@@ -135,7 +135,7 @@
static int xhci_usb2_software_lpm_test(struct usb_hcd *hcd,
struct usb_device *udev)
{
-@@ -4018,11 +4098,12 @@ int xhci_set_usb2_hardware_lpm(struct us
+@@ -4020,11 +4100,12 @@ int xhci_set_usb2_hardware_lpm(struct us
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
__le32 __iomem **port_array;
@@ -151,7 +151,7 @@
if (hcd->speed == HCD_USB3 || !xhci->hw_lpm_support ||
!udev->lpm_capable)
-@@ -4040,23 +4121,73 @@ int xhci_set_usb2_hardware_lpm(struct us
+@@ -4042,23 +4123,73 @@ int xhci_set_usb2_hardware_lpm(struct us
port_array = xhci->usb2_ports;
port_num = udev->portnum - 1;
pm_addr = port_array[port_num] + PORTPMSC;
@@ -236,7 +236,7 @@
}
spin_unlock_irqrestore(&xhci->lock, flags);
-@@ -4098,6 +4229,9 @@ int xhci_update_device(struct usb_hcd *h
+@@ -4100,6 +4231,9 @@ int xhci_update_device(struct usb_hcd *h
if (xhci->hw_lpm_support == 1 &&
xhci_check_usb2_port_capability(xhci, portnum, XHCI_HLC)) {
udev->usb2_hw_lpm_capable = 1;
@@ -246,7 +246,7 @@
ret = xhci_set_usb2_hardware_lpm(hcd, udev, 1);
if (!ret)
udev->usb2_hw_lpm_enabled = 1;
-@@ -4428,64 +4562,6 @@ static u16 xhci_calculate_lpm_timeout(st
+@@ -4430,64 +4564,6 @@ static u16 xhci_calculate_lpm_timeout(st
return timeout;
}
diff --git a/patches.baytrail/0006-usb-add-usb2-Link-PM-variables-to-sysfs-and-usb_devi.patch b/patches.baytrail/0006-usb-add-usb2-Link-PM-variables-to-sysfs-and-usb_devi.patch
index 79af168..de7dac6 100644
--- a/patches.baytrail/0006-usb-add-usb2-Link-PM-variables-to-sysfs-and-usb_devi.patch
+++ b/patches.baytrail/0006-usb-add-usb2-Link-PM-variables-to-sysfs-and-usb_devi.patch
@@ -127,7 +127,7 @@
static struct attribute_group usb2_hardware_lpm_attr_group = {
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3955,7 +3955,7 @@ static int xhci_calculate_usb2_hw_lpm_pa
+@@ -3957,7 +3957,7 @@ static int xhci_calculate_usb2_hw_lpm_pa
field = le32_to_cpu(udev->bos->ext_cap->bmAttributes);
/* xHCI l1 is set in steps of 256us, xHCI 1.0 section 5.4.11.2 */
@@ -136,7 +136,7 @@
/* device has preferred BESLD */
if (field & USB_BESL_DEEP_VALID) {
-@@ -4139,7 +4139,7 @@ int xhci_set_usb2_hardware_lpm(struct us
+@@ -4141,7 +4141,7 @@ int xhci_set_usb2_hardware_lpm(struct us
(field & USB_BESL_BASELINE_VALID))
hird = USB_GET_BESL_BASELINE(field);
else
@@ -145,7 +145,7 @@
exit_latency = xhci_besl_encoding[hird];
spin_unlock_irqrestore(&xhci->lock, flags);
-@@ -4229,6 +4229,8 @@ int xhci_update_device(struct usb_hcd *h
+@@ -4231,6 +4231,8 @@ int xhci_update_device(struct usb_hcd *h
if (xhci->hw_lpm_support == 1 &&
xhci_check_usb2_port_capability(xhci, portnum, XHCI_HLC)) {
udev->usb2_hw_lpm_capable = 1;
diff --git a/patches.baytrail/0008-usb-Don-t-enable-USB-2.0-Link-PM-by-default.patch b/patches.baytrail/0008-usb-Don-t-enable-USB-2.0-Link-PM-by-default.patch
index c1e12cd..b135586 100644
--- a/patches.baytrail/0008-usb-Don-t-enable-USB-2.0-Link-PM-by-default.patch
+++ b/patches.baytrail/0008-usb-Don-t-enable-USB-2.0-Link-PM-by-default.patch
@@ -97,7 +97,7 @@
if (!ret)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5253,6 +5253,7 @@ static int usb_reset_and_verify_device(s
+@@ -5277,6 +5277,7 @@ static int usb_reset_and_verify_device(s
done:
/* Now that the alt settings are re-installed, enable LTM and LPM. */
@@ -130,7 +130,7 @@
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
-@@ -1763,9 +1763,7 @@ void xhci_free_command(struct xhci_hcd *
+@@ -1797,9 +1797,7 @@ void xhci_free_command(struct xhci_hcd *
void xhci_mem_cleanup(struct xhci_hcd *xhci)
{
struct pci_dev *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
@@ -140,7 +140,7 @@
int size;
int i, j, num_ports;
-@@ -1834,13 +1832,6 @@ void xhci_mem_cleanup(struct xhci_hcd *x
+@@ -1868,13 +1866,6 @@ void xhci_mem_cleanup(struct xhci_hcd *x
scratchpad_free(xhci);
@@ -154,7 +154,7 @@
if (!xhci->rh_bw)
goto no_bw;
-@@ -2294,7 +2285,6 @@ int xhci_mem_init(struct xhci_hcd *xhci,
+@@ -2328,7 +2319,6 @@ int xhci_mem_init(struct xhci_hcd *xhci,
u32 page_size, temp;
int i;
@@ -164,7 +164,7 @@
page_size = xhci_readl(xhci, &xhci->op_regs->page_size);
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3966,133 +3966,6 @@ static int xhci_calculate_usb2_hw_lpm_pa
+@@ -3968,133 +3968,6 @@ static int xhci_calculate_usb2_hw_lpm_pa
return PORT_BESLD(besld) | PORT_L1_TIMEOUT(l1) | PORT_HIRDM(hirdm);
}
@@ -298,7 +298,7 @@
int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
struct usb_device *udev, int enable)
{
-@@ -4220,24 +4093,26 @@ static int xhci_check_usb2_port_capabili
+@@ -4222,24 +4095,26 @@ static int xhci_check_usb2_port_capabili
int xhci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
diff --git a/patches.baytrail/0150-drm-i915-Organize-VBT-stuff-inside-drm_i915_private.patch b/patches.baytrail/0150-drm-i915-Organize-VBT-stuff-inside-drm_i915_private.patch
index 2c5f32e..fb3e495 100644
--- a/patches.baytrail/0150-drm-i915-Organize-VBT-stuff-inside-drm_i915_private.patch
+++ b/patches.baytrail/0150-drm-i915-Organize-VBT-stuff-inside-drm_i915_private.patch
@@ -385,7 +385,7 @@
static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -435,7 +435,7 @@ static bool intel_crt_detect_ddc(struct
+@@ -436,7 +436,7 @@ static bool intel_crt_detect_ddc(struct
BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
@@ -394,7 +394,7 @@
edid = intel_crt_get_edid(connector, i2c);
if (edid) {
-@@ -641,7 +641,7 @@ static int intel_crt_get_modes(struct dr
+@@ -642,7 +642,7 @@ static int intel_crt_get_modes(struct dr
int ret;
struct i2c_adapter *i2c;
diff --git a/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch b/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
index 2213644..4b0709e 100644
--- a/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
+++ b/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
@@ -69,7 +69,7 @@
/* Note: The caller is required to filter out dpms modes not supported by the
* platform. */
static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
-@@ -786,6 +808,7 @@ void intel_crt_init(struct drm_device *d
+@@ -787,6 +809,7 @@ void intel_crt_init(struct drm_device *d
crt->base.compute_config = intel_crt_compute_config;
crt->base.disable = intel_disable_crt;
crt->base.enable = intel_enable_crt;
diff --git a/patches.baytrail/0510-drm-i915-Add-some-debug-breadcrumbs-to-connector-det.patch b/patches.baytrail/0510-drm-i915-Add-some-debug-breadcrumbs-to-connector-det.patch
index e3154e8..d92f069 100644
--- a/patches.baytrail/0510-drm-i915-Add-some-debug-breadcrumbs-to-connector-det.patch
+++ b/patches.baytrail/0510-drm-i915-Add-some-debug-breadcrumbs-to-connector-det.patch
@@ -25,7 +25,7 @@
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -613,6 +613,10 @@ intel_crt_detect(struct drm_connector *c
+@@ -614,6 +614,10 @@ intel_crt_detect(struct drm_connector *c
enum drm_connector_status status;
struct intel_load_detect_pipe tmp;
diff --git a/patches.baytrail/0522-drm-ttm-convert-to-unified-vma-offset-manager.patch b/patches.baytrail/0522-drm-ttm-convert-to-unified-vma-offset-manager.patch
index 93e8727..df36c51 100644
--- a/patches.baytrail/0522-drm-ttm-convert-to-unified-vma-offset-manager.patch
+++ b/patches.baytrail/0522-drm-ttm-convert-to-unified-vma-offset-manager.patch
@@ -52,7 +52,7 @@
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
-@@ -488,7 +488,7 @@ void ast_gem_free_object(struct drm_gem_
+@@ -491,7 +491,7 @@ void ast_gem_free_object(struct drm_gem_
static inline u64 ast_bo_mmap_offset(struct ast_bo *bo)
{
diff --git a/patches.baytrail/0543-drm-i915-crt-use-native-encoder-mode_set-callback.patch b/patches.baytrail/0543-drm-i915-crt-use-native-encoder-mode_set-callback.patch
index 49bf7af..f0e4c54 100644
--- a/patches.baytrail/0543-drm-i915-crt-use-native-encoder-mode_set-callback.patch
+++ b/patches.baytrail/0543-drm-i915-crt-use-native-encoder-mode_set-callback.patch
@@ -77,7 +77,7 @@
I915_WRITE(crt->adpa_reg, adpa);
}
-@@ -711,10 +707,6 @@ static void intel_crt_reset(struct drm_c
+@@ -712,10 +708,6 @@ static void intel_crt_reset(struct drm_c
* Routines for controlling stuff on the analog port
*/
@@ -88,7 +88,7 @@
static const struct drm_connector_funcs intel_crt_connector_funcs = {
.reset = intel_crt_reset,
.dpms = intel_crt_dpms,
-@@ -812,6 +804,7 @@ void intel_crt_init(struct drm_device *d
+@@ -813,6 +805,7 @@ void intel_crt_init(struct drm_device *d
crt->adpa_reg = ADPA;
crt->base.compute_config = intel_crt_compute_config;
@@ -96,7 +96,7 @@
crt->base.disable = intel_disable_crt;
crt->base.enable = intel_enable_crt;
crt->base.get_config = intel_crt_get_config;
-@@ -823,7 +816,6 @@ void intel_crt_init(struct drm_device *d
+@@ -824,7 +817,6 @@ void intel_crt_init(struct drm_device *d
crt->base.get_hw_state = intel_crt_get_hw_state;
intel_connector->get_hw_state = intel_connector_get_hw_state;
diff --git a/patches.baytrail/0596-drm-gem-create-drm_gem_dumb_destroy.patch b/patches.baytrail/0596-drm-gem-create-drm_gem_dumb_destroy.patch
index 06282f4..9382106 100644
--- a/patches.baytrail/0596-drm-gem-create-drm_gem_dumb_destroy.patch
+++ b/patches.baytrail/0596-drm-gem-create-drm_gem_dumb_destroy.patch
@@ -101,7 +101,7 @@
extern void ast_gem_free_object(struct drm_gem_object *obj);
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
-@@ -450,13 +450,6 @@ int ast_dumb_create(struct drm_file *fil
+@@ -453,13 +453,6 @@ int ast_dumb_create(struct drm_file *fil
return 0;
}
diff --git a/patches.baytrail/0727-gpu-vga_switcheroo-add-driver-control-power-feature..patch b/patches.baytrail/0727-gpu-vga_switcheroo-add-driver-control-power-feature..patch
index ed01c7a..ec6dbda 100644
--- a/patches.baytrail/0727-gpu-vga_switcheroo-add-driver-control-power-feature..patch
+++ b/patches.baytrail/0727-gpu-vga_switcheroo-add-driver-control-power-feature..patch
@@ -60,7 +60,7 @@
void
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -1169,7 +1169,7 @@ int radeon_device_init(struct radeon_dev
+@@ -1190,7 +1190,7 @@ int radeon_device_init(struct radeon_dev
/* this will fail for cards that aren't VGA class devices, just
* ignore it */
vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
diff --git a/patches.baytrail/0738-drm-Pass-page-flip-ioctl-flags-to-driver.patch b/patches.baytrail/0738-drm-Pass-page-flip-ioctl-flags-to-driver.patch
index b86b618..ee9673d 100644
--- a/patches.baytrail/0738-drm-Pass-page-flip-ioctl-flags-to-driver.patch
+++ b/patches.baytrail/0738-drm-Pass-page-flip-ioctl-flags-to-driver.patch
@@ -36,7 +36,7 @@
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
-@@ -3524,7 +3524,7 @@ int drm_mode_page_flip_ioctl(struct drm_
+@@ -3527,7 +3527,7 @@ int drm_mode_page_flip_ioctl(struct drm_
}
old_fb = crtc->fb;
diff --git a/patches.baytrail/0744-drm-i915-Apply-the-force-detect-VGA-w-a-to-Valleyvie.patch b/patches.baytrail/0744-drm-i915-Apply-the-force-detect-VGA-w-a-to-Valleyvie.patch
index fbbbeca..e1ccbbb 100644
--- a/patches.baytrail/0744-drm-i915-Apply-the-force-detect-VGA-w-a-to-Valleyvie.patch
+++ b/patches.baytrail/0744-drm-i915-Apply-the-force-detect-VGA-w-a-to-Valleyvie.patch
@@ -17,14 +17,12 @@
(cherry picked from commit 10603caacf599297c7da0c4f4db440d015b8131a)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
- drivers/gpu/drm/i915/intel_crt.c | 2 +-
+ drivers/gpu/drm/i915/intel_crt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index b5a3875f22c7..ea9022ef15d5 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -688,7 +688,7 @@ static void intel_crt_reset(struct drm_connector *connector)
+@@ -689,7 +689,7 @@ static void intel_crt_reset(struct drm_c
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crt *crt = intel_attached_crt(connector);
@@ -33,6 +31,3 @@
u32 adpa;
adpa = I915_READ(crt->adpa_reg);
---
-1.8.5.rc3
-
diff --git a/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch b/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
index ecf5019..63eb097 100644
--- a/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
+++ b/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
@@ -85,7 +85,7 @@
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -772,7 +772,7 @@ void intel_crt_init(struct drm_device *d
+@@ -773,7 +773,7 @@ void intel_crt_init(struct drm_device *d
if (!crt)
return;
diff --git a/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch b/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
index 0798b9d..ec7aaa1 100644
--- a/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
+++ b/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
@@ -83,7 +83,7 @@
/* Note: The caller is required to filter out dpms modes not supported by the
* platform. */
static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
-@@ -812,7 +831,10 @@ void intel_crt_init(struct drm_device *d
+@@ -813,7 +832,10 @@ void intel_crt_init(struct drm_device *d
crt->base.mode_set = intel_crt_mode_set;
crt->base.disable = intel_disable_crt;
crt->base.enable = intel_enable_crt;
diff --git a/patches.baytrail/0960-drm-i915-destroy-connector-sysfs-files-earlier.patch b/patches.baytrail/0960-drm-i915-destroy-connector-sysfs-files-earlier.patch
index 80e5fb7..7c22d13 100644
--- a/patches.baytrail/0960-drm-i915-destroy-connector-sysfs-files-earlier.patch
+++ b/patches.baytrail/0960-drm-i915-destroy-connector-sysfs-files-earlier.patch
@@ -49,7 +49,7 @@
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -677,7 +677,6 @@ intel_crt_detect(struct drm_connector *c
+@@ -678,7 +678,6 @@ intel_crt_detect(struct drm_connector *c
static void intel_crt_destroy(struct drm_connector *connector)
{
diff --git a/patches.baytrail/1001-drm-Remove-pci_vendor-and-pci_device-from-struct-drm.patch b/patches.baytrail/1001-drm-Remove-pci_vendor-and-pci_device-from-struct-drm.patch
index 7ae20eb..b8c7b47 100644
--- a/patches.baytrail/1001-drm-Remove-pci_vendor-and-pci_device-from-struct-drm.patch
+++ b/patches.baytrail/1001-drm-Remove-pci_vendor-and-pci_device-from-struct-drm.patch
@@ -232,7 +232,7 @@
uint32_t mpllP;
pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP);
-@@ -230,7 +230,7 @@ nouveau_hw_get_clock(struct drm_device *
+@@ -231,7 +231,7 @@ nouveau_hw_get_clock(struct drm_device *
return 400000 / mpllP;
} else
if (plltype == PLL_MEMORY &&
diff --git a/patches.baytrail/1141-mmc-sdhci-add-ability-to-stay-runtime-resumed-if-the.patch b/patches.baytrail/1141-mmc-sdhci-add-ability-to-stay-runtime-resumed-if-the.patch
index 1deb092..72b0380 100644
--- a/patches.baytrail/1141-mmc-sdhci-add-ability-to-stay-runtime-resumed-if-the.patch
+++ b/patches.baytrail/1141-mmc-sdhci-add-ability-to-stay-runtime-resumed-if-the.patch
@@ -56,7 +56,7 @@
/* Wait max 100 ms */
timeout = 100;
-@@ -1268,6 +1280,8 @@ static int sdhci_set_power(struct sdhci_
+@@ -1270,6 +1282,8 @@ static int sdhci_set_power(struct sdhci_
if (pwr == 0) {
sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
@@ -65,7 +65,7 @@
return 0;
}
-@@ -1289,6 +1303,9 @@ static int sdhci_set_power(struct sdhci_
+@@ -1291,6 +1305,9 @@ static int sdhci_set_power(struct sdhci_
sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
@@ -75,7 +75,7 @@
/*
* Some controllers need an extra 10ms delay of 10ms before they
* can apply clock after applying power
-@@ -2626,6 +2643,22 @@ static int sdhci_runtime_pm_put(struct s
+@@ -2628,6 +2645,22 @@ static int sdhci_runtime_pm_put(struct s
return pm_runtime_put_autosuspend(host->mmc->parent);
}
diff --git a/patches.baytrail/1151-Intel-xhci-refactor-EHCI-xHCI-port-switching.patch b/patches.baytrail/1151-Intel-xhci-refactor-EHCI-xHCI-port-switching.patch
index b754e35..2d2da41 100644
--- a/patches.baytrail/1151-Intel-xhci-refactor-EHCI-xHCI-port-switching.patch
+++ b/patches.baytrail/1151-Intel-xhci-refactor-EHCI-xHCI-port-switching.patch
@@ -176,7 +176,7 @@
static inline void usb_amd_quirk_pll_disable(void) {}
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -265,13 +265,15 @@ static int xhci_pci_resume(struct usb_hc
+@@ -266,13 +266,15 @@ static int xhci_pci_resume(struct usb_hc
* writers.
*
* Unconditionally switch the ports back to xHCI after a system resume.
diff --git a/patches.baytrail/1173-i2c-move-OF-helpers-into-the-core.patch b/patches.baytrail/1173-i2c-move-OF-helpers-into-the-core.patch
index e342505..8cd2d30 100644
--- a/patches.baytrail/1173-i2c-move-OF-helpers-into-the-core.patch
+++ b/patches.baytrail/1173-i2c-move-OF-helpers-into-the-core.patch
@@ -125,7 +125,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/platform_data/dma-atmel.h>
-@@ -831,8 +830,6 @@ static int at91_twi_probe(struct platfor
+@@ -889,8 +888,6 @@ static int at91_twi_probe(struct platfor
return rc;
}
diff --git a/patches.baytrail/1174-i2c-move-ACPI-helpers-into-the-core.patch b/patches.baytrail/1174-i2c-move-ACPI-helpers-into-the-core.patch
index 75798af..349482c 100644
--- a/patches.baytrail/1174-i2c-move-ACPI-helpers-into-the-core.patch
+++ b/patches.baytrail/1174-i2c-move-ACPI-helpers-into-the-core.patch
@@ -67,7 +67,7 @@
select THERMAL
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
-@@ -72,7 +72,6 @@ obj-$(CONFIG_ACPI_HED) += hed.o
+@@ -71,7 +71,6 @@ obj-$(CONFIG_ACPI_HED) += hed.o
obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o
obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
obj-$(CONFIG_ACPI_BGRT) += bgrt.o
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index e74e435..808d0fb 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 10
- SUBLEVEL = 102
+ SUBLEVEL = 107
-EXTRAVERSION =
+EXTRAVERSION = -ltsi
NAME = TOSSUG Baby Fish
diff --git a/patches.minnowboard/pci-add-circuitco-vendor-id-and-subsystem-id.patch b/patches.minnowboard/pci-add-circuitco-vendor-id-and-subsystem-id.patch
index 04ee875..082c9bb 100644
--- a/patches.minnowboard/pci-add-circuitco-vendor-id-and-subsystem-id.patch
+++ b/patches.minnowboard/pci-add-circuitco-vendor-id-and-subsystem-id.patch
@@ -21,7 +21,7 @@
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -2478,6 +2478,9 @@
+@@ -2485,6 +2485,9 @@
#define PCI_VENDOR_ID_ASMEDIA 0x1b21
diff --git a/patches.renesas/0224-usb-renesas_usbhs-gadget-remove-extra-check-on-udc_s.patch b/patches.renesas/0224-usb-renesas_usbhs-gadget-remove-extra-check-on-udc_s.patch
index a4b9521..5a0771a 100644
--- a/patches.renesas/0224-usb-renesas_usbhs-gadget-remove-extra-check-on-udc_s.patch
+++ b/patches.renesas/0224-usb-renesas_usbhs-gadget-remove-extra-check-on-udc_s.patch
@@ -16,14 +16,12 @@
(cherry picked from commit 8047806e64ea7b33fcede5b93f7276568a6119e8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
- drivers/usb/renesas_usbhs/mod_gadget.c | 4 ----
+ drivers/usb/renesas_usbhs/mod_gadget.c | 4 ----
1 file changed, 4 deletions(-)
-diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
-index ed4949faa70d..805940c37353 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
-@@ -855,10 +855,6 @@ static int usbhsg_gadget_stop(struct usb_gadget *gadget,
+@@ -862,10 +862,6 @@ static int usbhsg_gadget_stop(struct usb
struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
@@ -34,6 +32,3 @@
usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
gpriv->driver = NULL;
---
-1.8.5.rc3
-
diff --git a/patches.renesas/0552-sh-pfc-Rename-struct-sh_pfc-nr_pins-field-to-nr_gpio.patch b/patches.renesas/0552-sh-pfc-Rename-struct-sh_pfc-nr_pins-field-to-nr_gpio.patch
index 9d33d0f..83be665 100644
--- a/patches.renesas/0552-sh-pfc-Rename-struct-sh_pfc-nr_pins-field-to-nr_gpio.patch
+++ b/patches.renesas/0552-sh-pfc-Rename-struct-sh_pfc-nr_pins-field-to-nr_gpio.patch
@@ -13,13 +13,11 @@
(cherry picked from commit 28818fa5dadfd458fa7e17c8be26b2d7edffa8bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
- drivers/pinctrl/sh-pfc/core.h | 2 +-
- drivers/pinctrl/sh-pfc/gpio.c | 4 ++--
- drivers/pinctrl/sh-pfc/pinctrl.c | 2 +-
+ drivers/pinctrl/sh-pfc/core.h | 2 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 4 ++--
+ drivers/pinctrl/sh-pfc/pinctrl.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
-index f02ba1dd..93963a19 100644
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -34,7 +34,7 @@ struct sh_pfc {
@@ -31,11 +29,9 @@
struct sh_pfc_chip *gpio;
struct sh_pfc_chip *func;
-diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
-index 87ae38b9..7661be50 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
-@@ -245,7 +245,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
+@@ -245,7 +245,7 @@ static int gpio_pin_setup(struct sh_pfc_
gc->dev = pfc->dev;
gc->owner = THIS_MODULE;
gc->base = 0;
@@ -44,7 +40,7 @@
return 0;
}
-@@ -293,7 +293,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip)
+@@ -293,7 +293,7 @@ static int gpio_function_setup(struct sh
gc->label = pfc->info->name;
gc->owner = THIS_MODULE;
@@ -53,11 +49,9 @@
gc->ngpio = pfc->info->nr_func_gpios;
return 0;
-diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
-index bc8b028b..314255d7 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
-@@ -632,7 +632,7 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
+@@ -633,7 +633,7 @@ static int sh_pfc_map_pins(struct sh_pfc
}
}
@@ -66,6 +60,3 @@
return nr_ranges;
}
---
-1.8.4.3.gca3854a
-
diff --git a/patches.renesas/0553-sh-pfc-Compute-pin-ranges-automatically.patch b/patches.renesas/0553-sh-pfc-Compute-pin-ranges-automatically.patch
index fdb7d49..8855981 100644
--- a/patches.renesas/0553-sh-pfc-Compute-pin-ranges-automatically.patch
+++ b/patches.renesas/0553-sh-pfc-Compute-pin-ranges-automatically.patch
@@ -12,20 +12,18 @@
(cherry picked from commit acac8ed5e2aa2c0d364d06f364fd9ed0dc27d28a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
- drivers/pinctrl/sh-pfc/core.c | 70 +++++++++++++++++++++++++++++++-----
- drivers/pinctrl/sh-pfc/core.h | 8 +++++
- drivers/pinctrl/sh-pfc/gpio.c | 21 +++--------
- drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 17 ---------
- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 9 -----
- drivers/pinctrl/sh-pfc/pinctrl.c | 49 ++++++++-----------------
- drivers/pinctrl/sh-pfc/sh_pfc.h | 2 --
- 7 files changed, 88 insertions(+), 88 deletions(-)
+ drivers/pinctrl/sh-pfc/core.c | 70 +++++++++++++++++++++++++++++++----
+ drivers/pinctrl/sh-pfc/core.h | 8 ++++
+ drivers/pinctrl/sh-pfc/gpio.c | 21 ++--------
+ drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 17 --------
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 9 ----
+ drivers/pinctrl/sh-pfc/pinctrl.c | 51 +++++++------------------
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 2 -
+ 7 files changed, 89 insertions(+), 89 deletions(-)
-diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
-index 96b02246..cb47bcee 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
-@@ -82,17 +82,14 @@ int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin)
+@@ -82,17 +82,14 @@ int sh_pfc_get_pin_index(struct sh_pfc *
unsigned int offset;
unsigned int i;
@@ -48,7 +46,7 @@
}
return -EINVAL;
-@@ -341,6 +338,59 @@ int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type)
+@@ -341,6 +338,59 @@ int sh_pfc_config_mux(struct sh_pfc *pfc
return 0;
}
@@ -108,7 +106,7 @@
#ifdef CONFIG_OF
static const struct of_device_id sh_pfc_of_table[] = {
#ifdef CONFIG_PINCTRL_PFC_R8A73A4
-@@ -431,6 +481,10 @@ static int sh_pfc_probe(struct platform_device *pdev)
+@@ -431,6 +481,10 @@ static int sh_pfc_probe(struct platform_
pinctrl_provide_dummies();
@@ -119,8 +117,6 @@
/*
* Initialize pinctrl bindings first
*/
-diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
-index 93963a19..a1b23762 100644
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -25,6 +25,11 @@ struct sh_pfc_window {
@@ -145,11 +141,9 @@
unsigned int nr_gpio_pins;
struct sh_pfc_chip *gpio;
-diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
-index 7661be50..78fcb802 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
-@@ -334,10 +334,7 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc, int(*setup)(struct sh_pfc_chip *),
+@@ -334,10 +334,7 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc,
int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
{
@@ -160,7 +154,7 @@
unsigned int i;
int ret;
-@@ -368,23 +365,13 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
+@@ -368,23 +365,13 @@ int sh_pfc_register_gpiochip(struct sh_p
pfc->gpio = chip;
/* Register the GPIO to pin mappings. */
@@ -188,11 +182,9 @@
if (ret < 0)
return ret;
}
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
-index 04ecb5e9..05d96ae3 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
-@@ -1398,20 +1398,6 @@ static struct sh_pfc_pin pinmux_pins[] = {
+@@ -1398,20 +1398,6 @@ static struct sh_pfc_pin pinmux_pins[] =
R8A73A4_PIN_IO_PU_PD(328), R8A73A4_PIN_IO_PU_PD(329),
};
@@ -213,7 +205,7 @@
/* - IRQC ------------------------------------------------------------------- */
#define IRQC_PINS_MUX(pin, irq_mark) \
static const unsigned int irqc_irq##irq_mark##_pins[] = { \
-@@ -2756,9 +2742,6 @@ const struct sh_pfc_soc_info r8a73a4_pinmux_info = {
+@@ -2756,9 +2742,6 @@ const struct sh_pfc_soc_info r8a73a4_pin
.pins = pinmux_pins,
.nr_pins = ARRAY_SIZE(pinmux_pins),
@@ -223,11 +215,9 @@
.groups = pinmux_groups,
.nr_groups = ARRAY_SIZE(pinmux_groups),
.functions = pinmux_functions,
-diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
-index 918bad5f..6a26946d 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
-@@ -1446,13 +1446,6 @@ static struct sh_pfc_pin pinmux_pins[] = {
+@@ -1446,13 +1446,6 @@ static struct sh_pfc_pin pinmux_pins[] =
SH73A0_PIN_O(309),
};
@@ -241,7 +231,7 @@
/* Pin numbers for pins without a corresponding GPIO port number are computed
* from the row and column numbers with a 1000 offset to avoid collisions with
* GPIO port numbers.
-@@ -3895,8 +3888,6 @@ const struct sh_pfc_soc_info sh73a0_pinmux_info = {
+@@ -3895,8 +3888,6 @@ const struct sh_pfc_soc_info sh73a0_pinm
.pins = pinmux_pins,
.nr_pins = ARRAY_SIZE(pinmux_pins),
@@ -250,11 +240,9 @@
.groups = pinmux_groups,
.nr_groups = ARRAY_SIZE(pinmux_groups),
.functions = pinmux_functions,
-diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
-index 314255d7..8649ec39 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
-@@ -587,22 +587,9 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = {
+@@ -588,22 +588,9 @@ static const struct pinconf_ops sh_pfc_p
/* PFC ranges -> pinctrl pin descs */
static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
{
@@ -278,18 +266,14 @@
pmx->pins = devm_kzalloc(pfc->dev,
sizeof(*pmx->pins) * pfc->info->nr_pins,
GFP_KERNEL);
-@@ -615,32 +602,24 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
+@@ -616,32 +603,24 @@ static int sh_pfc_map_pins(struct sh_pfc
if (unlikely(!pmx->configs))
return -ENOMEM;
- for (i = 0, nr_pins = 0; i < nr_ranges; ++i) {
- const struct pinmux_range *range = &ranges[i];
- unsigned int number;
-+ for (i = 0; i < pfc->info->nr_pins; ++i) {
-+ const struct sh_pfc_pin *info = &pfc->info->pins[i];
-+ struct sh_pfc_pin_config *cfg = &pmx->configs[i];
-+ struct pinctrl_pin_desc *pin = &pmx->pins[i];
-
+-
- for (number = range->begin; number <= range->end;
- number++, nr_pins++) {
- struct sh_pfc_pin_config *cfg = &pmx->configs[nr_pins];
@@ -301,6 +285,11 @@
- pin->name = info->name;
- cfg->type = PINMUX_TYPE_NONE;
- }
++ for (i = 0; i < pfc->info->nr_pins; ++i) {
++ const struct sh_pfc_pin *info = &pfc->info->pins[i];
++ struct sh_pfc_pin_config *cfg = &pmx->configs[i];
++ struct pinctrl_pin_desc *pin = &pmx->pins[i];
++
+ /* If the pin number is equal to -1 all pins are considered */
+ pin->number = info->pin != (u16)-1 ? info->pin : i;
+ pin->name = info->name;
@@ -321,7 +310,7 @@
pmx = devm_kzalloc(pfc->dev, sizeof(*pmx), GFP_KERNEL);
if (unlikely(!pmx))
-@@ -649,9 +628,9 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc)
+@@ -650,9 +629,9 @@ int sh_pfc_register_pinctrl(struct sh_pf
pmx->pfc = pfc;
pfc->pinctrl = pmx;
@@ -334,8 +323,6 @@
pmx->pctl_desc.name = DRV_NAME;
pmx->pctl_desc.owner = THIS_MODULE;
-diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
-index 839e6954..2469b35c 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -125,8 +125,6 @@ struct sh_pfc_soc_info {
@@ -347,6 +334,3 @@
const struct sh_pfc_pin_group *groups;
unsigned int nr_groups;
const struct sh_pfc_function *functions;
---
-1.8.4.3.gca3854a
-
diff --git a/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch b/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
index e3ab68d..350c433 100644
--- a/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
+++ b/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
@@ -150,7 +150,7 @@
if (host->vcc)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
-@@ -708,8 +708,6 @@ static int mxs_mmc_remove(struct platfor
+@@ -710,8 +710,6 @@ static int mxs_mmc_remove(struct platfor
mmc_remove_host(mmc);
diff --git a/patches.workqueues/0001-workqueues-Introduce-new-flag-WQ_POWER_EFFICIENT-for.patch b/patches.workqueues/0001-workqueues-Introduce-new-flag-WQ_POWER_EFFICIENT-for.patch
index 0350044..6639218 100644
--- a/patches.workqueues/0001-workqueues-Introduce-new-flag-WQ_POWER_EFFICIENT-for.patch
+++ b/patches.workqueues/0001-workqueues-Introduce-new-flag-WQ_POWER_EFFICIENT-for.patch
@@ -34,7 +34,7 @@
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3346,6 +3346,21 @@ bytes respectively. Such letter suffixes
+@@ -3357,6 +3357,21 @@ bytes respectively. Such letter suffixes
that this also can be controlled per-workqueue for
workqueues visible under /sys/bus/workqueue/.
diff --git a/patches.zynq/0009-usb-zynq-merge-usb-support-for-xilinx-zynq-soc.patch b/patches.zynq/0009-usb-zynq-merge-usb-support-for-xilinx-zynq-soc.patch
index 2f87d60..4bc8964 100644
--- a/patches.zynq/0009-usb-zynq-merge-usb-support-for-xilinx-zynq-soc.patch
+++ b/patches.zynq/0009-usb-zynq-merge-usb-support-for-xilinx-zynq-soc.patch
@@ -47,7 +47,7 @@
default y if MACH_LOONGSON1
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -1719,7 +1719,11 @@ static int hub_probe(struct usb_interfac
+@@ -1736,7 +1736,11 @@ static int hub_probe(struct usb_interfac
* bus_resume methods.
*/
if (hdev->parent) { /* normal device */
diff --git a/patches.zynq/0047-spi-spi-xilinx-cleanup-a-check-in-xilinx_spi_txrx_bu.patch b/patches.zynq/0047-spi-spi-xilinx-cleanup-a-check-in-xilinx_spi_txrx_bu.patch
deleted file mode 100644
index fbfdfa2..0000000
--- a/patches.zynq/0047-spi-spi-xilinx-cleanup-a-check-in-xilinx_spi_txrx_bu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cbe328377241c633b4b543cc0df99ff7483f2ec4 Mon Sep 17 00:00:00 2001
-From: "dan.carpenter@oracle.com" <dan.carpenter@oracle.com>
-Date: Sun, 9 Jun 2013 16:07:28 +0300
-Subject: spi: spi-xilinx: cleanup a check in xilinx_spi_txrx_bufs()
-
-'!' has higher precedence than comparisons so the original condition
-is equivalent to "if (xspi->remaining_bytes == 0)". This makes the
-static checkers complain.
-
-xspi->remaining_bytes is signed and from looking at the code
-briefly, I think it might be able to go negative. I suspect that
-going negative may cause a bug, but I don't have the hardware and
-can't test.
-
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Mark Brown <broonie@linaro.org>
-(cherry picked from commit e33d085d11e54bc9fb07b2555cd104d8e7b3089b)
-Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
-Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp>
----
- drivers/spi/spi-xilinx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
-index a6c475b43dcc..09a942852593 100644
---- a/drivers/spi/spi-xilinx.c
-+++ b/drivers/spi/spi-xilinx.c
-@@ -316,7 +316,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
- }
-
- /* See if there is more data to send */
-- if (!xspi->remaining_bytes > 0)
-+ if (xspi->remaining_bytes <= 0)
- break;
- }
-
---
-1.8.5.rc3
-
diff --git a/series b/series
index 86de5af..761e6d7 100644
--- a/series
+++ b/series
@@ -2458,7 +2458,6 @@
patches.zynq/0044-clk-zynq-pll-Use-defines-for-fbdiv-min-max-values.patch
patches.zynq/0045-spi-spi-xilinx-Add-run-run-time-endian-detection.patch
patches.zynq/0046-spi-spi-xilinx-Remove-redundant-platform_set_drvdata.patch
-patches.zynq/0047-spi-spi-xilinx-cleanup-a-check-in-xilinx_spi_txrx_bu.patch
patches.zynq/0048-spi-xilinx-Convert-to-devm_ioremap_resource.patch
patches.zynq/0049-spi-xilinx-Remove-remains-of-of_platform-device-regi.patch
patches.zynq/0050-spi-xilinx-Refer-to-platform-device-as-pdev-in-probe.patch
