diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-29 16:35:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-29 16:35:36 +0200 |
| commit | 8870286856cb2b7bb646e9b20870d3fbbf73f2fd (patch) | |
| tree | 9bf449c8ee925ed6efd3b8edd6388ad9b3fdcf4e | |
| parent | 6adcca806694a3e47f94625d7855b02368391d7a (diff) | |
| download | ltsi-kernel-8870286856cb2b7bb646e9b20870d3fbbf73f2fd.tar.gz | |
update KERNEL_VERSION to 4.9.76
73 files changed, 151 insertions, 968 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index 2ba6040343925..b50d2e9480706 100644 --- a/KERNEL_VERSION +++ b/KERNEL_VERSION @@ -1 +1 @@ -4.9.51 +4.9.76 diff --git a/patches.renesas/0001-drm-bridge-adv7511-Add-Audio-support.patch b/patches.renesas/0001-drm-bridge-adv7511-Add-Audio-support.patch index 718ed1e89958a..0d8ad1c6552e5 100644 --- a/patches.renesas/0001-drm-bridge-adv7511-Add-Audio-support.patch +++ b/patches.renesas/0001-drm-bridge-adv7511-Add-Audio-support.patch @@ -329,7 +329,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +} --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -1060,6 +1060,8 @@ static int adv7511_probe(struct i2c_clie +@@ -1064,6 +1064,8 @@ static int adv7511_probe(struct i2c_clie goto err_unregister_cec; } @@ -338,7 +338,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; err_unregister_cec: -@@ -1081,6 +1083,8 @@ static int adv7511_remove(struct i2c_cli +@@ -1085,6 +1087,8 @@ static int adv7511_remove(struct i2c_cli drm_bridge_remove(&adv7511->bridge); diff --git a/patches.renesas/0001-drm-bridge-adv7511-Initialize-regulators.patch b/patches.renesas/0001-drm-bridge-adv7511-Initialize-regulators.patch index fcca4b05f8142..45d3f5f419593 100644 --- a/patches.renesas/0001-drm-bridge-adv7511-Initialize-regulators.patch +++ b/patches.renesas/0001-drm-bridge-adv7511-Initialize-regulators.patch @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct mipi_dsi_device *dsi; --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -860,6 +860,58 @@ static struct drm_bridge_funcs adv7511_b +@@ -864,6 +864,58 @@ static struct drm_bridge_funcs adv7511_b * Probe & remove */ @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int adv7511_parse_dt(struct device_node *np, struct adv7511_link_config *config) { -@@ -960,6 +1012,7 @@ static int adv7511_probe(struct i2c_clie +@@ -964,6 +1016,7 @@ static int adv7511_probe(struct i2c_clie if (!adv7511) return -ENOMEM; @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> adv7511->powered = false; adv7511->status = connector_status_disconnected; -@@ -977,13 +1030,21 @@ static int adv7511_probe(struct i2c_clie +@@ -981,13 +1034,21 @@ static int adv7511_probe(struct i2c_clie if (ret) return ret; @@ -132,7 +132,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (adv7511->gpio_pd) { mdelay(5); -@@ -991,12 +1052,14 @@ static int adv7511_probe(struct i2c_clie +@@ -995,12 +1056,14 @@ static int adv7511_probe(struct i2c_clie } adv7511->regmap = devm_regmap_init_i2c(i2c, &adv7511_regmap_config); @@ -150,7 +150,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(dev, "Rev. %d\n", val); if (adv7511->type == ADV7511) -@@ -1006,7 +1069,7 @@ static int adv7511_probe(struct i2c_clie +@@ -1010,7 +1073,7 @@ static int adv7511_probe(struct i2c_clie else ret = adv7533_patch_registers(adv7511); if (ret) @@ -159,7 +159,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr); regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR, -@@ -1016,10 +1079,11 @@ static int adv7511_probe(struct i2c_clie +@@ -1020,10 +1083,11 @@ static int adv7511_probe(struct i2c_clie adv7511_packet_disable(adv7511, 0xffff); @@ -174,7 +174,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (adv7511->type == ADV7533) { ret = adv7533_init_cec(adv7511); -@@ -1068,6 +1132,8 @@ err_unregister_cec: +@@ -1072,6 +1136,8 @@ err_unregister_cec: adv7533_uninit_cec(adv7511); err_i2c_unregister_edid: i2c_unregister_device(adv7511->i2c_edid); @@ -183,7 +183,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return ret; } -@@ -1081,6 +1147,8 @@ static int adv7511_remove(struct i2c_cli +@@ -1085,6 +1151,8 @@ static int adv7511_remove(struct i2c_cli adv7533_uninit_cec(adv7511); } diff --git a/patches.renesas/0003-media-cec-pass-parent-device-in-register-not-allocat.patch b/patches.renesas/0003-media-cec-pass-parent-device-in-register-not-allocat.patch index 5dbf305a7adba..e46c94a2b4979 100644 --- a/patches.renesas/0003-media-cec-pass-parent-device-in-register-not-allocat.patch +++ b/patches.renesas/0003-media-cec-pass-parent-device-in-register-not-allocat.patch @@ -109,7 +109,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (err) cec_delete_adapter(state->cec_adap); return err; -@@ -3497,8 +3498,7 @@ static int adv76xx_probe(struct i2c_clie +@@ -3500,8 +3501,7 @@ static int adv76xx_probe(struct i2c_clie state->cec_adap = cec_allocate_adapter(&adv76xx_cec_adap_ops, state, dev_name(&client->dev), CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS | diff --git a/patches.renesas/0004-drm-bridge-adv7511-Enable-HPD-interrupts-to-support-.patch b/patches.renesas/0004-drm-bridge-adv7511-Enable-HPD-interrupts-to-support-.patch index 177fba00b89c1..aca5285e1edde 100644 --- a/patches.renesas/0004-drm-bridge-adv7511-Enable-HPD-interrupts-to-support-.patch +++ b/patches.renesas/0004-drm-bridge-adv7511-Enable-HPD-interrupts-to-support-.patch @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -338,7 +338,7 @@ static void adv7511_power_on(struct adv7 +@@ -338,7 +338,7 @@ static void __adv7511_power_on(struct ad * Still, let's be safe and stick to the documentation. */ regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0), @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1), ADV7511_INT1_DDC_ERROR); } -@@ -846,6 +846,10 @@ static int adv7511_bridge_attach(struct +@@ -850,6 +850,10 @@ static int adv7511_bridge_attach(struct if (adv->type == ADV7533) ret = adv7533_attach_dsi(adv); diff --git a/patches.renesas/0005-drm-bridge-adv7511-Rework-adv7511_power_on-off-so-th.patch b/patches.renesas/0005-drm-bridge-adv7511-Rework-adv7511_power_on-off-so-th.patch deleted file mode 100644 index 7683862137f3a..0000000000000 --- a/patches.renesas/0005-drm-bridge-adv7511-Rework-adv7511_power_on-off-so-th.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d353ad784f84b18975bc5d256fa79c883fbca75e Mon Sep 17 00:00:00 2001 -From: John Stultz <john.stultz@linaro.org> -Date: Mon, 16 Jan 2017 16:52:50 -0800 -Subject: [PATCH 005/255] drm/bridge: adv7511: Rework adv7511_power_on/off() so - they can be reused internally - -In chasing down issues with EDID probing, I found some -duplicated but incomplete logic used to power the chip on and -off. - -This patch refactors the adv7511_power_on/off functions, so -they can be used for internal needs. - -Cc: David Airlie <airlied@linux.ie> -Cc: Archit Taneja <architt@codeaurora.org> -Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> -Cc: Lars-Peter Clausen <lars@metafoo.de> -Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Cc: dri-devel@lists.freedesktop.org -Signed-off-by: John Stultz <john.stultz@linaro.org> -Signed-off-by: Archit Taneja <architt@codeaurora.org> -Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-5-git-send-email-john.stultz@linaro.org -(cherry picked from commit 651e4769ba2a9f20c4b8a823ae2727bf7fa9c9f0) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - ---- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -325,7 +325,7 @@ static void adv7511_set_link_config(stru - adv7511->rgb = config->input_colorspace == HDMI_COLORSPACE_RGB; - } - --static void adv7511_power_on(struct adv7511 *adv7511) -+static void __adv7511_power_on(struct adv7511 *adv7511) - { - adv7511->current_edid_segment = -1; - -@@ -354,6 +354,11 @@ static void adv7511_power_on(struct adv7 - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, - ADV7511_REG_POWER2_HPD_SRC_MASK, - ADV7511_REG_POWER2_HPD_SRC_NONE); -+} -+ -+static void adv7511_power_on(struct adv7511 *adv7511) -+{ -+ __adv7511_power_on(adv7511); - - /* - * Most of the registers are reset during power down or when HPD is low. -@@ -362,21 +367,23 @@ static void adv7511_power_on(struct adv7 - - if (adv7511->type == ADV7533) - adv7533_dsi_power_on(adv7511); -- - adv7511->powered = true; - } - --static void adv7511_power_off(struct adv7511 *adv7511) -+static void __adv7511_power_off(struct adv7511 *adv7511) - { - /* TODO: setup additional power down modes */ - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, - ADV7511_POWER_POWER_DOWN, - ADV7511_POWER_POWER_DOWN); - regcache_mark_dirty(adv7511->regmap); -+} - -+static void adv7511_power_off(struct adv7511 *adv7511) -+{ -+ __adv7511_power_off(adv7511); - if (adv7511->type == ADV7533) - adv7533_dsi_power_off(adv7511); -- - adv7511->powered = false; - } - diff --git a/patches.renesas/0006-drm-bridge-adv7511-Reuse-__adv7511_power_on-off-when.patch b/patches.renesas/0006-drm-bridge-adv7511-Reuse-__adv7511_power_on-off-when.patch deleted file mode 100644 index b6cd406e74314..0000000000000 --- a/patches.renesas/0006-drm-bridge-adv7511-Reuse-__adv7511_power_on-off-when.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f6e9751f27fe8a40cc5d3e6df1edb37ff8ab851e Mon Sep 17 00:00:00 2001 -From: John Stultz <john.stultz@linaro.org> -Date: Mon, 16 Jan 2017 16:52:51 -0800 -Subject: [PATCH 006/255] drm/bridge: adv7511: Reuse __adv7511_power_on/off() - when probing EDID - -Thus this patch changes the EDID probing logic so that we -re-use the __adv7511_power_on/off() calls instead of duplciating -logic. - -This does change behavior slightly as it adds the HPD signal -pulse to the EDID probe path, but Archit has had a patch to -add HPD signal pulse to the EDID probe path before, so this -should address the cases where that helped. Another difference -is that regcache_mark_dirty() is also called in the power off -path once EDID is probed. - -Cc: David Airlie <airlied@linux.ie> -Cc: Archit Taneja <architt@codeaurora.org> -Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> -Cc: Lars-Peter Clausen <lars@metafoo.de> -Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Cc: dri-devel@lists.freedesktop.org -Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: John Stultz <john.stultz@linaro.org> -Signed-off-by: Archit Taneja <architt@codeaurora.org> -Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-6-git-send-email-john.stultz@linaro.org -(cherry picked from commit 4226d9b127cf4758ba0e07931b3f0d59f1b1a50c) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +++-------------- - 1 file changed, 3 insertions(+), 14 deletions(-) - ---- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -573,24 +573,13 @@ static int adv7511_get_modes(struct adv7 - unsigned int count; - - /* Reading the EDID only works if the device is powered */ -- if (!adv7511->powered) { -- regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, -- ADV7511_POWER_POWER_DOWN, 0); -- if (adv7511->i2c_main->irq) { -- regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0), -- ADV7511_INT0_EDID_READY); -- regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1), -- ADV7511_INT1_DDC_ERROR); -- } -- adv7511->current_edid_segment = -1; -- } -+ if (!adv7511->powered) -+ __adv7511_power_on(adv7511); - - edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); - - if (!adv7511->powered) -- regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, -- ADV7511_POWER_POWER_DOWN, -- ADV7511_POWER_POWER_DOWN); -+ __adv7511_power_off(adv7511); - - kfree(adv7511->edid); - adv7511->edid = edid; diff --git a/patches.renesas/0007-drm-bridge-adv7511-Re-write-the-i2c-address-before-E.patch b/patches.renesas/0007-drm-bridge-adv7511-Re-write-the-i2c-address-before-E.patch deleted file mode 100644 index 10cfbe18232e6..0000000000000 --- a/patches.renesas/0007-drm-bridge-adv7511-Re-write-the-i2c-address-before-E.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 854043ead1064d575a48475d2728ef7eff0a5fd9 Mon Sep 17 00:00:00 2001 -From: John Stultz <john.stultz@linaro.org> -Date: Mon, 16 Jan 2017 16:52:52 -0800 -Subject: [PATCH 007/255] drm/bridge: adv7511: Re-write the i2c address before - EDID probing - -I've found that by just turning the chip on and off via the -POWER_DOWN register, I end up getting i2c_transfer errors on -HiKey. - -Investigating further, it turns out that some of the register -state in hardware is getting lost, as the device registers are -reset when the chip is powered down. - -Thus this patch simply re-writes the i2c address to the -ADV7511_REG_EDID_I2C_ADDR register to ensure its properly set -before we try to read the EDID data. - -Cc: David Airlie <airlied@linux.ie> -Cc: Archit Taneja <architt@codeaurora.org> -Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> -Cc: Lars-Peter Clausen <lars@metafoo.de> -Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Cc: dri-devel@lists.freedesktop.org -Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: John Stultz <john.stultz@linaro.org> -Signed-off-by: Archit Taneja <architt@codeaurora.org> -Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-7-git-send-email-john.stultz@linaro.org -(cherry picked from commit 3587c856675c45809010c2cee5b21096f6e8e938) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c -@@ -573,9 +573,17 @@ static int adv7511_get_modes(struct adv7 - unsigned int count; - - /* Reading the EDID only works if the device is powered */ -- if (!adv7511->powered) -+ if (!adv7511->powered) { -+ unsigned int edid_i2c_addr = -+ (adv7511->i2c_main->addr << 1) + 4; -+ - __adv7511_power_on(adv7511); - -+ /* Reset the EDID_I2C_ADDR register as it might be cleared */ -+ regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, -+ edid_i2c_addr); -+ } -+ - edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); - - if (!adv7511->powered) diff --git a/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch b/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch index cf1c4163de04d..c331607cb5970 100644 --- a/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch +++ b/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch @@ -319,7 +319,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .config_aneg = genphy_config_aneg, --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c -@@ -792,7 +792,7 @@ static struct phy_driver ksphy_driver[] +@@ -793,7 +793,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KS8737, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KS8737", @@ -328,7 +328,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ks8737_type, .config_init = kszphy_config_init, -@@ -809,8 +809,7 @@ static struct phy_driver ksphy_driver[] +@@ -810,8 +810,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8021, .phy_id_mask = 0x00ffffff, .name = "Micrel KSZ8021 or KSZ8031", @@ -338,7 +338,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8021_type, .probe = kszphy_probe, -@@ -828,8 +827,7 @@ static struct phy_driver ksphy_driver[] +@@ -829,8 +828,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8031, .phy_id_mask = 0x00ffffff, .name = "Micrel KSZ8031", @@ -348,7 +348,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8021_type, .probe = kszphy_probe, -@@ -847,8 +845,7 @@ static struct phy_driver ksphy_driver[] +@@ -848,8 +846,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8041, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8041", @@ -358,7 +358,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -866,8 +863,7 @@ static struct phy_driver ksphy_driver[] +@@ -867,8 +864,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8041RNLI, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8041RNLI", @@ -368,7 +368,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -885,8 +881,7 @@ static struct phy_driver ksphy_driver[] +@@ -886,8 +882,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8051, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8051", @@ -378,7 +378,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8051_type, .probe = kszphy_probe, -@@ -904,7 +899,7 @@ static struct phy_driver ksphy_driver[] +@@ -905,7 +900,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8001, .name = "Micrel KSZ8001 or KS8721", .phy_id_mask = 0x00fffffc, @@ -387,7 +387,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -922,7 +917,7 @@ static struct phy_driver ksphy_driver[] +@@ -923,7 +918,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8081, .name = "Micrel KSZ8081 or KSZ8091", .phy_id_mask = MICREL_PHY_ID_MASK, @@ -396,7 +396,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8081_type, .probe = kszphy_probe, -@@ -940,7 +935,7 @@ static struct phy_driver ksphy_driver[] +@@ -941,7 +936,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8061, .name = "Micrel KSZ8061", .phy_id_mask = MICREL_PHY_ID_MASK, @@ -405,7 +405,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .config_init = kszphy_config_init, .config_aneg = genphy_config_aneg, -@@ -956,7 +951,7 @@ static struct phy_driver ksphy_driver[] +@@ -957,7 +952,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ9021, .phy_id_mask = 0x000ffffe, .name = "Micrel KSZ9021 Gigabit PHY", @@ -414,7 +414,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, .config_init = ksz9021_config_init, -@@ -975,7 +970,7 @@ static struct phy_driver ksphy_driver[] +@@ -976,7 +971,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ9031, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ9031 Gigabit PHY", @@ -423,7 +423,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, .config_init = ksz9031_config_init, -@@ -992,7 +987,6 @@ static struct phy_driver ksphy_driver[] +@@ -993,7 +988,6 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8873MLL, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8873MLL Switch", @@ -431,7 +431,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG, .config_init = kszphy_config_init, .config_aneg = ksz8873mll_config_aneg, -@@ -1006,7 +1000,7 @@ static struct phy_driver ksphy_driver[] +@@ -1007,7 +1001,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ886X, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ886X Switch", diff --git a/patches.renesas/0035-net-phy-micrel-KSZ8795-do-not-set-SUPPORTED_-Asym_-P.patch b/patches.renesas/0035-net-phy-micrel-KSZ8795-do-not-set-SUPPORTED_-Asym_-P.patch deleted file mode 100644 index 5e5fec8baa4b1..0000000000000 --- a/patches.renesas/0035-net-phy-micrel-KSZ8795-do-not-set-SUPPORTED_-Asym_-P.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fd71addd54ab0bdc778b3c0a33623b13b916121f Mon Sep 17 00:00:00 2001 -From: Sean Nyekjaer <sean.nyekjaer@prevas.dk> -Date: Fri, 27 Jan 2017 21:39:03 +0100 -Subject: [PATCH 035/299] net: phy: micrel: KSZ8795 do not set - SUPPORTED_[Asym_]Pause - -As pr commit "net: phy: phy drivers should not set SUPPORTED_[Asym_]Pause" -this phy driver should not set these feature bits. - -Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk> -Fixes: 9d162ed69f51 ("net: phy: micrel: add support for KSZ8795") -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit cf626c3b252b2c9d131be0dd66096ec3bf729e54) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/net/phy/micrel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/phy/micrel.c -+++ b/drivers/net/phy/micrel.c -@@ -1014,7 +1014,7 @@ static struct phy_driver ksphy_driver[] - .phy_id = PHY_ID_KSZ8795, - .phy_id_mask = MICREL_PHY_ID_MASK, - .name = "Micrel KSZ8795", -- .features = (SUPPORTED_Pause | SUPPORTED_Asym_Pause), -+ .features = PHY_BASIC_FEATURES, - .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .config_init = kszphy_config_init, - .config_aneg = ksz8873mll_config_aneg, diff --git a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch index 12494286d0b2c..af8a9204f6f06 100644 --- a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch +++ b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch @@ -500,7 +500,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static int i9xx_pll_refclk(struct drm_device *dev, -@@ -12388,8 +12389,7 @@ retry: +@@ -12392,8 +12393,7 @@ retry: goto retry; } @@ -510,7 +510,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (ret == 0 && event) { spin_lock_irq(&dev->event_lock); -@@ -14485,7 +14485,7 @@ static void intel_atomic_commit_tail(str +@@ -14489,7 +14489,7 @@ static void intel_atomic_commit_tail(str drm_atomic_helper_commit_cleanup_done(state); @@ -519,7 +519,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* As one of the primary mmio accessors, KMS has a high likelihood * of triggering bugs in unclaimed access. After we finish -@@ -14568,6 +14568,7 @@ static int intel_atomic_commit(struct dr +@@ -14572,6 +14572,7 @@ static int intel_atomic_commit(struct dr intel_shared_dpll_commit(state); intel_atomic_track_fbs(state); @@ -527,7 +527,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (nonblock) queue_work(system_unbound_wq, &state->commit_work); else -@@ -14609,9 +14610,8 @@ retry: +@@ -14613,9 +14614,8 @@ retry: goto retry; } @@ -538,7 +538,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } /* -@@ -16353,8 +16353,8 @@ retry: +@@ -16357,8 +16357,8 @@ retry: dev_priv->display.optimize_watermarks(cs); } @@ -548,7 +548,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); } -@@ -16992,10 +16992,9 @@ void intel_display_resume(struct drm_dev +@@ -16996,10 +16996,9 @@ void intel_display_resume(struct drm_dev drm_modeset_acquire_fini(&ctx); mutex_unlock(&dev->mode_config.mutex); diff --git a/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch b/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch index 8d9a2c96ebf64..284464efe59cf 100644 --- a/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch +++ b/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch @@ -381,7 +381,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c -@@ -52,9 +52,7 @@ static const struct file_operations sun4 +@@ -59,9 +59,7 @@ static const struct file_operations sun4 .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, diff --git a/patches.renesas/0052-i2c-riic-correctly-finish-transfers.patch b/patches.renesas/0052-i2c-riic-correctly-finish-transfers.patch deleted file mode 100644 index cecce7e8c9f88..0000000000000 --- a/patches.renesas/0052-i2c-riic-correctly-finish-transfers.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 8d91806a403aacbaa2f12e41421008c79eaf6523 Mon Sep 17 00:00:00 2001 -From: Chris Brandt <chris.brandt@renesas.com> -Date: Tue, 7 Feb 2017 21:41:22 -0500 -Subject: [PATCH 052/255] i2c: riic: correctly finish transfers - -This fixes the condition where the controller has not fully completed its -final transfer and leaves the bus and controller in a undesirable state. - -At the end of the last transmitted byte, the existing driver would just -signal for a STOP condition to be transmitted then immediately signal -completion. However, the full STOP procedure might not have fully taken -place by the time the runtime PM shuts off the peripheral clock, leaving -the bus in a suspended state. - -Alternatively, the STOP condition on the bus may have completed, but when -the next transaction is requested by the upper layer, not all the -necessary register cleanup was finished from the last transfer which made -the driver return BUS BUSY when it really wasn't. - -This patch now makes all transmit and receive transactions wait for the -STOP condition to fully complete before signaling a completed transaction. -With this new method, runtime PM no longer seems to be an issue. - -Fixes: 310c18a41450 ("i2c: riic: add driver") -Signed-off-by: Chris Brandt <chris.brandt@renesas.com> -Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> -Signed-off-by: Wolfram Sang <wsa@the-dreams.de> -(cherry picked from commit 71ccea095ea1d4efd004dab971be6d599e06fc3f) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/i2c/busses/i2c-riic.c | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - ---- a/drivers/i2c/busses/i2c-riic.c -+++ b/drivers/i2c/busses/i2c-riic.c -@@ -80,6 +80,7 @@ - #define ICIER_TEIE 0x40 - #define ICIER_RIE 0x20 - #define ICIER_NAKIE 0x10 -+#define ICIER_SPIE 0x08 - - #define ICSR2_NACKF 0x10 - -@@ -216,11 +217,10 @@ static irqreturn_t riic_tend_isr(int irq - return IRQ_NONE; - } - -- if (riic->is_last || riic->err) -+ if (riic->is_last || riic->err) { -+ riic_clear_set_bit(riic, 0, ICIER_SPIE, RIIC_ICIER); - writeb(ICCR2_SP, riic->base + RIIC_ICCR2); -- -- writeb(0, riic->base + RIIC_ICIER); -- complete(&riic->msg_done); -+ } - - return IRQ_HANDLED; - } -@@ -240,13 +240,13 @@ static irqreturn_t riic_rdrf_isr(int irq - - if (riic->bytes_left == 1) { - /* STOP must come before we set ACKBT! */ -- if (riic->is_last) -+ if (riic->is_last) { -+ riic_clear_set_bit(riic, 0, ICIER_SPIE, RIIC_ICIER); - writeb(ICCR2_SP, riic->base + RIIC_ICCR2); -+ } - - riic_clear_set_bit(riic, 0, ICMR3_ACKBT, RIIC_ICMR3); - -- writeb(0, riic->base + RIIC_ICIER); -- complete(&riic->msg_done); - } else { - riic_clear_set_bit(riic, ICMR3_ACKBT, 0, RIIC_ICMR3); - } -@@ -259,6 +259,21 @@ static irqreturn_t riic_rdrf_isr(int irq - return IRQ_HANDLED; - } - -+static irqreturn_t riic_stop_isr(int irq, void *data) -+{ -+ struct riic_dev *riic = data; -+ -+ /* read back registers to confirm writes have fully propagated */ -+ writeb(0, riic->base + RIIC_ICSR2); -+ readb(riic->base + RIIC_ICSR2); -+ writeb(0, riic->base + RIIC_ICIER); -+ readb(riic->base + RIIC_ICIER); -+ -+ complete(&riic->msg_done); -+ -+ return IRQ_HANDLED; -+} -+ - static u32 riic_func(struct i2c_adapter *adap) - { - return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; -@@ -326,6 +341,7 @@ static struct riic_irq_desc riic_irqs[] - { .res_num = 0, .isr = riic_tend_isr, .name = "riic-tend" }, - { .res_num = 1, .isr = riic_rdrf_isr, .name = "riic-rdrf" }, - { .res_num = 2, .isr = riic_tdre_isr, .name = "riic-tdre" }, -+ { .res_num = 3, .isr = riic_stop_isr, .name = "riic-stop" }, - { .res_num = 5, .isr = riic_tend_isr, .name = "riic-nack" }, - }; - diff --git a/patches.renesas/0053-i2c-riic-fix-restart-condition.patch b/patches.renesas/0053-i2c-riic-fix-restart-condition.patch deleted file mode 100644 index 815f1273b9a3f..0000000000000 --- a/patches.renesas/0053-i2c-riic-fix-restart-condition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ef8bf60b6afb42f0eccfa6b175fb5fda5f1a98ad Mon Sep 17 00:00:00 2001 -From: Chris Brandt <chris.brandt@renesas.com> -Date: Mon, 6 Mar 2017 15:20:51 -0500 -Subject: [PATCH 053/255] i2c: riic: fix restart condition - -While modifying the driver to use the STOP interrupt, the completion of the -intermediate transfers need to wake the driver back up in order to initiate -the next transfer (restart condition). Otherwise you get never ending -interrupts and only the first transfer sent. - -Fixes: 71ccea095ea1 ("i2c: riic: correctly finish transfers") -Reported-by: Simon Horman <horms@verge.net.au> -Signed-off-by: Chris Brandt <chris.brandt@renesas.com> -Tested-by: Simon Horman <horms+renesas@verge.net.au> -Signed-off-by: Wolfram Sang <wsa@the-dreams.de> -(cherry picked from commit 2501c1bb054290679baad0ff7f4f07c714251f4c) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/i2c/busses/i2c-riic.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/i2c/busses/i2c-riic.c -+++ b/drivers/i2c/busses/i2c-riic.c -@@ -218,8 +218,12 @@ static irqreturn_t riic_tend_isr(int irq - } - - if (riic->is_last || riic->err) { -- riic_clear_set_bit(riic, 0, ICIER_SPIE, RIIC_ICIER); -+ riic_clear_set_bit(riic, ICIER_TEIE, ICIER_SPIE, RIIC_ICIER); - writeb(ICCR2_SP, riic->base + RIIC_ICCR2); -+ } else { -+ /* Transfer is complete, but do not send STOP */ -+ riic_clear_set_bit(riic, ICIER_TEIE, 0, RIIC_ICIER); -+ complete(&riic->msg_done); - } - - return IRQ_HANDLED; diff --git a/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch b/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch index eed3e1cd6caed..ee30e5d69b5ae 100644 --- a/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch +++ b/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c -@@ -993,7 +993,11 @@ static int __rsnd_kctrl_new(struct rsnd_ +@@ -991,7 +991,11 @@ static int __rsnd_kctrl_new(struct rsnd_ void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg) { @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int rsnd_kctrl_new_m(struct rsnd_mod *mod, --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c -@@ -707,6 +707,17 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -721,6 +721,17 @@ int rsnd_dma_attach(struct rsnd_dai_stre return 0; } @@ -113,7 +113,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #define __rsnd_mod_call_start 0 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -698,7 +698,10 @@ static int rsnd_ssi_dma_remove(struct rs +@@ -703,7 +703,10 @@ static int rsnd_ssi_dma_remove(struct rs int irq = ssi->irq; /* PIO will request IRQ again */ diff --git a/patches.renesas/0064-ASoC-rsnd-use-for_each_rsnd_mod_xxx-on-rsnd_rdai_con.patch b/patches.renesas/0064-ASoC-rsnd-use-for_each_rsnd_mod_xxx-on-rsnd_rdai_con.patch index 59dca4662ef8e..e8c8b5ce511de 100644 --- a/patches.renesas/0064-ASoC-rsnd-use-for_each_rsnd_mod_xxx-on-rsnd_rdai_con.patch +++ b/patches.renesas/0064-ASoC-rsnd-use-for_each_rsnd_mod_xxx-on-rsnd_rdai_con.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c -@@ -1122,6 +1122,7 @@ static int rsnd_rdai_continuance_probe(s +@@ -1120,6 +1120,7 @@ static int rsnd_rdai_continuance_probe(s ret = rsnd_dai_call(probe, io, priv); if (ret == -EAGAIN) { struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io); @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int i; /* -@@ -1141,8 +1142,8 @@ static int rsnd_rdai_continuance_probe(s +@@ -1139,8 +1140,8 @@ static int rsnd_rdai_continuance_probe(s * remove all mod from io * and, re connect ssi */ diff --git a/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch b/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch index b4d26e99f5aa8..f06e9a4588484 100644 --- a/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch +++ b/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch @@ -48,7 +48,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (IS_ERR_OR_NULL(dmaen->chan)) { dmaen->chan = NULL; dev_err(dev, "can't get dma channel\n"); -@@ -394,7 +385,7 @@ static int rsnd_dmapp_start(struct rsnd_ +@@ -408,7 +399,7 @@ static int rsnd_dmapp_start(struct rsnd_ } static int rsnd_dmapp_attach(struct rsnd_dai_stream *io, @@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct rsnd_mod *mod_from, struct rsnd_mod *mod_to) { struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma); -@@ -627,7 +618,7 @@ static void rsnd_dma_of_path(struct rsnd +@@ -641,7 +632,7 @@ static void rsnd_dma_of_path(struct rsnd } int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct rsnd_mod *mod_from = NULL; struct rsnd_mod *mod_to = NULL; -@@ -636,7 +627,7 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -650,7 +641,7 @@ int rsnd_dma_attach(struct rsnd_dai_stre struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_mod_ops *ops; enum rsnd_mod_type type; @@ -75,7 +75,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct rsnd_mod *mod_from, struct rsnd_mod *mod_to); int is_play = rsnd_io_is_play(io); int ret, dma_id; -@@ -695,7 +686,7 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -709,7 +700,7 @@ int rsnd_dma_attach(struct rsnd_dai_stre rsnd_mod_name(mod_from), rsnd_mod_id(mod_from), rsnd_mod_name(mod_to), rsnd_mod_id(mod_to)); @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -669,7 +669,6 @@ static int rsnd_ssi_dma_probe(struct rsn +@@ -674,7 +674,6 @@ static int rsnd_ssi_dma_probe(struct rsn struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); @@ -116,7 +116,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int ret; /* -@@ -684,7 +683,7 @@ static int rsnd_ssi_dma_probe(struct rsn +@@ -689,7 +688,7 @@ static int rsnd_ssi_dma_probe(struct rsn return ret; /* SSI probe might be called many times in MUX multi path */ diff --git a/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch b/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch index 2d1d64bc9447d..aab7765f484f2 100644 --- a/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch +++ b/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -644,10 +644,14 @@ static int rsnd_ssi_common_probe(struct +@@ -649,10 +649,14 @@ static int rsnd_ssi_common_probe(struct if (ret < 0) return ret; @@ -37,7 +37,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return ret; } -@@ -693,12 +697,9 @@ static int rsnd_ssi_dma_remove(struct rs +@@ -698,12 +702,9 @@ static int rsnd_ssi_dma_remove(struct rs struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); diff --git a/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch b/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch index 4ffb598471f7e..8a0c319a11971 100644 --- a/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch +++ b/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c -@@ -698,17 +698,6 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -712,17 +712,6 @@ int rsnd_dma_attach(struct rsnd_dai_stre return 0; } @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct rsnd_mod *mod, char *name); --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -701,8 +701,6 @@ static int rsnd_ssi_dma_remove(struct rs +@@ -706,8 +706,6 @@ static int rsnd_ssi_dma_remove(struct rs /* PIO will request IRQ again */ free_irq(ssi->irq, mod); diff --git a/patches.renesas/0077-ASoC-rsnd-Request-Release-DMA-channel-each-time.patch b/patches.renesas/0077-ASoC-rsnd-Request-Release-DMA-channel-each-time.patch index c43771c640396..cda7877a7d24d 100644 --- a/patches.renesas/0077-ASoC-rsnd-Request-Release-DMA-channel-each-time.patch +++ b/patches.renesas/0077-ASoC-rsnd-Request-Release-DMA-channel-each-time.patch @@ -252,7 +252,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> }; /* -@@ -671,9 +699,6 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -685,9 +713,6 @@ int rsnd_dma_attach(struct rsnd_dai_stre *dma_mod = rsnd_mod_get(dma); @@ -262,7 +262,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = rsnd_mod_init(priv, *dma_mod, ops, NULL, rsnd_mod_get_status, type, dma_id); if (ret < 0) -@@ -687,6 +712,11 @@ int rsnd_dma_attach(struct rsnd_dai_stre +@@ -701,6 +726,11 @@ int rsnd_dma_attach(struct rsnd_dai_stre ret = attach(io, dma, mod_from, mod_to); if (ret < 0) return ret; diff --git a/patches.renesas/0078-ASoC-rsnd-use-dma_sync_single_for_xxx-for-IOMMU.patch b/patches.renesas/0078-ASoC-rsnd-use-dma_sync_single_for_xxx-for-IOMMU.patch index 9befb0ba6dbd9..61774b411fe2d 100644 --- a/patches.renesas/0078-ASoC-rsnd-use-dma_sync_single_for_xxx-for-IOMMU.patch +++ b/patches.renesas/0078-ASoC-rsnd-use-dma_sync_single_for_xxx-for-IOMMU.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c -@@ -1126,8 +1126,8 @@ static int rsnd_pcm_new(struct snd_soc_p +@@ -1124,8 +1124,8 @@ static int rsnd_pcm_new(struct snd_soc_p return snd_pcm_lib_preallocate_pages_for_all( rtd->pcm, diff --git a/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch b/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch index d78127d239fee..afa9e11f2832f 100644 --- a/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch +++ b/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -417,11 +417,14 @@ static int rsnd_ssi_hw_params(struct rsn +@@ -422,11 +422,14 @@ static int rsnd_ssi_hw_params(struct rsn int chan = params_channels(params); /* diff --git a/patches.renesas/0081-ASoC-rsnd-enable-disable-ADG-when-suspend-resume-tim.patch b/patches.renesas/0081-ASoC-rsnd-enable-disable-ADG-when-suspend-resume-tim.patch index 3d63bd4a9c889..695901f1db79a 100644 --- a/patches.renesas/0081-ASoC-rsnd-enable-disable-ADG-when-suspend-resume-tim.patch +++ b/patches.renesas/0081-ASoC-rsnd-enable-disable-ADG-when-suspend-resume-tim.patch @@ -93,7 +93,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c -@@ -1308,9 +1308,33 @@ static int rsnd_remove(struct platform_d +@@ -1306,9 +1306,33 @@ static int rsnd_remove(struct platform_d return ret; } diff --git a/patches.renesas/0083-ASoC-rsnd-don-t-double-free-kctrl.patch b/patches.renesas/0083-ASoC-rsnd-don-t-double-free-kctrl.patch deleted file mode 100644 index 9b026ec413a22..0000000000000 --- a/patches.renesas/0083-ASoC-rsnd-don-t-double-free-kctrl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 293c6c0fa278e77f17b81bf4b2dda2adcbbd141f Mon Sep 17 00:00:00 2001 -From: Colin Ian King <colin.king@canonical.com> -Date: Thu, 8 Dec 2016 13:05:43 +0000 -Subject: [PATCH 083/299] ASoC: rsnd: don't double free kctrl - -On an error, snd_ctl_add already free's kctrl, so calling snd_ctl_free_one -to free it again leads to a double free error. Fix this by removing -the extraneous snd_ctl_free_one call. - -Issue found using static analysis with CoverityScan, CID 1372908 - -Signed-off-by: Colin Ian King <colin.king@canonical.com> -Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> -(cherry picked from commit 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/core.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/sound/soc/sh/rcar/core.c -+++ b/sound/soc/sh/rcar/core.c -@@ -1030,10 +1030,8 @@ static int __rsnd_kctrl_new(struct rsnd_ - return -ENOMEM; - - ret = snd_ctl_add(card, kctrl); -- if (ret < 0) { -- snd_ctl_free_one(kctrl); -+ if (ret < 0) - return ret; -- } - - cfg->update = update; - cfg->card = card; diff --git a/patches.renesas/0085-ARM-dts-r8a7790-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0085-ARM-dts-r8a7790-Use-R-Car-Gen-2-fallback-binding-for.patch deleted file mode 100644 index 9827c0691ccd8..0000000000000 --- a/patches.renesas/0085-ARM-dts-r8a7790-Use-R-Car-Gen-2-fallback-binding-for.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b19f7470e59ac387e29d62914dec3b3fac927ac8 Mon Sep 17 00:00:00 2001 -From: Simon Horman <horms+renesas@verge.net.au> -Date: Tue, 20 Dec 2016 11:32:39 +0100 -Subject: [PATCH 085/255] ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding - for msiof nodes - -Use recently added R-Car Gen 2 fallback binding for msiof nodes in -DT for r8a7790 SoC. - -This has no run-time effect for the current driver as the initialisation -sequence is the same for the SoC-specific binding for r8a7790 and the -fallback binding for R-Car Gen 2. - -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> -(cherry picked from commit 654450baf2afba86cf328e1849ccac61ec4630af) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/arch/arm/boot/dts/r8a7790.dtsi -+++ b/arch/arm/boot/dts/r8a7790.dtsi -@@ -1508,7 +1508,8 @@ - }; - - msiof0: spi@e6e20000 { -- compatible = "renesas,msiof-r8a7790"; -+ compatible = "renesas,msiof-r8a7790", -+ "renesas,rcar-gen2-msiof"; - reg = <0 0xe6e20000 0 0x0064>; - interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>; -@@ -1522,7 +1523,8 @@ - }; - - msiof1: spi@e6e10000 { -- compatible = "renesas,msiof-r8a7790"; -+ compatible = "renesas,msiof-r8a7790", -+ "renesas,rcar-gen2-msiof"; - reg = <0 0xe6e10000 0 0x0064>; - interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>; -@@ -1536,7 +1538,8 @@ - }; - - msiof2: spi@e6e00000 { -- compatible = "renesas,msiof-r8a7790"; -+ compatible = "renesas,msiof-r8a7790", -+ "renesas,rcar-gen2-msiof"; - reg = <0 0xe6e00000 0 0x0064>; - interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>; -@@ -1550,7 +1553,8 @@ - }; - - msiof3: spi@e6c90000 { -- compatible = "renesas,msiof-r8a7790"; -+ compatible = "renesas,msiof-r8a7790", -+ "renesas,rcar-gen2-msiof"; - reg = <0 0xe6c90000 0 0x0064>; - interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>; diff --git a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch index 7e4728a8b5592..5dc5d22482309 100644 --- a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch +++ b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -228,6 +228,15 @@ static int rsnd_ssi_master_clk_start(str +@@ -233,6 +233,15 @@ static int rsnd_ssi_master_clk_start(str for (j = 0; j < ARRAY_SIZE(ssi_clk_mul_table); j++) { /* diff --git a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch index 3443f285ae8aa..61c9a534d15dc 100644 --- a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch +++ b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch @@ -166,7 +166,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> rsnd_adg_set_src_timesel_gen2(mod, io, fin, fout); --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -302,7 +302,7 @@ static void rsnd_ssi_config_init(struct +@@ -307,7 +307,7 @@ static void rsnd_ssi_config_init(struct * always use 32bit system word. * see also rsnd_ssi_master_clk_enable() */ diff --git a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch index e367d71169633..5ce2a0862eee3 100644 --- a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch +++ b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -709,6 +709,11 @@ static int rsnd_ssi_dma_remove(struct rs +@@ -714,6 +714,11 @@ static int rsnd_ssi_dma_remove(struct rs struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); diff --git a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch b/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch index 30787ee57e01b..e956c0e5fdb2a 100644 --- a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch +++ b/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -550,6 +550,13 @@ static void __rsnd_ssi_interrupt(struct +@@ -555,6 +555,13 @@ static void __rsnd_ssi_interrupt(struct struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); u32 *buf = (u32 *)(runtime->dma_area + rsnd_dai_pointer_offset(io, 0)); @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * 8/16/32 data can be assesse to TDR/RDR register -@@ -557,9 +564,9 @@ static void __rsnd_ssi_interrupt(struct +@@ -562,9 +569,9 @@ static void __rsnd_ssi_interrupt(struct * see rsnd_ssi_init() */ if (rsnd_io_is_play(io)) diff --git a/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch b/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch index 48f3b5c61634f..96850d563f610 100644 --- a/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch +++ b/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c -@@ -800,9 +800,6 @@ static struct phy_driver ksphy_driver[] +@@ -801,9 +801,6 @@ static struct phy_driver ksphy_driver[] .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, @@ -54,7 +54,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .suspend = genphy_suspend, .resume = genphy_resume, }, { -@@ -942,9 +939,6 @@ static struct phy_driver ksphy_driver[] +@@ -943,9 +940,6 @@ static struct phy_driver ksphy_driver[] .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, @@ -64,7 +64,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .suspend = genphy_suspend, .resume = genphy_resume, }, { -@@ -954,6 +948,7 @@ static struct phy_driver ksphy_driver[] +@@ -955,6 +949,7 @@ static struct phy_driver ksphy_driver[] .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, @@ -72,7 +72,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .config_init = ksz9021_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, -@@ -973,6 +968,7 @@ static struct phy_driver ksphy_driver[] +@@ -974,6 +969,7 @@ static struct phy_driver ksphy_driver[] .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, @@ -80,7 +80,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .config_init = ksz9031_config_init, .config_aneg = genphy_config_aneg, .read_status = ksz9031_read_status, -@@ -991,9 +987,6 @@ static struct phy_driver ksphy_driver[] +@@ -992,9 +988,6 @@ static struct phy_driver ksphy_driver[] .config_init = kszphy_config_init, .config_aneg = ksz8873mll_config_aneg, .read_status = ksz8873mll_read_status, @@ -90,7 +90,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .suspend = genphy_suspend, .resume = genphy_resume, }, { -@@ -1005,9 +998,6 @@ static struct phy_driver ksphy_driver[] +@@ -1006,9 +999,6 @@ static struct phy_driver ksphy_driver[] .config_init = kszphy_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .suspend = genphy_suspend, .resume = genphy_resume, }, { -@@ -1019,9 +1009,6 @@ static struct phy_driver ksphy_driver[] +@@ -1020,9 +1010,6 @@ static struct phy_driver ksphy_driver[] .config_init = kszphy_config_init, .config_aneg = ksz8873mll_config_aneg, .read_status = ksz8873mll_read_status, diff --git a/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch b/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch index 92980e910cd51..f4fa2880f12a3 100644 --- a/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch +++ b/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1142,11 +1142,8 @@ static int sci_dma_rx_push(struct sci_po +@@ -1141,11 +1141,8 @@ static int sci_dma_rx_push(struct sci_po int copied; copied = tty_insert_flip_string(tport, buf, count); @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->icount.rx += copied; -@@ -1161,8 +1158,6 @@ static int sci_dma_rx_find_active(struct +@@ -1160,8 +1157,6 @@ static int sci_dma_rx_find_active(struct if (s->active_rx == s->cookie_rx[i]) return i; @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return -1; } -@@ -1223,9 +1218,9 @@ static void sci_dma_rx_complete(void *ar +@@ -1222,9 +1217,9 @@ static void sci_dma_rx_complete(void *ar dma_async_issue_pending(chan); @@ -55,7 +55,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return; fail: -@@ -1273,8 +1268,6 @@ static void sci_submit_rx(struct sci_por +@@ -1272,8 +1267,6 @@ static void sci_submit_rx(struct sci_por if (dma_submit_error(s->cookie_rx[i])) goto fail; @@ -64,7 +64,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } s->active_rx = s->cookie_rx[0]; -@@ -1288,7 +1281,6 @@ fail: +@@ -1287,7 +1280,6 @@ fail: for (i = 0; i < 2; i++) s->cookie_rx[i] = -EINVAL; s->active_rx = -EINVAL; @@ -72,7 +72,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> sci_rx_dma_release(s, true); } -@@ -1358,10 +1350,10 @@ static void rx_timer_fn(unsigned long ar +@@ -1357,10 +1349,10 @@ static void rx_timer_fn(unsigned long ar int active, count; u16 scr; @@ -85,7 +85,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> active = sci_dma_rx_find_active(s); if (active < 0) { spin_unlock_irqrestore(&port->lock, flags); -@@ -1370,9 +1362,9 @@ static void rx_timer_fn(unsigned long ar +@@ -1369,9 +1361,9 @@ static void rx_timer_fn(unsigned long ar status = dmaengine_tx_status(s->chan_rx, s->active_rx, &state); if (status == DMA_COMPLETE) { @@ -96,7 +96,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Let packet complete handler take care of the packet */ return; -@@ -1396,8 +1388,6 @@ static void rx_timer_fn(unsigned long ar +@@ -1395,8 +1387,6 @@ static void rx_timer_fn(unsigned long ar /* Handle incomplete DMA receive */ dmaengine_terminate_all(s->chan_rx); read = sg_dma_len(&s->sg_rx[active]) - state.residue; diff --git a/patches.renesas/0116-ASoC-rcar-avoid-SSI_MODEx-settings-for-SSI8.patch b/patches.renesas/0116-ASoC-rcar-avoid-SSI_MODEx-settings-for-SSI8.patch deleted file mode 100644 index 7add8f730bd76..0000000000000 --- a/patches.renesas/0116-ASoC-rcar-avoid-SSI_MODEx-settings-for-SSI8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6b9d80343b8bd5af4426d53180837859e252636b Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Fri, 3 Mar 2017 04:25:09 +0000 -Subject: [PATCH 116/255] ASoC: rcar: avoid SSI_MODEx settings for SSI8 - -SSI8 is is sharing pin with SSI7, and nothing to do for SSI_MODEx. -It is special pin and it needs special settings whole system, -but we can't confirm it, because we never have SSI8 available board. - -This patch fixup SSI_MODEx settings error for SSI8 on connection test, -but should be confirmed behavior on real board in the future. - -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> -(cherry picked from commit 4b30eebfc35c67771b5f58d9274d3e321b72d7a8) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/ssiu.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/sound/soc/sh/rcar/ssiu.c -+++ b/sound/soc/sh/rcar/ssiu.c -@@ -64,7 +64,11 @@ static int rsnd_ssiu_init(struct rsnd_mo - mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ - mask2 = (1 << 4); /* mask sync bit */ - val1 = val2 = 0; -- if (rsnd_ssi_is_pin_sharing(io)) { -+ if (id == 8) { -+ /* -+ * SSI8 pin is sharing with SSI7, nothing to do. -+ */ -+ } else if (rsnd_ssi_is_pin_sharing(io)) { - int shift = -1; - - switch (id) { diff --git a/patches.renesas/0117-ASoC-rsnd-fix-sound-route-path-when-using-SRC6-SRC9.patch b/patches.renesas/0117-ASoC-rsnd-fix-sound-route-path-when-using-SRC6-SRC9.patch deleted file mode 100644 index ded63d93e607b..0000000000000 --- a/patches.renesas/0117-ASoC-rsnd-fix-sound-route-path-when-using-SRC6-SRC9.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 8ce55797aec19d48fa9e54b57b09a32bd5e22095 Mon Sep 17 00:00:00 2001 -From: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> -Date: Wed, 1 Mar 2017 03:51:00 +0000 -Subject: [PATCH 117/255] ASoC: rsnd: fix sound route path when using SRC6/SRC9 - -This patch fixes the problem that the missing value of the route path -setting table and incorrect values are set in the CMD_ROUTE_SELECT -register. - -Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> -[Kuninori: shared data on MIX and non-MIX case] -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> - -(cherry picked from commit a1c2ff53726907aff5feb37e4cfd45c1ff626431) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/cmd.c | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - ---- a/sound/soc/sh/rcar/cmd.c -+++ b/sound/soc/sh/rcar/cmd.c -@@ -31,23 +31,24 @@ static int rsnd_cmd_init(struct rsnd_mod - struct rsnd_mod *mix = rsnd_io_to_mod_mix(io); - struct device *dev = rsnd_priv_to_dev(priv); - u32 data; -+ u32 path[] = { -+ [1] = 1 << 0, -+ [5] = 1 << 8, -+ [6] = 1 << 12, -+ [9] = 1 << 15, -+ }; - - if (!mix && !dvc) - return 0; - -+ if (ARRAY_SIZE(path) < rsnd_mod_id(mod) + 1) -+ return -ENXIO; -+ - if (mix) { - struct rsnd_dai *rdai; - struct rsnd_mod *src; - struct rsnd_dai_stream *tio; - int i; -- u32 path[] = { -- [0] = 0, -- [1] = 1 << 0, -- [2] = 0, -- [3] = 0, -- [4] = 0, -- [5] = 1 << 8 -- }; - - /* - * it is assuming that integrater is well understanding about -@@ -70,16 +71,19 @@ static int rsnd_cmd_init(struct rsnd_mod - } else { - struct rsnd_mod *src = rsnd_io_to_mod_src(io); - -- u32 path[] = { -- [0] = 0x30000, -- [1] = 0x30001, -- [2] = 0x40000, -- [3] = 0x10000, -- [4] = 0x20000, -- [5] = 0x40100 -+ u8 cmd_case[] = { -+ [0] = 0x3, -+ [1] = 0x3, -+ [2] = 0x4, -+ [3] = 0x1, -+ [4] = 0x2, -+ [5] = 0x4, -+ [6] = 0x1, -+ [9] = 0x2, - }; - -- data = path[rsnd_mod_id(src)]; -+ data = path[rsnd_mod_id(src)] | -+ cmd_case[rsnd_mod_id(src)] << 16; - } - - dev_dbg(dev, "ctu/mix path = 0x%08x", data); diff --git a/patches.renesas/0118-ASoC-rcar-clear-DE-bit-only-in-PDMACHCR-when-it-stop.patch b/patches.renesas/0118-ASoC-rcar-clear-DE-bit-only-in-PDMACHCR-when-it-stop.patch deleted file mode 100644 index a3d3844751aab..0000000000000 --- a/patches.renesas/0118-ASoC-rcar-clear-DE-bit-only-in-PDMACHCR-when-it-stop.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2ccf181ab1dd4af6cffd9f7b1509b181e5aa3c73 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Tue, 14 Mar 2017 09:34:49 +0900 -Subject: [PATCH 118/255] ASoC: rcar: clear DE bit only in PDMACHCR when it - stops - -R-Car datasheet indicates "Clear DE in PDMACHCR" for transfer stop, -but current code clears all bits in PDMACHCR. -Because of this, DE bit might never been cleared, -and it causes CMD overflow. This patch fixes this issue. - -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> -(cherry picked from commit 62a10498afb27370ec6018e9d802b74850fd8d9a) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/dma.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - ---- a/sound/soc/sh/rcar/dma.c -+++ b/sound/soc/sh/rcar/dma.c -@@ -454,6 +454,20 @@ static u32 rsnd_dmapp_read(struct rsnd_d - return ioread32(rsnd_dmapp_addr(dmac, dma, reg)); - } - -+static void rsnd_dmapp_bset(struct rsnd_dma *dma, u32 data, u32 mask, u32 reg) -+{ -+ struct rsnd_mod *mod = rsnd_mod_get(dma); -+ struct rsnd_priv *priv = rsnd_mod_to_priv(mod); -+ struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); -+ volatile void __iomem *addr = rsnd_dmapp_addr(dmac, dma, reg); -+ u32 val = ioread32(addr); -+ -+ val &= ~mask; -+ val |= (data & mask); -+ -+ iowrite32(val, addr); -+} -+ - static int rsnd_dmapp_stop(struct rsnd_mod *mod, - struct rsnd_dai_stream *io, - struct rsnd_priv *priv) -@@ -461,10 +475,10 @@ static int rsnd_dmapp_stop(struct rsnd_m - struct rsnd_dma *dma = rsnd_mod_to_dma(mod); - int i; - -- rsnd_dmapp_write(dma, 0, PDMACHCR); -+ rsnd_dmapp_bset(dma, 0, PDMACHCR_DE, PDMACHCR); - - for (i = 0; i < 1024; i++) { -- if (0 == rsnd_dmapp_read(dma, PDMACHCR)) -+ if (0 == (rsnd_dmapp_read(dma, PDMACHCR) & PDMACHCR_DE)) - return 0; - udelay(1); - } diff --git a/patches.renesas/0129-sh_eth-use-correct-name-for-ECMR_MPDE-bit.patch b/patches.renesas/0129-sh_eth-use-correct-name-for-ECMR_MPDE-bit.patch deleted file mode 100644 index f3828aca89232..0000000000000 --- a/patches.renesas/0129-sh_eth-use-correct-name-for-ECMR_MPDE-bit.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2fdf09534576e9392b4293cb4f49d223f27e8fdc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= - <niklas.soderlund+renesas@ragnatech.se> -Date: Mon, 9 Jan 2017 16:34:04 +0100 -Subject: [PATCH 129/255] sh_eth: use correct name for ECMR_MPDE bit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This bit was wrongly named due to a typo, Sergei checked the SH7734/63 -manuals and this bit should be named MPDE. - -Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> -Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit 6dcf45e514974a1ff10755015b5e06746a033e5f) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/net/ethernet/renesas/sh_eth.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/renesas/sh_eth.h -+++ b/drivers/net/ethernet/renesas/sh_eth.h -@@ -339,7 +339,7 @@ enum FELIC_MODE_BIT { - ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000, - ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000, - ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000, -- ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, -+ ECMR_MPDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, - ECMR_RTM = 0x00000010, ECMR_ILB = 0x00000008, ECMR_ELB = 0x00000004, - ECMR_DM = 0x00000002, ECMR_PRM = 0x00000001, - }; diff --git a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch index 0c8bfadd52abe..c843ded5d042a 100644 --- a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch +++ b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_write(usb3, 0, USB3_USB_INT_ENA_1); usb3_write(usb3, 0, USB3_USB_INT_ENA_2); usb3_write(usb3, 0, USB3_AXI_INT_ENA); -@@ -1507,10 +1548,22 @@ static void usb3_irq_epc_int_2(struct re +@@ -1509,10 +1550,22 @@ static void usb3_irq_epc_int_2(struct re } } @@ -131,7 +131,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1); if (int_sta_1) { -@@ -1521,6 +1574,12 @@ static void usb3_irq_epc(struct renesas_ +@@ -1523,6 +1576,12 @@ static void usb3_irq_epc(struct renesas_ int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2); if (int_sta_2) usb3_irq_epc_int_2(usb3, int_sta_2); diff --git a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch index 6c7148c33c7b3..690d8d6fa1d8d 100644 --- a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch +++ b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static void renesas_usb3_init_controller(struct renesas_usb3 *usb3) -@@ -1986,6 +2008,12 @@ static const struct of_device_id usb3_of +@@ -1997,6 +2019,12 @@ static const struct of_device_id usb3_of }; MODULE_DEVICE_TABLE(of, usb3_of_match); @@ -113,7 +113,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int renesas_usb3_probe(struct platform_device *pdev) { struct renesas_usb3 *usb3; -@@ -2029,6 +2057,17 @@ static int renesas_usb3_probe(struct pla +@@ -2040,6 +2068,17 @@ static int renesas_usb3_probe(struct pla if (ret < 0) return ret; diff --git a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch index 4f79780192c39..9836839e6fde3 100644 --- a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch +++ b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch @@ -80,7 +80,7 @@ Conflicts: } static bool usb3_is_a_device(struct renesas_usb3 *usb3) -@@ -1873,11 +1884,49 @@ static const struct usb_gadget_ops renes +@@ -1884,11 +1895,49 @@ static const struct usb_gadget_ops renes .set_selfpowered = renesas_usb3_set_selfpowered, }; @@ -130,7 +130,7 @@ Conflicts: usb_del_gadget_udc(&usb3->gadget); __renesas_usb3_ep_free_request(usb3->ep0_req); -@@ -2077,12 +2126,19 @@ static int renesas_usb3_probe(struct pla +@@ -2088,12 +2137,19 @@ static int renesas_usb3_probe(struct pla if (ret < 0) goto err_add_udc; diff --git a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch index 901278da2b415..dbcb72fe54fef 100644 --- a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch +++ b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c -@@ -1852,6 +1852,9 @@ static int renesas_usb3_stop(struct usb_ +@@ -1863,6 +1863,9 @@ static int renesas_usb3_stop(struct usb_ pm_runtime_put(usb3_to_dev(usb3)); pm_runtime_disable(usb3_to_dev(usb3)); diff --git a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch index d41705d33d19e..d6f90dc0de97c 100644 --- a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch +++ b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch @@ -23,7 +23,7 @@ Conflicts: --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c -@@ -1852,9 +1852,6 @@ static int renesas_usb3_stop(struct usb_ +@@ -1863,9 +1863,6 @@ static int renesas_usb3_stop(struct usb_ pm_runtime_put(usb3_to_dev(usb3)); pm_runtime_disable(usb3_to_dev(usb3)); diff --git a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch index 775ad96fbb94d..ff979954f0d04 100644 --- a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch +++ b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA); usb3_write(usb3, 0, USB3_USB_INT_ENA_1); usb3_write(usb3, 0, USB3_USB_INT_ENA_2); -@@ -1693,6 +1692,7 @@ static int usb3_disable_pipe_n(struct re +@@ -1704,6 +1703,7 @@ static int usb3_disable_pipe_n(struct re spin_lock_irqsave(&usb3->lock, flags); if (!usb3_pn_change(usb3, usb3_ep->num)) { diff --git a/patches.renesas/0146-ravb-Remove-Rx-overflow-log-messages.patch b/patches.renesas/0146-ravb-Remove-Rx-overflow-log-messages.patch deleted file mode 100644 index 305a777a29855..0000000000000 --- a/patches.renesas/0146-ravb-Remove-Rx-overflow-log-messages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 82f06587873e40f3a20b90a2e5d19fc3cc6545e3 Mon Sep 17 00:00:00 2001 -From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> -Date: Thu, 12 Jan 2017 13:21:06 +0100 -Subject: [PATCH 146/299] ravb: Remove Rx overflow log messages - -Remove Rx overflow log messages as in an environment where logging results -in network traffic logging may cause further overflows. - -Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") -Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> -[simon: reworked changelog] -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> -Signed-off-by: David S. Miller <davem@davemloft.net> - -(cherry picked from commit 18a3ed59d09cf81a6447aadf6931bf0c9ffec5e0) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/net/ethernet/renesas/ravb_main.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - ---- a/drivers/net/ethernet/renesas/ravb_main.c -+++ b/drivers/net/ethernet/renesas/ravb_main.c -@@ -941,14 +941,10 @@ static int ravb_poll(struct napi_struct - /* Receive error message handling */ - priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; - priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; -- if (priv->rx_over_errors != ndev->stats.rx_over_errors) { -+ if (priv->rx_over_errors != ndev->stats.rx_over_errors) - ndev->stats.rx_over_errors = priv->rx_over_errors; -- netif_err(priv, rx_err, ndev, "Receive Descriptor Empty\n"); -- } -- if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) { -+ if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) - ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; -- netif_err(priv, rx_err, ndev, "Receive FIFO Overflow\n"); -- } - out: - return budget - quota; - } diff --git a/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch b/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch index a8baafc662035..26f0089c97a61 100644 --- a/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch +++ b/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1743,8 +1743,10 @@ static int sci_request_irq(struct sci_po +@@ -1742,8 +1742,10 @@ static int sci_request_irq(struct sci_po desc = sci_irq_desc + i; port->irqstr[j] = kasprintf(GFP_KERNEL, "%s:%s", dev_name(up->dev), desc->desc); diff --git a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch index 95448ed75f7c3..a570e9d8d53be 100644 --- a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch +++ b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2345,7 +2345,8 @@ done: +@@ -2344,7 +2344,8 @@ done: serial_port_out(port, SCFCR, ctrl); } @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val); serial_port_out(port, SCSCR, scr_val); if ((srr + 1 == 5) && -@@ -2799,7 +2800,8 @@ static void serial_console_write(struct +@@ -2798,7 +2799,8 @@ static void serial_console_write(struct /* first save SCSCR then disable interrupts, keep clock source */ ctrl = serial_port_in(port, SCSCR); @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (ctrl & (SCSCR_CKE1 | SCSCR_CKE0)); serial_port_out(port, SCSCR, ctrl_temp); -@@ -3002,7 +3004,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3001,7 +3003,6 @@ sci_parse_dt(struct platform_device *pde p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; p->type = SCI_OF_TYPE(match->data); p->regtype = SCI_OF_REGTYPE(match->data); @@ -47,7 +47,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (of_find_property(np, "uart-has-rtscts", NULL)) p->capabilities |= SCIx_HAVE_RTSCTS; -@@ -3170,9 +3171,9 @@ static int __init early_console_setup(st +@@ -3169,9 +3170,9 @@ static int __init early_console_setup(st sci_ports[0].cfg = &port_cfg; sci_ports[0].cfg->type = type; sci_probe_regmap(sci_ports[0].cfg); diff --git a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch index 8641e20ad253e..6b16e0acf1ab1 100644 --- a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch +++ b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2461,7 +2461,7 @@ static int sci_remap_port(struct uart_po +@@ -2460,7 +2460,7 @@ static int sci_remap_port(struct uart_po if (port->membase) return 0; @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->membase = ioremap_nocache(port->mapbase, sport->reg_size); if (unlikely(!port->membase)) { dev_err(port->dev, "can't remap port#%d\n", port->line); -@@ -2483,7 +2483,7 @@ static void sci_release_port(struct uart +@@ -2482,7 +2482,7 @@ static void sci_release_port(struct uart { struct sci_port *sport = to_sci_port(port); @@ -40,7 +40,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> iounmap(port->membase); port->membase = NULL; } -@@ -2739,7 +2739,7 @@ static int sci_init_single(struct platfo +@@ -2738,7 +2738,7 @@ static int sci_init_single(struct platfo } port->type = p->type; @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->regshift = p->regshift; /* -@@ -3001,7 +3001,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3000,7 +3000,6 @@ sci_parse_dt(struct platform_device *pde *dev_id = id; diff --git a/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch b/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch index 7cf1b14f751b0..8ef0d6f40503b 100644 --- a/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch +++ b/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch @@ -79,7 +79,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int ksz8041_config_init(struct phy_device *phydev) { struct device_node *of_node = phydev->mdio.dev.of_node; -@@ -703,8 +711,14 @@ static int kszphy_suspend(struct phy_dev +@@ -704,8 +712,14 @@ static int kszphy_suspend(struct phy_dev static int kszphy_resume(struct phy_device *phydev) { diff --git a/patches.renesas/0173-serial-sh-sci-Fix-register-offsets-for-the-IRDA-seri.patch b/patches.renesas/0173-serial-sh-sci-Fix-register-offsets-for-the-IRDA-seri.patch deleted file mode 100644 index dc937822a64e3..0000000000000 --- a/patches.renesas/0173-serial-sh-sci-Fix-register-offsets-for-the-IRDA-seri.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7407ea3dca099c60c5ac422e5c0b40b93d8bb946 Mon Sep 17 00:00:00 2001 -From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -Date: Wed, 11 Jan 2017 16:43:32 +0200 -Subject: [PATCH 173/255] serial: sh-sci: Fix register offsets for the IRDA - serial port - -Even though most of its registers are 8-bit wide, the IRDA has two -16-bit registers that make it a 16-bit peripheral and not a 8-bit -peripheral with addresses shifted by one. Fix the registers offset in -the driver and the platform data regshift value. - -Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -(cherry picked from commit a752ba18af8285e3eeda572f40dddaebff0c3621) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/sh/kernel/cpu/sh3/setup-sh770x.c | 1 - - drivers/tty/serial/sh-sci.c | 17 ++++++++--------- - 2 files changed, 8 insertions(+), 10 deletions(-) - ---- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c -+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c -@@ -165,7 +165,6 @@ static struct plat_sci_port scif2_platfo - .scscr = SCSCR_TE | SCSCR_RE, - .type = PORT_IRDA, - .ops = &sh770x_sci_port_ops, -- .regshift = 1, - }; - - static struct resource scif2_resources[] = { ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -193,18 +193,17 @@ static const struct plat_sci_reg sci_reg - }, - - /* -- * Common definitions for legacy IrDA ports, dependent on -- * regshift value. -+ * Common definitions for legacy IrDA ports. - */ - [SCIx_IRDA_REGTYPE] = { - [SCSMR] = { 0x00, 8 }, -- [SCBRR] = { 0x01, 8 }, -- [SCSCR] = { 0x02, 8 }, -- [SCxTDR] = { 0x03, 8 }, -- [SCxSR] = { 0x04, 8 }, -- [SCxRDR] = { 0x05, 8 }, -- [SCFCR] = { 0x06, 8 }, -- [SCFDR] = { 0x07, 16 }, -+ [SCBRR] = { 0x02, 8 }, -+ [SCSCR] = { 0x04, 8 }, -+ [SCxTDR] = { 0x06, 8 }, -+ [SCxSR] = { 0x08, 16 }, -+ [SCxRDR] = { 0x0a, 8 }, -+ [SCFCR] = { 0x0c, 8 }, -+ [SCFDR] = { 0x0e, 16 }, - [SCTFDR] = sci_reg_invalid, - [SCRFDR] = sci_reg_invalid, - [SCSPTR] = sci_reg_invalid, diff --git a/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch b/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch index 94cee0911a09e..1cc2348ac3169 100644 --- a/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch +++ b/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -540,6 +540,49 @@ static int xhci_get_ports(struct usb_hcd +@@ -561,6 +561,49 @@ static int xhci_get_ports(struct usb_hcd return max_ports; } @@ -70,7 +70,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array, int port_id, u32 link_state) { -@@ -1095,18 +1138,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1116,18 +1159,7 @@ int xhci_hub_control(struct usb_hcd *hcd * However, hub_wq will ignore the roothub events until * the roothub is registered. */ @@ -90,7 +90,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> break; case USB_PORT_FEAT_RESET: temp = (temp | PORT_RESET); -@@ -1210,15 +1242,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1231,15 +1263,7 @@ int xhci_hub_control(struct usb_hcd *hcd port_array[wIndex], temp); break; case USB_PORT_FEAT_POWER: diff --git a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch index 51bc8824019c9..b4a484dff4495 100644 --- a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch +++ b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch @@ -33,7 +33,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -583,6 +583,77 @@ static void xhci_set_port_power(struct x +@@ -604,6 +604,77 @@ static void xhci_set_port_power(struct x spin_lock_irqsave(&xhci->lock, flags); } @@ -111,7 +111,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array, int port_id, u32 link_state) { -@@ -941,6 +1012,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -962,6 +1033,7 @@ int xhci_hub_control(struct usb_hcd *hcd u16 link_state = 0; u16 wake_mask = 0; u16 timeout = 0; @@ -119,7 +119,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> max_ports = xhci_get_ports(hcd, &port_array); bus_state = &xhci->bus_state[hcd_index(hcd)]; -@@ -1014,6 +1086,8 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1035,6 +1107,8 @@ int xhci_hub_control(struct usb_hcd *hcd link_state = (wIndex & 0xff00) >> 3; if (wValue == USB_PORT_FEAT_REMOTE_WAKE_MASK) wake_mask = wIndex & 0xff00; @@ -128,7 +128,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* The MSB of wIndex is the U1/U2 timeout */ timeout = (wIndex & 0xff00) >> 8; wIndex &= 0xff; -@@ -1177,6 +1251,14 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1198,6 +1272,14 @@ int xhci_hub_control(struct usb_hcd *hcd temp |= PORT_U2_TIMEOUT(timeout); writel(temp, port_array[wIndex] + PORTPMSC); break; @@ -143,7 +143,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> default: goto error; } -@@ -1244,6 +1326,9 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1265,6 +1347,9 @@ int xhci_hub_control(struct usb_hcd *hcd case USB_PORT_FEAT_POWER: xhci_set_port_power(xhci, hcd, wIndex, false); break; diff --git a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch index bd9e763148572..d1c9980d723c1 100644 --- a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch +++ b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -1053,7 +1053,8 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1074,7 +1074,8 @@ int xhci_hub_control(struct usb_hcd *hcd goto error; wIndex--; temp = readl(port_array[wIndex]); @@ -42,7 +42,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> retval = -ENODEV; break; } -@@ -1095,7 +1096,8 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1116,7 +1117,8 @@ int xhci_hub_control(struct usb_hcd *hcd goto error; wIndex--; temp = readl(port_array[wIndex]); @@ -52,7 +52,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> retval = -ENODEV; break; } -@@ -1270,7 +1272,8 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1291,7 +1293,8 @@ int xhci_hub_control(struct usb_hcd *hcd goto error; wIndex--; temp = readl(port_array[wIndex]); @@ -62,7 +62,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> retval = -ENODEV; break; } -@@ -1381,7 +1384,8 @@ int xhci_hub_status_data(struct usb_hcd +@@ -1402,7 +1405,8 @@ int xhci_hub_status_data(struct usb_hcd /* For each port, did anything change? If so, set that bit in buf. */ for (i = 0; i < max_ports; i++) { temp = readl(port_array[i]); diff --git a/patches.renesas/0188-xhci-Put-warning-message-on-a-single-line.patch b/patches.renesas/0188-xhci-Put-warning-message-on-a-single-line.patch index e13c9ed8b5ed7..18fc34d4d143c 100644 --- a/patches.renesas/0188-xhci-Put-warning-message-on-a-single-line.patch +++ b/patches.renesas/0188-xhci-Put-warning-message-on-a-single-line.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -999,8 +999,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1020,8 +1020,7 @@ int xhci_hub_control(struct usb_hcd *hcd temp = readl(port_array[wIndex]); if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) || (temp & PORT_PLS_MASK) >= XDEV_U3) { diff --git a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch index 9be3727b9b2a5..c413910741916 100644 --- a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch +++ b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -392,10 +392,8 @@ static int xhci_stop_device(struct xhci_ +@@ -401,10 +401,8 @@ static int xhci_stop_device(struct xhci_ trace_xhci_stop_device(virt_dev); cmd = xhci_alloc_command(xhci, false, true, GFP_NOIO); @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> for (i = LAST_EP_INDEX; i > 0; i--) { --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2619,7 +2619,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2633,7 +2633,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, return 0; fail: diff --git a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch index 9274257eb776e..f685ed5ce6106 100644 --- a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch +++ b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch @@ -121,7 +121,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (dev->eps[i].ring) xhci_ring_free(xhci, dev->eps[i].ring); if (dev->eps[i].stream_info) -@@ -1598,7 +1598,7 @@ void xhci_update_bw_info(struct xhci_hcd +@@ -1612,7 +1612,7 @@ void xhci_update_bw_info(struct xhci_hcd unsigned int ep_type; int i; @@ -130,7 +130,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> bw_info = &virt_dev->eps[i].bw_info; /* We can't tell what endpoint type is being dropped, but -@@ -2583,9 +2583,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2597,9 +2597,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ diff --git a/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch b/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch index 074c05d31af36..5175106be4ea3 100644 --- a/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch +++ b/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -418,7 +418,8 @@ static int xhci_stop_device(struct xhci_ +@@ -437,7 +437,8 @@ static int xhci_stop_device(struct xhci_ /* Wait for last stop endpoint command to finish */ wait_for_completion(cmd->completion); diff --git a/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch b/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch index fff638a537a5c..a1c6b0bd2b862 100644 --- a/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch +++ b/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch @@ -33,7 +33,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -226,6 +226,9 @@ static void xhci_pci_quirks(struct devic +@@ -217,6 +217,9 @@ static void xhci_pci_quirks(struct devic if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241) xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7; diff --git a/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch b/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch index 5550476ac763b..b02c83f496e4c 100644 --- a/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch +++ b/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -552,11 +552,10 @@ static __le32 __iomem *xhci_get_port_io_ +@@ -573,11 +573,10 @@ static __le32 __iomem *xhci_get_port_io_ * method. */ static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd, @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> addr = xhci_get_port_io_addr(hcd, index); temp = readl(addr); -@@ -572,13 +571,13 @@ static void xhci_set_port_power(struct x +@@ -593,13 +592,13 @@ static void xhci_set_port_power(struct x writel(temp & ~PORT_POWER, addr); } @@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static void xhci_port_set_test_mode(struct xhci_hcd *xhci, -@@ -598,7 +597,7 @@ static void xhci_port_set_test_mode(stru +@@ -619,7 +618,7 @@ static void xhci_port_set_test_mode(stru } static int xhci_enter_test_mode(struct xhci_hcd *xhci, @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { int i, retval; -@@ -614,10 +613,10 @@ static int xhci_enter_test_mode(struct x +@@ -635,10 +634,10 @@ static int xhci_enter_test_mode(struct x xhci_dbg(xhci, "Disable all port (PP = 0)\n"); /* Power off USB3 ports*/ for (i = 0; i < xhci->num_usb3_ports; i++) @@ -79,7 +79,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Stop the controller */ xhci_dbg(xhci, "Stop controller\n"); retval = xhci_halt(xhci); -@@ -1212,7 +1211,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1233,7 +1232,7 @@ int xhci_hub_control(struct usb_hcd *hcd * However, hub_wq will ignore the roothub events until * the roothub is registered. */ @@ -88,7 +88,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> break; case USB_PORT_FEAT_RESET: temp = (temp | PORT_RESET); -@@ -1257,7 +1256,8 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1278,7 +1277,8 @@ int xhci_hub_control(struct usb_hcd *hcd goto error; if (test_mode > TEST_FORCE_EN || test_mode < TEST_J) goto error; @@ -98,7 +98,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> break; default: goto error; -@@ -1325,7 +1325,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1346,7 +1346,7 @@ int xhci_hub_control(struct usb_hcd *hcd port_array[wIndex], temp); break; case USB_PORT_FEAT_POWER: diff --git a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch index 9735f18ab72ed..835592f39e1e9 100644 --- a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch +++ b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2434,7 +2434,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2448,7 +2448,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, writel(val, &xhci->op_regs->config_reg); /* diff --git a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch index 2cf827736c11b..37f21e2a9fce4 100644 --- a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch +++ b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1721,36 +1721,27 @@ static int scratchpad_alloc(struct xhci_ +@@ -1735,36 +1735,27 @@ static int scratchpad_alloc(struct xhci_ if (!xhci->scratchpad->sp_buffers) goto fail_sp3; @@ -58,7 +58,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> kfree(xhci->scratchpad->sp_buffers); fail_sp3: -@@ -1780,9 +1771,8 @@ static void scratchpad_free(struct xhci_ +@@ -1794,9 +1785,8 @@ static void scratchpad_free(struct xhci_ for (i = 0; i < num_sp; i++) { dma_free_coherent(dev, xhci->page_size, xhci->scratchpad->sp_buffers[i], diff --git a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch index cab446ebcf733..c80c70d21cb2a 100644 --- a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch +++ b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1414,14 +1414,16 @@ static u32 xhci_get_endpoint_type(struct +@@ -1428,14 +1428,16 @@ static u32 xhci_get_endpoint_type(struct in = usb_endpoint_dir_in(&ep->desc); diff --git a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch index edd0b0f107e7f..2a8fe7be8f2ee 100644 --- a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch +++ b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -389,6 +389,8 @@ static int xhci_stop_device(struct xhci_ +@@ -398,6 +398,8 @@ static int xhci_stop_device(struct xhci_ if (!virt_dev) return -ENODEV; @@ -42,16 +42,16 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; -@@ -1075,6 +1078,8 @@ int xhci_alloc_virt_device(struct xhci_h - &xhci->dcbaa->dev_context_ptrs[slot_id], - le64_to_cpu(xhci->dcbaa->dev_context_ptrs[slot_id])); +@@ -1083,6 +1086,8 @@ int xhci_alloc_virt_device(struct xhci_h + + xhci->devs[slot_id] = dev; + trace_xhci_alloc_virt_device(dev); + return 1; fail: - xhci_free_virt_device(xhci, slot_id); -@@ -1249,6 +1254,8 @@ int xhci_setup_addressable_virt_dev(stru + +@@ -1263,6 +1268,8 @@ int xhci_setup_addressable_virt_dev(stru ep0_ctx->deq = cpu_to_le64(dev->eps[0].ring->first_seg->dma | dev->eps[0].ring->cycle_state); diff --git a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch index 804b78eaef427..343cef2381ee2 100644 --- a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch +++ b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1828,10 +1828,7 @@ struct xhci_command *xhci_alloc_command( +@@ -1842,10 +1842,7 @@ struct xhci_command *xhci_alloc_command( void xhci_urb_free_priv(struct urb_priv *urb_priv) { diff --git a/patches.renesas/0214-xhci-plat-Register-shutdown-for-xhci_plat.patch b/patches.renesas/0214-xhci-plat-Register-shutdown-for-xhci_plat.patch deleted file mode 100644 index b9f4acf5e6708..0000000000000 --- a/patches.renesas/0214-xhci-plat-Register-shutdown-for-xhci_plat.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b17ecaa4b1913acf963fb1d36f871c3fa17ba528 Mon Sep 17 00:00:00 2001 -From: Adam Wallis <awallis@codeaurora.org> -Date: Tue, 28 Mar 2017 15:55:28 +0300 -Subject: [PATCH 214/255] xhci: plat: Register shutdown for xhci_plat - -Shutdown should be called for xhci_plat devices especially for -situations where kexec might be used by stopping DMA -transactions. - -Signed-off-by: Adam Wallis <awallis@codeaurora.org> -Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -(cherry picked from commit b07c12517f2aed0add8ce18146bb426b14099392) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/usb/host/xhci-plat.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-plat.c -+++ b/drivers/usb/host/xhci-plat.c -@@ -344,6 +344,7 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_ - static struct platform_driver usb_xhci_driver = { - .probe = xhci_plat_probe, - .remove = xhci_plat_remove, -+ .shutdown = usb_hcd_platform_shutdown, - .driver = { - .name = "xhci-hcd", - .pm = DEV_PM_OPS, diff --git a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch index 76ea11cb07164..a4439e869a245 100644 --- a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch +++ b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2310,10 +2310,11 @@ static int xhci_setup_port_arrays(struct +@@ -2324,10 +2324,11 @@ static int xhci_setup_port_arrays(struct /* Place limits on the number of roothub ports so that the hub * descriptors aren't longer than the USB core will allocate. */ diff --git a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch index daf00bdd90344..b45a88a2c7743 100644 --- a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch +++ b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -419,7 +419,7 @@ static int xhci_stop_device(struct xhci_ +@@ -438,7 +438,7 @@ static int xhci_stop_device(struct xhci_ wait_for_completion(cmd->completion); if (cmd->status == COMP_COMMAND_ABORTED || diff --git a/patches.renesas/0271-usb-add-helper-to-extract-bits-12-11-of-wMaxPacketSi.patch b/patches.renesas/0271-usb-add-helper-to-extract-bits-12-11-of-wMaxPacketSi.patch index 14c613ce2ca95..59fe285f8fb38 100644 --- a/patches.renesas/0271-usb-add-helper-to-extract-bits-12-11-of-wMaxPacketSi.patch +++ b/patches.renesas/0271-usb-add-helper-to-extract-bits-12-11-of-wMaxPacketSi.patch @@ -32,9 +32,9 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/include/uapi/linux/usb/ch9.h +++ b/include/uapi/linux/usb/ch9.h -@@ -423,6 +423,11 @@ struct usb_endpoint_descriptor { - #define USB_ENDPOINT_XFER_INT 3 - #define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 +@@ -428,6 +428,11 @@ struct usb_endpoint_descriptor { + #define USB_EP_MAXP_MULT(m) \ + (((m) & USB_EP_MAXP_MULT_MASK) >> USB_EP_MAXP_MULT_SHIFT) +#define USB_EP_MAXP_MULT_SHIFT 11 +#define USB_EP_MAXP_MULT_MASK (3 << USB_EP_MAXP_MULT_SHIFT) @@ -44,11 +44,10 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */ #define USB_ENDPOINT_INTRTYPE 0x30 #define USB_ENDPOINT_INTR_PERIODIC (0 << 4) -@@ -630,6 +635,20 @@ static inline int usb_endpoint_maxp(cons - return __le16_to_cpu(epd->wMaxPacketSize); +@@ -636,6 +641,20 @@ static inline int usb_endpoint_maxp(cons } -+/** + /** + * usb_endpoint_maxp_mult - get endpoint's transactional opportunities + * @epd: endpoint to be checked + * @@ -62,6 +61,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> + return USB_EP_MAXP_MULT(maxp) + 1; +} + - static inline int usb_endpoint_interrupt_type( - const struct usb_endpoint_descriptor *epd) - { ++/** + * usb_endpoint_maxp_mult - get endpoint's transactional opportunities + * @epd: endpoint to be checked + * diff --git a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch index c90d2d8325785..ed0b16f5935e5 100644 --- a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch +++ b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1404,7 +1404,7 @@ static u32 xhci_get_endpoint_max_burst(s +@@ -1418,7 +1418,7 @@ static u32 xhci_get_endpoint_max_burst(s if (udev->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(&ep->desc) || usb_endpoint_xfer_int(&ep->desc))) @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -1450,9 +1450,9 @@ static u32 xhci_get_max_esit_payload(str +@@ -1464,9 +1464,9 @@ static u32 xhci_get_max_esit_payload(str return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)); diff --git a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch index befe4258c5ef8..6e5bd05b6d7e9 100644 --- a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch +++ b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1449,7 +1449,7 @@ static u32 xhci_get_max_esit_payload(str +@@ -1463,7 +1463,7 @@ static u32 xhci_get_max_esit_payload(str else if (udev->speed >= USB_SPEED_SUPER) return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> max_burst = usb_endpoint_maxp_mult(&ep->desc); /* A 0 in max burst means 1 transfer per ESIT */ return max_packet * max_burst; -@@ -1506,7 +1506,7 @@ int xhci_endpoint_init(struct xhci_hcd * +@@ -1520,7 +1520,7 @@ int xhci_endpoint_init(struct xhci_hcd * } mult = xhci_get_endpoint_mult(udev, ep); @@ -61,7 +61,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -3145,7 +3145,7 @@ static u32 xhci_td_remainder(struct xhci - if (xhci->quirks & XHCI_MTK_HOST) + if ((xhci->quirks & XHCI_MTK_HOST) && (xhci->hci_version < 0x100)) trb_buff_len = 0; - maxp = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc)); diff --git a/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch b/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch index 72cdae550b7de..4cad5cc13fd5a 100644 --- a/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch +++ b/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1066,7 +1066,6 @@ int xhci_alloc_virt_device(struct xhci_h +@@ -1072,7 +1072,6 @@ int xhci_alloc_virt_device(struct xhci_h goto fail; dev->num_rings_cached = 0; diff --git a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch index f4c786d5f8dc9..89150b3f5be9a 100644 --- a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch +++ b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2583,7 +2583,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2597,7 +2597,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ diff --git a/patches.socfpga/0009-dt-bindings-Add-Macnica-Americas-vendor-prefix.patch b/patches.socfpga/0009-dt-bindings-Add-Macnica-Americas-vendor-prefix.patch index 1487c49f8fd91..695600e51d7d4 100644 --- a/patches.socfpga/0009-dt-bindings-Add-Macnica-Americas-vendor-prefix.patch +++ b/patches.socfpga/0009-dt-bindings-Add-Macnica-Americas-vendor-prefix.patch @@ -14,7 +14,7 @@ Signed-off-by: Rob Herring <robh@kernel.org> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -158,6 +158,7 @@ lg LG Corporation +@@ -159,6 +159,7 @@ lg LG Corporation linux Linux-specific binding lltc Linear Technology Corporation lsi LSI Corp. (LSI Logic) diff --git a/patches.socfpga/0010-dt-bindings-Add-vendor-prefix-for-Terasic-Inc.patch b/patches.socfpga/0010-dt-bindings-Add-vendor-prefix-for-Terasic-Inc.patch index 7a2ff47069924..4ac6b2b5c0076 100644 --- a/patches.socfpga/0010-dt-bindings-Add-vendor-prefix-for-Terasic-Inc.patch +++ b/patches.socfpga/0010-dt-bindings-Add-vendor-prefix-for-Terasic-Inc.patch @@ -15,7 +15,7 @@ Signed-off-by: Rob Herring <robh@kernel.org> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -276,6 +276,7 @@ tcg Trusted Computing Group +@@ -277,6 +277,7 @@ tcg Trusted Computing Group tcl Toby Churchill Ltd. technexion TechNexion technologic Technologic Systems diff --git a/patches.socfpga/0011-dt-bindings-Add-vendor-prefix-for-Samtec.patch b/patches.socfpga/0011-dt-bindings-Add-vendor-prefix-for-Samtec.patch index d0eb1bf2a90a7..d9522d878a0d2 100644 --- a/patches.socfpga/0011-dt-bindings-Add-vendor-prefix-for-Samtec.patch +++ b/patches.socfpga/0011-dt-bindings-Add-vendor-prefix-for-Samtec.patch @@ -16,7 +16,7 @@ Signed-off-by: Rob Herring <robh@kernel.org> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -232,6 +232,7 @@ richtek Richtek Technology Corporation +@@ -233,6 +233,7 @@ richtek Richtek Technology Corporation ricoh Ricoh Co. Ltd. rockchip Fuzhou Rockchip Electronics Co., Ltd samsung Samsung Semiconductor @@ -54,7 +54,6 @@ patches.renesas/0031-PCI-rcar-gen2-Use-gen2-fallback-compatibility-last.patch patches.renesas/0032-PCI-rcar-Use-gen2-fallback-compatibility-last.patch patches.renesas/0033-PCI-rcar-Add-gen3-fallback-compatibility-string-for-.patch patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch -patches.renesas/0035-net-phy-micrel-KSZ8795-do-not-set-SUPPORTED_-Asym_-P.patch patches.renesas/0036-phy-rcar-gen3-usb2-add-sysfs-for-usb-role-swap.patch patches.renesas/0037-can-rcar_can-Add-r8a7796-support.patch patches.renesas/0038-can-rcar_canfd-Add-r8a7796-support.patch @@ -98,7 +97,6 @@ patches.renesas/0079-ASoC-rsnd-rsnd_get_dalign-needs-to-care-SSIU-not-SSI.patch patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch patches.renesas/0081-ASoC-rsnd-enable-disable-ADG-when-suspend-resume-tim.patch patches.renesas/0082-ASoC-rsnd-setup-BRGCKR-BRRA-BRRB-when-starting.patch -patches.renesas/0083-ASoC-rsnd-don-t-double-free-kctrl.patch patches.renesas/0084-spi-rspi-supports-32bytes-buffer-for-DUAL-and-QUAD.patch patches.renesas/0085-spi-rspi-avoid-uninitialized-variable-access.patch patches.renesas/0086-mmc-sh_mmcif-Document-r8a73a4-r8a7778-and-sh73a0-DT-.patch @@ -158,7 +156,6 @@ patches.renesas/0142-arm64-dts-r8a7796-Add-device-node-for-PRR.patch patches.renesas/0143-arm64-defconfig-Do-not-lower-CONFIG_LOG_BUF_SHIFT.patch patches.renesas/0144-arm64-defconfig-drop-GPIO_SYSFS-on-multiplatforms.patch patches.renesas/0145-arm64-dts-h3ulcb-Provide-sd0_uhs-node.patch -patches.renesas/0146-ravb-Remove-Rx-overflow-log-messages.patch patches.renesas/0147-mmc-core-Add-helper-to-see-if-a-host-can-be-retuned.patch patches.renesas/0148-mmc-tmio-enhance-illegal-sequence-handling.patch patches.renesas/0149-mmc-tmio-document-mandatory-and-optional-callbacks.patch @@ -315,9 +312,6 @@ patches.renesas/0299-drm-bridge-add-DesignWare-HDMI-I2S-audio-support.patch patches.renesas/0001-drm-bridge-adv7511-Initialize-regulators.patch patches.renesas/0004-drm-bridge-adv7511-Enable-HPD-interrupts-to-support-.patch -patches.renesas/0005-drm-bridge-adv7511-Rework-adv7511_power_on-off-so-th.patch -patches.renesas/0006-drm-bridge-adv7511-Reuse-__adv7511_power_on-off-when.patch -patches.renesas/0007-drm-bridge-adv7511-Re-write-the-i2c-address-before-E.patch patches.renesas/0008-ASoC-ak4642-Replace-mdelay-function-to-msleep.patch patches.renesas/0009-clk-renesas-r8a7796-Add-CAN-peripheral-clock.patch patches.renesas/0010-clk-renesas-r8a7796-Add-CANFD-clock.patch @@ -362,8 +356,6 @@ patches.renesas/0048-Input-gpio-keys-add-support-for-setkeycode.patch patches.renesas/0049-gpio-rcar-set-IRQ-chip-parent_device.patch patches.renesas/0050-gpio-rcar-Fine-grained-Runtime-PM-support.patch patches.renesas/0051-regulator-gpio-correct-default-type.patch -patches.renesas/0052-i2c-riic-correctly-finish-transfers.patch -patches.renesas/0053-i2c-riic-fix-restart-condition.patch patches.renesas/0054-i2c-sh_mobile-document-support-for-r8a7796-R-Car-M3-.patch patches.renesas/0055-iommu-ipmmu-vmsa-Restrict-IOMMU-Domain-Geometry-to-3.patch patches.renesas/0056-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch @@ -395,7 +387,6 @@ patches.renesas/0081-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch patches.renesas/0082-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch patches.renesas/0083-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch patches.renesas/0084-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch -patches.renesas/0085-ARM-dts-r8a7790-Use-R-Car-Gen-2-fallback-binding-for.patch patches.renesas/0086-ARM-shmobile-apmu-Add-more-register-documentation.patch patches.renesas/0087-ARM-shmobile-apmu-Add-debug-resource-reset-for-secon.patch patches.renesas/0088-ARM-shmobile-apmu-Allow-booting-secondary-CPU-cores-.patch @@ -426,9 +417,6 @@ patches.renesas/0112-iio-adc-Add-Renesas-GyroADC-driver.patch patches.renesas/0113-iio-adc-handle-unknow-of_device_id-data.patch patches.renesas/0114-ASoC-rsnd-fixup-for_each_rsnd_mod_array-s-iterator-i.patch patches.renesas/0115-ASoC-rsnd-fixup-reset-timing-of-sync-convert_rate.patch -patches.renesas/0116-ASoC-rcar-avoid-SSI_MODEx-settings-for-SSI8.patch -patches.renesas/0117-ASoC-rsnd-fix-sound-route-path-when-using-SRC6-SRC9.patch -patches.renesas/0118-ASoC-rcar-clear-DE-bit-only-in-PDMACHCR-when-it-stop.patch patches.renesas/0119-ASoC-rcar-dma-remove-unnecessary-volatile.patch patches.renesas/0120-spi-rspi-Remove-useless-memory-allocation-failure-me.patch patches.renesas/0121-spi-rspi-Fixes-bogus-received-byte-in-qspi_transfer_.patch @@ -439,7 +427,6 @@ patches.renesas/0125-sh_eth-no-need-for-else-after-goto.patch patches.renesas/0126-sh_eth-factor-out-sh_eth_emac_interrupt.patch patches.renesas/0127-sh_eth-get-rid-of-sh_eth_cpu_data-shift_rd0.patch patches.renesas/0128-sh_eth-rename-sh_eth_cpu_data-hw_crc.patch -patches.renesas/0129-sh_eth-use-correct-name-for-ECMR_MPDE-bit.patch patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch patches.renesas/0131-sh_eth-enable-wake-on-lan-for-R-Car-Gen2-devices.patch patches.renesas/0132-sh_eth-enable-wake-on-lan-for-r8a7740-armadillo.patch @@ -483,7 +470,6 @@ patches.renesas/0169-pinctrl-sh-pfc-r8a7791-Add-ADI-pinconf-support.patch patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch -patches.renesas/0173-serial-sh-sci-Fix-register-offsets-for-the-IRDA-seri.patch patches.renesas/0174-serial-sh-sci-Remove-initialization-of-zero-fields-i.patch patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch @@ -524,7 +510,6 @@ patches.renesas/0210-xhci-rename-size-variable-to-num_tds.patch patches.renesas/0211-xhci-Rename-variables-related-to-transfer-descritpor.patch patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch patches.renesas/0213-xhci-refactor-xhci_urb_enqueue.patch -patches.renesas/0214-xhci-plat-Register-shutdown-for-xhci_plat.patch patches.renesas/0215-xhci-Set-URB-actual-length-for-stopped-control-trans.patch patches.renesas/0216-xhci-Manually-give-back-cancelled-URB-if-we-can-t-qu.patch patches.renesas/0217-ravb-Add-tx-and-rx-clock-internal-delays-mode-of-APS.patch |