Update KERNEL_VERSION to 4.14.73
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 3fc3ba7..7af26b9 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.14.70
+4.14.73
diff --git a/patches/0081-kbuild-clean-up-.dtb-and-.dtb.S-patterns-from-top-le.patch b/patches/0081-kbuild-clean-up-.dtb-and-.dtb.S-patterns-from-top-le.patch
index 591731b..9a8c473 100644
--- a/patches/0081-kbuild-clean-up-.dtb-and-.dtb.S-patterns-from-top-le.patch
+++ b/patches/0081-kbuild-clean-up-.dtb-and-.dtb.S-patterns-from-top-le.patch
@@ -86,7 +86,7 @@
--- 6.8 Custom kbuild commands
diff --git a/Makefile b/Makefile
-index aa458afa7fa2..f5caf45de28b 100644
+index 89f30ca964b6..f0f2e410650e 100644
--- a/Makefile
+++ b/Makefile
@@ -1573,7 +1573,7 @@ clean: $(clean-dirs)
diff --git a/patches/0083-pinctrl-gpio-Unify-namespace-for-cross-calls.patch b/patches/0083-pinctrl-gpio-Unify-namespace-for-cross-calls.patch
index ce21ac2..c3dab95 100644
--- a/patches/0083-pinctrl-gpio-Unify-namespace-for-cross-calls.patch
+++ b/patches/0083-pinctrl-gpio-Unify-namespace-for-cross-calls.patch
@@ -151,7 +151,7 @@
/* Set the GPIO as an input to ensure that the next GPIO request won't
* drive the GPIO pin as an output.
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
-index 6029899789f3..da68d6cbc1e4 100644
+index 2943dfc4c470..3f7e86f5e0ba 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -332,12 +332,12 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,
@@ -192,7 +192,7 @@
/*
* Set the GPIO as an input to ensure that the next GPIO request won't
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
-index fbaf974277df..8db47f671708 100644
+index 1eb857e2f62f..56b6bac5141d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -141,14 +141,14 @@ static void tegra_gpio_disable(struct tegra_gpio_info *tgi, unsigned int gpio)
diff --git a/patches/0092-iommu-io-pgtable-arm-Convert-to-IOMMU-API-TLB-sync.patch b/patches/0092-iommu-io-pgtable-arm-Convert-to-IOMMU-API-TLB-sync.patch
index eb948c1..0af16f4 100644
--- a/patches/0092-iommu-io-pgtable-arm-Convert-to-IOMMU-API-TLB-sync.patch
+++ b/patches/0092-iommu-io-pgtable-arm-Convert-to-IOMMU-API-TLB-sync.patch
@@ -23,10 +23,10 @@
4 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
-index 8f7a3c00b6cf..193f8c860010 100644
+index 26e99c03390f..3d5851ef4af4 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
-@@ -1752,6 +1752,14 @@ arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
+@@ -1753,6 +1753,14 @@ arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
return ops->unmap(ops, iova, size);
}
@@ -41,7 +41,7 @@
static phys_addr_t
arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
{
-@@ -1972,6 +1980,8 @@ static struct iommu_ops arm_smmu_ops = {
+@@ -1973,6 +1981,8 @@ static struct iommu_ops arm_smmu_ops = {
.map = arm_smmu_map,
.unmap = arm_smmu_unmap,
.map_sg = default_iommu_map_sg,
@@ -150,10 +150,10 @@
static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 195d6e93ac71..af8140054273 100644
+index 5d0ba5f644c4..0be53328cb8e 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
-@@ -619,6 +619,14 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
+@@ -618,6 +618,14 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
return domain->iop->unmap(domain->iop, iova, size);
}
@@ -168,7 +168,7 @@
static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
dma_addr_t iova)
{
-@@ -876,6 +884,8 @@ static const struct iommu_ops ipmmu_ops = {
+@@ -875,6 +883,8 @@ static const struct iommu_ops ipmmu_ops = {
.detach_dev = ipmmu_detach_device,
.map = ipmmu_map,
.unmap = ipmmu_unmap,
diff --git a/patches/0094-iommu-ipmmu-vmsa-Fix-return-value-check-in-ipmmu_fin.patch b/patches/0094-iommu-ipmmu-vmsa-Fix-return-value-check-in-ipmmu_fin.patch
index d480ccb..8f92d0b 100644
--- a/patches/0094-iommu-ipmmu-vmsa-Fix-return-value-check-in-ipmmu_fin.patch
+++ b/patches/0094-iommu-ipmmu-vmsa-Fix-return-value-check-in-ipmmu_fin.patch
@@ -19,10 +19,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index af8140054273..00e88a88ee3a 100644
+index 0be53328cb8e..d055df0ed9c8 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
-@@ -871,7 +871,7 @@ static struct iommu_group *ipmmu_find_group_dma(struct device *dev)
+@@ -870,7 +870,7 @@ static struct iommu_group *ipmmu_find_group_dma(struct device *dev)
sibling = ipmmu_find_sibling_device(dev);
if (sibling)
group = iommu_group_get(sibling);
diff --git a/patches/0095-iommu-ipmmu-vmsa-Unify-domain-alloc-free.patch b/patches/0095-iommu-ipmmu-vmsa-Unify-domain-alloc-free.patch
index 4223713..93b5ef4 100644
--- a/patches/0095-iommu-ipmmu-vmsa-Unify-domain-alloc-free.patch
+++ b/patches/0095-iommu-ipmmu-vmsa-Unify-domain-alloc-free.patch
@@ -23,7 +23,7 @@
1 file changed, 24 insertions(+), 41 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 00e88a88ee3a..37154075c00a 100644
+index d055df0ed9c8..1f4df07eda06 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -528,6 +528,27 @@ static struct iommu_domain *__ipmmu_domain_alloc(unsigned type)
@@ -62,7 +62,7 @@
ipmmu_domain_destroy_context(domain);
free_io_pgtable_ops(domain->iop);
kfree(domain);
-@@ -671,14 +693,6 @@ static int ipmmu_of_xlate(struct device *dev,
+@@ -670,14 +692,6 @@ static int ipmmu_of_xlate(struct device *dev,
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
@@ -77,7 +77,7 @@
static int ipmmu_add_device(struct device *dev)
{
struct ipmmu_vmsa_device *mmu = NULL;
-@@ -779,37 +793,6 @@ static const struct iommu_ops ipmmu_ops = {
+@@ -778,37 +792,6 @@ static const struct iommu_ops ipmmu_ops = {
static DEFINE_SPINLOCK(ipmmu_slave_devices_lock);
static LIST_HEAD(ipmmu_slave_devices);
@@ -115,7 +115,7 @@
static int ipmmu_add_device_dma(struct device *dev)
{
struct iommu_group *group;
-@@ -878,8 +861,8 @@ static struct iommu_group *ipmmu_find_group_dma(struct device *dev)
+@@ -877,8 +860,8 @@ static struct iommu_group *ipmmu_find_group_dma(struct device *dev)
}
static const struct iommu_ops ipmmu_ops = {
diff --git a/patches/0096-iommu-ipmmu-vmsa-Simplify-group-allocation.patch b/patches/0096-iommu-ipmmu-vmsa-Simplify-group-allocation.patch
index 5ce044f..4f215a4 100644
--- a/patches/0096-iommu-ipmmu-vmsa-Simplify-group-allocation.patch
+++ b/patches/0096-iommu-ipmmu-vmsa-Simplify-group-allocation.patch
@@ -20,7 +20,7 @@
1 file changed, 9 insertions(+), 44 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 37154075c00a..6e6a86f3c375 100644
+index 1f4df07eda06..6ef16b7d803c 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -43,6 +43,7 @@ struct ipmmu_vmsa_device {
@@ -40,7 +40,7 @@
};
static struct ipmmu_vmsa_domain *to_vmsa_domain(struct iommu_domain *dom)
-@@ -674,7 +673,6 @@ static int ipmmu_init_platform_device(struct device *dev,
+@@ -673,7 +672,6 @@ static int ipmmu_init_platform_device(struct device *dev,
return -ENOMEM;
priv->mmu = platform_get_drvdata(ipmmu_pdev);
@@ -48,7 +48,7 @@
dev->iommu_fwspec->iommu_priv = priv;
return 0;
}
-@@ -790,9 +788,6 @@ static const struct iommu_ops ipmmu_ops = {
+@@ -789,9 +787,6 @@ static const struct iommu_ops ipmmu_ops = {
#ifdef CONFIG_IOMMU_DMA
@@ -58,7 +58,7 @@
static int ipmmu_add_device_dma(struct device *dev)
{
struct iommu_group *group;
-@@ -807,55 +802,25 @@ static int ipmmu_add_device_dma(struct device *dev)
+@@ -806,55 +801,25 @@ static int ipmmu_add_device_dma(struct device *dev)
if (IS_ERR(group))
return PTR_ERR(group);
@@ -121,7 +121,7 @@
return group;
}
-@@ -873,7 +838,7 @@ static const struct iommu_ops ipmmu_ops = {
+@@ -872,7 +837,7 @@ static const struct iommu_ops ipmmu_ops = {
.iova_to_phys = ipmmu_iova_to_phys,
.add_device = ipmmu_add_device_dma,
.remove_device = ipmmu_remove_device_dma,
diff --git a/patches/0097-iommu-ipmmu-vmsa-Clean-up-struct-ipmmu_vmsa_iommu_pr.patch b/patches/0097-iommu-ipmmu-vmsa-Clean-up-struct-ipmmu_vmsa_iommu_pr.patch
index dbac6fc..238a417 100644
--- a/patches/0097-iommu-ipmmu-vmsa-Clean-up-struct-ipmmu_vmsa_iommu_pr.patch
+++ b/patches/0097-iommu-ipmmu-vmsa-Clean-up-struct-ipmmu_vmsa_iommu_pr.patch
@@ -18,11 +18,11 @@
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 6e6a86f3c375..fd05a5f5a47e 100644
+index 6ef16b7d803c..c7c557a920f1 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -58,16 +58,12 @@ struct ipmmu_vmsa_domain {
- spinlock_t lock; /* Protects mappings */
+ struct mutex mutex; /* Protects mappings */
};
-struct ipmmu_vmsa_iommu_priv {
@@ -39,7 +39,7 @@
{
return dev->iommu_fwspec ? dev->iommu_fwspec->iommu_priv : NULL;
}
-@@ -565,15 +561,14 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
+@@ -565,14 +561,13 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
static int ipmmu_attach_device(struct iommu_domain *io_domain,
struct device *dev)
{
@@ -48,7 +48,6 @@
- struct ipmmu_vmsa_device *mmu = priv->mmu;
+ struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
- unsigned long flags;
unsigned int i;
int ret = 0;
@@ -57,7 +56,7 @@
dev_err(dev, "Cannot attach to IPMMU\n");
return -ENXIO;
}
-@@ -662,18 +657,12 @@ static int ipmmu_init_platform_device(struct device *dev,
+@@ -661,18 +656,12 @@ static int ipmmu_init_platform_device(struct device *dev,
struct of_phandle_args *args)
{
struct platform_device *ipmmu_pdev;
@@ -77,7 +76,7 @@
return 0;
}
-@@ -683,7 +672,7 @@ static int ipmmu_of_xlate(struct device *dev,
+@@ -682,7 +671,7 @@ static int ipmmu_of_xlate(struct device *dev,
iommu_fwspec_add_ids(dev, spec->args, 1);
/* Initialize once - xlate() will call multiple times */
@@ -86,7 +85,7 @@
return 0;
return ipmmu_init_platform_device(dev, spec);
-@@ -693,14 +682,14 @@ static int ipmmu_of_xlate(struct device *dev,
+@@ -692,14 +681,14 @@ static int ipmmu_of_xlate(struct device *dev,
static int ipmmu_add_device(struct device *dev)
{
@@ -103,7 +102,7 @@
return -ENODEV;
/* Create a device group and add the device to it. */
-@@ -729,7 +718,6 @@ static int ipmmu_add_device(struct device *dev)
+@@ -728,7 +717,6 @@ static int ipmmu_add_device(struct device *dev)
* - Make the mapping size configurable ? We currently use a 2GB mapping
* at a 1GB offset to ensure that NULL VAs will fault.
*/
@@ -111,7 +110,7 @@
if (!mmu->mapping) {
struct dma_iommu_mapping *mapping;
-@@ -795,7 +783,7 @@ static int ipmmu_add_device_dma(struct device *dev)
+@@ -794,7 +782,7 @@ static int ipmmu_add_device_dma(struct device *dev)
/*
* Only let through devices that have been verified in xlate()
*/
@@ -120,7 +119,7 @@
return -ENODEV;
group = iommu_group_get_for_dev(dev);
-@@ -812,15 +800,15 @@ static void ipmmu_remove_device_dma(struct device *dev)
+@@ -811,15 +799,15 @@ static void ipmmu_remove_device_dma(struct device *dev)
static struct iommu_group *ipmmu_find_group(struct device *dev)
{
diff --git a/patches/0098-iommu-ipmmu-vmsa-Unify-ipmmu_ops.patch b/patches/0098-iommu-ipmmu-vmsa-Unify-ipmmu_ops.patch
index 4a3c1b0..ad07815 100644
--- a/patches/0098-iommu-ipmmu-vmsa-Unify-ipmmu_ops.patch
+++ b/patches/0098-iommu-ipmmu-vmsa-Unify-ipmmu_ops.patch
@@ -19,7 +19,7 @@
1 file changed, 19 insertions(+), 50 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index fd05a5f5a47e..f6d2e8e650be 100644
+index c7c557a920f1..f8b7051a34fa 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -27,6 +27,11 @@
@@ -34,7 +34,7 @@
#endif
#include "io-pgtable.h"
-@@ -678,26 +683,17 @@ static int ipmmu_of_xlate(struct device *dev,
+@@ -677,26 +682,17 @@ static int ipmmu_of_xlate(struct device *dev,
return ipmmu_init_platform_device(dev, spec);
}
@@ -63,7 +63,7 @@
}
ret = iommu_group_add_device(group, dev);
-@@ -705,8 +701,7 @@ static int ipmmu_add_device(struct device *dev)
+@@ -704,8 +700,7 @@ static int ipmmu_add_device(struct device *dev)
if (ret < 0) {
dev_err(dev, "Failed to add device to IPMMU group\n");
@@ -73,7 +73,7 @@
}
/*
-@@ -742,41 +737,14 @@ static int ipmmu_add_device(struct device *dev)
+@@ -741,41 +736,14 @@ static int ipmmu_add_device(struct device *dev)
return 0;
error:
@@ -118,7 +118,7 @@
{
struct iommu_group *group;
-@@ -786,15 +754,20 @@ static int ipmmu_add_device_dma(struct device *dev)
+@@ -785,15 +753,20 @@ static int ipmmu_add_device_dma(struct device *dev)
if (!to_ipmmu(dev))
return -ENODEV;
@@ -140,7 +140,7 @@
iommu_group_remove_device(dev);
}
-@@ -824,15 +797,13 @@ static const struct iommu_ops ipmmu_ops = {
+@@ -823,15 +796,13 @@ static const struct iommu_ops ipmmu_ops = {
.iotlb_sync = ipmmu_iotlb_sync,
.map_sg = default_iommu_map_sg,
.iova_to_phys = ipmmu_iova_to_phys,
@@ -158,7 +158,7 @@
/* -----------------------------------------------------------------------------
* Probe/remove and init
*/
-@@ -929,9 +900,7 @@ static int ipmmu_remove(struct platform_device *pdev)
+@@ -928,9 +899,7 @@ static int ipmmu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&mmu->iommu);
iommu_device_unregister(&mmu->iommu);
diff --git a/patches/0099-iommu-ipmmu-vmsa-Introduce-features-break-out-alias.patch b/patches/0099-iommu-ipmmu-vmsa-Introduce-features-break-out-alias.patch
index 63521f8..80472ac 100644
--- a/patches/0099-iommu-ipmmu-vmsa-Introduce-features-break-out-alias.patch
+++ b/patches/0099-iommu-ipmmu-vmsa-Introduce-features-break-out-alias.patch
@@ -20,7 +20,7 @@
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index f6d2e8e650be..5ce7879cb58d 100644
+index f8b7051a34fa..87b69ff31d40 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -19,6 +19,7 @@
@@ -48,7 +48,7 @@
unsigned int num_utlbs;
spinlock_t lock; /* Protects ctx and domains[] */
DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
-@@ -817,6 +822,21 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
+@@ -816,6 +821,21 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0);
}
@@ -70,7 +70,7 @@
static int ipmmu_probe(struct platform_device *pdev)
{
struct ipmmu_vmsa_device *mmu;
-@@ -834,6 +854,7 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -833,6 +853,7 @@ static int ipmmu_probe(struct platform_device *pdev)
mmu->num_utlbs = 32;
spin_lock_init(&mmu->lock);
bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
@@ -78,7 +78,7 @@
/* Map I/O memory and request IRQ. */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-@@ -853,7 +874,8 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -852,7 +873,8 @@ static int ipmmu_probe(struct platform_device *pdev)
* Offset the registers base unconditionally to point to the non-secure
* alias space for now.
*/
@@ -88,7 +88,7 @@
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
-@@ -907,11 +929,6 @@ static int ipmmu_remove(struct platform_device *pdev)
+@@ -906,11 +928,6 @@ static int ipmmu_remove(struct platform_device *pdev)
return 0;
}
diff --git a/patches/0100-iommu-ipmmu-vmsa-Add-optional-root-device-feature.patch b/patches/0100-iommu-ipmmu-vmsa-Add-optional-root-device-feature.patch
index d0fe7fe..06c931f 100644
--- a/patches/0100-iommu-ipmmu-vmsa-Add-optional-root-device-feature.patch
+++ b/patches/0100-iommu-ipmmu-vmsa-Add-optional-root-device-feature.patch
@@ -18,7 +18,7 @@
1 file changed, 73 insertions(+), 17 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 5ce7879cb58d..5db853b92d3b 100644
+index 87b69ff31d40..60a4c7244c71 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -41,12 +41,14 @@
@@ -125,7 +125,7 @@
}
/* -----------------------------------------------------------------------------
-@@ -824,6 +859,7 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
+@@ -823,6 +858,7 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
static const struct ipmmu_features ipmmu_features_default = {
.use_ns_alias_offset = true,
@@ -133,7 +133,7 @@
};
static const struct of_device_id ipmmu_of_ids[] = {
-@@ -878,19 +914,39 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -877,19 +913,39 @@ static int ipmmu_probe(struct platform_device *pdev)
mmu->base += IM_NS_ALIAS_OFFSET;
irq = platform_get_irq(pdev, 0);
diff --git a/patches/0101-iommu-ipmmu-vmsa-Enable-multi-context-support.patch b/patches/0101-iommu-ipmmu-vmsa-Enable-multi-context-support.patch
index 3cd6fa3..cfdfdd9 100644
--- a/patches/0101-iommu-ipmmu-vmsa-Enable-multi-context-support.patch
+++ b/patches/0101-iommu-ipmmu-vmsa-Enable-multi-context-support.patch
@@ -19,7 +19,7 @@
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 5db853b92d3b..c70efd80f740 100644
+index 60a4c7244c71..50d72a2015d9 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -37,11 +37,12 @@
@@ -80,7 +80,7 @@
if (!mmu->domains[i])
continue;
if (ipmmu_domain_irq(mmu->domains[i]) == IRQ_HANDLED)
-@@ -624,6 +627,13 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
+@@ -623,6 +626,13 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
/* The domain hasn't been used yet, initialize it. */
domain->mmu = mmu;
ret = ipmmu_domain_init_context(domain);
@@ -94,7 +94,7 @@
} else if (domain->mmu != mmu) {
/*
* Something is wrong, we can't attach two devices using
-@@ -853,13 +863,14 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
+@@ -852,13 +862,14 @@ static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
unsigned int i;
/* Disable all contexts. */
@@ -110,7 +110,7 @@
};
static const struct of_device_id ipmmu_of_ids[] = {
-@@ -913,6 +924,9 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -912,6 +923,9 @@ static int ipmmu_probe(struct platform_device *pdev)
if (mmu->features->use_ns_alias_offset)
mmu->base += IM_NS_ALIAS_OFFSET;
diff --git a/patches/0102-iommu-ipmmu-vmsa-Make-use-of-IOMMU_OF_DECLARE.patch b/patches/0102-iommu-ipmmu-vmsa-Make-use-of-IOMMU_OF_DECLARE.patch
index d9e62ea..b142bf6 100644
--- a/patches/0102-iommu-ipmmu-vmsa-Make-use-of-IOMMU_OF_DECLARE.patch
+++ b/patches/0102-iommu-ipmmu-vmsa-Make-use-of-IOMMU_OF_DECLARE.patch
@@ -17,7 +17,7 @@
1 file changed, 41 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index c70efd80f740..9cde61970bb5 100644
+index 50d72a2015d9..102c69d162c8 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -20,6 +20,7 @@
@@ -28,7 +28,7 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/sizes.h>
-@@ -962,17 +963,30 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -961,17 +962,30 @@ static int ipmmu_probe(struct platform_device *pdev)
ipmmu_device_reset(mmu);
}
@@ -68,7 +68,7 @@
/*
* We can't create the ARM mapping here as it requires the bus to have
-@@ -1010,15 +1024,22 @@ static struct platform_driver ipmmu_driver = {
+@@ -1009,15 +1023,22 @@ static struct platform_driver ipmmu_driver = {
static int __init ipmmu_init(void)
{
@@ -91,7 +91,7 @@
return 0;
}
-@@ -1030,6 +1051,17 @@ static void __exit ipmmu_exit(void)
+@@ -1029,6 +1050,17 @@ static void __exit ipmmu_exit(void)
subsys_initcall(ipmmu_init);
module_exit(ipmmu_exit);
diff --git a/patches/0103-iommu-ipmmu-vmsa-IPMMU-device-is-40-bit-bus-master.patch b/patches/0103-iommu-ipmmu-vmsa-IPMMU-device-is-40-bit-bus-master.patch
index eee64a8..3a24ef8 100644
--- a/patches/0103-iommu-ipmmu-vmsa-IPMMU-device-is-40-bit-bus-master.patch
+++ b/patches/0103-iommu-ipmmu-vmsa-IPMMU-device-is-40-bit-bus-master.patch
@@ -18,10 +18,10 @@
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 9cde61970bb5..6b74ec62f4b4 100644
+index 102c69d162c8..0ace76ee9cbc 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
-@@ -903,6 +903,7 @@ static int ipmmu_probe(struct platform_device *pdev)
+@@ -902,6 +902,7 @@ static int ipmmu_probe(struct platform_device *pdev)
spin_lock_init(&mmu->lock);
bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
mmu->features = of_device_get_match_data(&pdev->dev);
diff --git a/patches/0104-iommu-ipmmu-vmsa-Write-IMCTR-twice.patch b/patches/0104-iommu-ipmmu-vmsa-Write-IMCTR-twice.patch
index 045b9f1..d9b1e1c 100644
--- a/patches/0104-iommu-ipmmu-vmsa-Write-IMCTR-twice.patch
+++ b/patches/0104-iommu-ipmmu-vmsa-Write-IMCTR-twice.patch
@@ -22,7 +22,7 @@
1 file changed, 35 insertions(+), 21 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 6b74ec62f4b4..7587017972b0 100644
+index 0ace76ee9cbc..0a2430c07138 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -248,19 +248,31 @@ static void ipmmu_write(struct ipmmu_vmsa_device *mmu, unsigned int offset,
diff --git a/patches/0105-iommu-ipmmu-vmsa-Make-IMBUSCTR-setup-optional.patch b/patches/0105-iommu-ipmmu-vmsa-Make-IMBUSCTR-setup-optional.patch
index 2609ec0..9f880b8 100644
--- a/patches/0105-iommu-ipmmu-vmsa-Make-IMBUSCTR-setup-optional.patch
+++ b/patches/0105-iommu-ipmmu-vmsa-Make-IMBUSCTR-setup-optional.patch
@@ -16,7 +16,7 @@
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 7587017972b0..49f2c697b108 100644
+index 0a2430c07138..6a5d3c6609e7 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -44,6 +44,7 @@ struct ipmmu_features {
@@ -41,7 +41,7 @@
/*
* IMSTR
-@@ -886,6 +888,7 @@ static const struct ipmmu_features ipmmu_features_default = {
+@@ -885,6 +887,7 @@ static const struct ipmmu_features ipmmu_features_default = {
.use_ns_alias_offset = true,
.has_cache_leaf_nodes = false,
.number_of_contexts = 1, /* software only tested with one context */
diff --git a/patches/0106-iommu-ipmmu-vmsa-Allow-two-bit-SL0.patch b/patches/0106-iommu-ipmmu-vmsa-Allow-two-bit-SL0.patch
index be2e95b..8e82367 100644
--- a/patches/0106-iommu-ipmmu-vmsa-Allow-two-bit-SL0.patch
+++ b/patches/0106-iommu-ipmmu-vmsa-Allow-two-bit-SL0.patch
@@ -16,7 +16,7 @@
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 49f2c697b108..65ad6910cb70 100644
+index 6a5d3c6609e7..1559fd579e2f 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -45,6 +45,7 @@ struct ipmmu_features {
@@ -62,7 +62,7 @@
/* MAIR0 */
ipmmu_ctx_write_root(domain, IMMAIR0,
-@@ -889,6 +900,7 @@ static const struct ipmmu_features ipmmu_features_default = {
+@@ -888,6 +899,7 @@ static const struct ipmmu_features ipmmu_features_default = {
.has_cache_leaf_nodes = false,
.number_of_contexts = 1, /* software only tested with one context */
.setup_imbuscr = true,
diff --git a/patches/0107-iommu-ipmmu-vmsa-Hook-up-r8a7795-DT-matching-code.patch b/patches/0107-iommu-ipmmu-vmsa-Hook-up-r8a7795-DT-matching-code.patch
index 9caa4cc..0004b48 100644
--- a/patches/0107-iommu-ipmmu-vmsa-Hook-up-r8a7795-DT-matching-code.patch
+++ b/patches/0107-iommu-ipmmu-vmsa-Hook-up-r8a7795-DT-matching-code.patch
@@ -16,7 +16,7 @@
1 file changed, 29 insertions(+)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 65ad6910cb70..8dce3a9de9d8 100644
+index 1559fd579e2f..7b49e8efc7e7 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -25,6 +25,7 @@
@@ -27,7 +27,7 @@
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
#include <asm/dma-iommu.h>
-@@ -749,9 +750,24 @@ static int ipmmu_init_platform_device(struct device *dev,
+@@ -748,9 +749,24 @@ static int ipmmu_init_platform_device(struct device *dev,
return 0;
}
@@ -52,7 +52,7 @@
iommu_fwspec_add_ids(dev, spec->args, 1);
/* Initialize once - xlate() will call multiple times */
-@@ -903,10 +919,21 @@ static const struct ipmmu_features ipmmu_features_default = {
+@@ -902,10 +918,21 @@ static const struct ipmmu_features ipmmu_features_default = {
.twobit_imttbcr_sl0 = false,
};
@@ -74,7 +74,7 @@
}, {
/* Terminator */
},
-@@ -1090,6 +1117,8 @@ static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
+@@ -1089,6 +1116,8 @@ static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa",
ipmmu_vmsa_iommu_of_setup);
diff --git a/patches/0116-extcon-Split-out-extcon-header-file-for-consumer-and.patch b/patches/0116-extcon-Split-out-extcon-header-file-for-consumer-and.patch
index ee27c39..fc10590 100644
--- a/patches/0116-extcon-Split-out-extcon-header-file-for-consumer-and.patch
+++ b/patches/0116-extcon-Split-out-extcon-header-file-for-consumer-and.patch
@@ -363,7 +363,7 @@
#define SMBB_CHG_VMAX 0x040
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index c12a1a6554ba..8de7d72b130b 100644
+index 36a706f475d2..5f872c36f2d6 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -12,7 +12,7 @@
diff --git a/patches/0136-ASoC-rcar-skip-disabled-SSI-nodes.patch b/patches/0136-ASoC-rcar-skip-disabled-SSI-nodes.patch
index 02c9b71..7345763 100644
--- a/patches/0136-ASoC-rcar-skip-disabled-SSI-nodes.patch
+++ b/patches/0136-ASoC-rcar-skip-disabled-SSI-nodes.patch
@@ -20,10 +20,10 @@
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index f0fb85fda42d..fa2469042876 100644
+index 34223c8c28a8..5dd1c0984188 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
-@@ -1121,6 +1121,9 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
+@@ -1125,6 +1125,9 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
i = 0;
for_each_child_of_node(node, np) {
@@ -33,7 +33,7 @@
ssi = rsnd_ssi_get(priv, i);
snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d",
-@@ -1157,7 +1160,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
+@@ -1161,7 +1164,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
of_node_put(np);
goto rsnd_ssi_probe_done;
}
diff --git a/patches/0137-ASoC-rsnd-add-generic-rsnd_flags_xxx-macro.patch b/patches/0137-ASoC-rsnd-add-generic-rsnd_flags_xxx-macro.patch
index 6a15cca..a1d6a8d 100644
--- a/patches/0137-ASoC-rsnd-add-generic-rsnd_flags_xxx-macro.patch
+++ b/patches/0137-ASoC-rsnd-add-generic-rsnd_flags_xxx-macro.patch
@@ -19,10 +19,10 @@
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index c5de71f2dc8c..beffbec42404 100644
+index 1768a0ae469d..c99672f522dd 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -601,6 +601,10 @@ struct rsnd_priv {
+@@ -608,6 +608,10 @@ struct rsnd_priv {
#define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1)
#define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2)
@@ -34,7 +34,7 @@
* rsnd_kctrl
*/
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index fa2469042876..d64abbbe1a98 100644
+index 5dd1c0984188..527775ea23ca 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -101,9 +101,6 @@ struct rsnd_ssi {
@@ -69,7 +69,7 @@
use_busif = 1;
if (rsnd_io_to_mod_src(io))
use_busif = 1;
-@@ -802,13 +799,13 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod,
+@@ -797,13 +794,13 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod,
* But it don't need to call request_irq() many times.
* Let's control it by RSND_SSI_PROBED flag.
*/
@@ -85,7 +85,7 @@
}
return ret;
-@@ -826,10 +823,10 @@ static int rsnd_ssi_common_remove(struct rsnd_mod *mod,
+@@ -821,10 +818,10 @@ static int rsnd_ssi_common_remove(struct rsnd_mod *mod,
return 0;
/* PIO will request IRQ again */
@@ -98,7 +98,7 @@
}
return 0;
-@@ -1012,13 +1009,13 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv,
+@@ -1016,13 +1013,13 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv,
ssi = rsnd_mod_to_ssi(mod);
if (strstr(remote_ep->full_name, "hdmi0")) {
@@ -114,7 +114,7 @@
dev_dbg(dev, "%s[%d] connected to HDMI1\n",
rsnd_mod_name(mod), rsnd_mod_id(mod));
}
-@@ -1051,7 +1048,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
+@@ -1055,7 +1052,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
{
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -123,7 +123,7 @@
}
static u32 *rsnd_ssi_get_status(struct rsnd_dai_stream *io,
-@@ -1137,10 +1134,10 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
+@@ -1141,10 +1138,10 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
}
if (of_get_property(np, "shared-pin", NULL))
diff --git a/patches/0141-ASoC-rsnd-makes-volume-ramp-rate-list-generic.patch b/patches/0141-ASoC-rsnd-makes-volume-ramp-rate-list-generic.patch
index 31cb28c..734c664 100644
--- a/patches/0141-ASoC-rsnd-makes-volume-ramp-rate-list-generic.patch
+++ b/patches/0141-ASoC-rsnd-makes-volume-ramp-rate-list-generic.patch
@@ -21,10 +21,10 @@
3 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 107133297e8d..2d94b3d4519c 100644
+index 9896e736fa5c..642c438d880a 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1242,6 +1242,33 @@ struct rsnd_kctrl_cfg *rsnd_kctrl_init_s(struct rsnd_kctrl_cfg_s *cfg)
+@@ -1253,6 +1253,33 @@ struct rsnd_kctrl_cfg *rsnd_kctrl_init_s(struct rsnd_kctrl_cfg_s *cfg)
return &cfg->cfg;
}
@@ -117,10 +117,10 @@
if (ret < 0)
return ret;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index beffbec42404..9d66a15000fa 100644
+index c99672f522dd..e9baa13c3a57 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -656,9 +656,12 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -663,9 +663,12 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
rsnd_kctrl_new(mod, io, rtd, name, accept, update, rsnd_kctrl_init_s(cfg), \
NULL, 1, max)
diff --git a/patches/0142-ASoC-rsnd-add-MIX-Volume-Ramp-support.patch b/patches/0142-ASoC-rsnd-add-MIX-Volume-Ramp-support.patch
index ec0788f..7e053b5 100644
--- a/patches/0142-ASoC-rsnd-add-MIX-Volume-Ramp-support.patch
+++ b/patches/0142-ASoC-rsnd-add-MIX-Volume-Ramp-support.patch
@@ -29,10 +29,10 @@
3 files changed, 154 insertions(+), 7 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 2d94b3d4519c..e9b0b0f5f0ee 100644
+index 642c438d880a..c53e3c8b3a2a 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1253,7 +1253,7 @@ const char * const volume_ramp_rate[] = {
+@@ -1264,7 +1264,7 @@ const char * const volume_ramp_rate[] = {
"1 dB/1 step", /* 00111 */
"0.5 dB/1 step", /* 01000 */
"0.25 dB/1 step", /* 01001 */
@@ -253,10 +253,10 @@
struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id)
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 9d66a15000fa..0d9f9c3343da 100644
+index e9baa13c3a57..be80a91b9a1a 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -662,6 +662,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -669,6 +669,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
extern const char * const volume_ramp_rate[];
#define VOLUME_RAMP_MAX_DVC (0x17 + 1)
diff --git a/patches/0143-ASoC-rsnd-add-rsnd_kctrl_xxx-macro.patch b/patches/0143-ASoC-rsnd-add-rsnd_kctrl_xxx-macro.patch
index 21d2980..b3d0d4b 100644
--- a/patches/0143-ASoC-rsnd-add-rsnd_kctrl_xxx-macro.patch
+++ b/patches/0143-ASoC-rsnd-add-rsnd_kctrl_xxx-macro.patch
@@ -227,10 +227,10 @@
if (rsnd_flags_has(mix, ONCE_KCTRL_INITIALIZED))
return ret;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 0d9f9c3343da..2a224fa639cb 100644
+index be80a91b9a1a..cc471fa4e86b 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -631,6 +631,10 @@ struct rsnd_kctrl_cfg_s {
+@@ -638,6 +638,10 @@ struct rsnd_kctrl_cfg_s {
struct rsnd_kctrl_cfg cfg;
u32 val;
};
diff --git a/patches/0145-ASoC-rsnd-don-t-use-io-mod-directly.patch b/patches/0145-ASoC-rsnd-don-t-use-io-mod-directly.patch
index 41a2bd1..aadf20a 100644
--- a/patches/0145-ASoC-rsnd-don-t-use-io-mod-directly.patch
+++ b/patches/0145-ASoC-rsnd-don-t-use-io-mod-directly.patch
@@ -15,7 +15,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index e9b0b0f5f0ee..b338c0009506 100644
+index c53e3c8b3a2a..4462fcd6c0b5 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -407,7 +407,7 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
diff --git a/patches/0146-ASoC-rsnd-tidyup-rsnd_mod_next-for-loop-method.patch b/patches/0146-ASoC-rsnd-tidyup-rsnd_mod_next-for-loop-method.patch
index 9da674e..2a096c2 100644
--- a/patches/0146-ASoC-rsnd-tidyup-rsnd_mod_next-for-loop-method.patch
+++ b/patches/0146-ASoC-rsnd-tidyup-rsnd_mod_next-for-loop-method.patch
@@ -15,7 +15,7 @@
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index b338c0009506..8fc3bf2b20f5 100644
+index 4462fcd6c0b5..5599b0c958de 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -408,10 +408,8 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
diff --git a/patches/0147-ASoC-rsnd-NULL-check-is-not-needed-for-clk_unprepare.patch b/patches/0147-ASoC-rsnd-NULL-check-is-not-needed-for-clk_unprepare.patch
index 63b4895..e16f72a 100644
--- a/patches/0147-ASoC-rsnd-NULL-check-is-not-needed-for-clk_unprepare.patch
+++ b/patches/0147-ASoC-rsnd-NULL-check-is-not-needed-for-clk_unprepare.patch
@@ -17,7 +17,7 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 8fc3bf2b20f5..0216d3f53097 100644
+index 5599b0c958de..85af6c020ae5 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -172,8 +172,7 @@ int rsnd_mod_init(struct rsnd_priv *priv,
diff --git a/patches/0148-ASoC-rsnd-use-snd_pcm_running-in-rsnd_io_is_working.patch b/patches/0148-ASoC-rsnd-use-snd_pcm_running-in-rsnd_io_is_working.patch
index caa0c49..a7c2542 100644
--- a/patches/0148-ASoC-rsnd-use-snd_pcm_running-in-rsnd_io_is_working.patch
+++ b/patches/0148-ASoC-rsnd-use-snd_pcm_running-in-rsnd_io_is_working.patch
@@ -16,7 +16,7 @@
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 0216d3f53097..b36832ef7342 100644
+index 85af6c020ae5..989e64e2ad95 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -199,7 +199,10 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
diff --git a/patches/0149-ASoC-rsnd-Don-t-check-SSISR-DIRQ-when-Capture.patch b/patches/0149-ASoC-rsnd-Don-t-check-SSISR-DIRQ-when-Capture.patch
index feb81f6..37fe023 100644
--- a/patches/0149-ASoC-rsnd-Don-t-check-SSISR-DIRQ-when-Capture.patch
+++ b/patches/0149-ASoC-rsnd-Don-t-check-SSISR-DIRQ-when-Capture.patch
@@ -18,10 +18,10 @@
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index d64abbbe1a98..cbf3bf312d23 100644
+index 527775ea23ca..6e608820afdb 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
-@@ -607,15 +607,18 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod,
+@@ -602,15 +602,18 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod,
if (rsnd_ssi_is_parent(mod, io))
return 0;
diff --git a/patches/0150-ASoC-rsnd-remove-NULL-check-from-rsnd_mod_name-rsnd_.patch b/patches/0150-ASoC-rsnd-remove-NULL-check-from-rsnd_mod_name-rsnd_.patch
index b6e3639..8d2ac1c 100644
--- a/patches/0150-ASoC-rsnd-remove-NULL-check-from-rsnd_mod_name-rsnd_.patch
+++ b/patches/0150-ASoC-rsnd-remove-NULL-check-from-rsnd_mod_name-rsnd_.patch
@@ -63,7 +63,7 @@
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index b36832ef7342..c70eb2097816 100644
+index 989e64e2ad95..4e9463ba2c5e 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -121,14 +121,6 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type)
@@ -136,12 +136,12 @@
+ return rsnd_mod_init(NULL, &mem, &mem_ops, NULL, NULL, 0, 0);
}
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 2a224fa639cb..57cd2bc773c2 100644
+index cc471fa4e86b..eb6706d22391 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -355,8 +355,9 @@ struct rsnd_mod {
- #define __rsnd_mod_call_nolock_start 0
+@@ -362,8 +362,9 @@ struct rsnd_mod {
#define __rsnd_mod_call_nolock_stop 1
+ #define __rsnd_mod_call_prepare 0
-#define rsnd_mod_to_priv(mod) ((mod)->priv)
-#define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1)
@@ -151,7 +151,7 @@
#define rsnd_mod_power_on(mod) clk_enable((mod)->clk)
#define rsnd_mod_power_off(mod) clk_disable((mod)->clk)
#define rsnd_mod_get(ip) (&(ip)->mod)
-@@ -371,7 +372,6 @@ int rsnd_mod_init(struct rsnd_priv *priv,
+@@ -378,7 +379,6 @@ int rsnd_mod_init(struct rsnd_priv *priv,
enum rsnd_mod_type type,
int id);
void rsnd_mod_quit(struct rsnd_mod *mod);
diff --git a/patches/0152-ASoC-rcar-revert-IOMMU-support-so-far.patch b/patches/0152-ASoC-rcar-revert-IOMMU-support-so-far.patch
index 2766489..11944d1 100644
--- a/patches/0152-ASoC-rcar-revert-IOMMU-support-so-far.patch
+++ b/patches/0152-ASoC-rcar-revert-IOMMU-support-so-far.patch
@@ -29,10 +29,10 @@
2 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index c70eb2097816..f12a88a21dfa 100644
+index 4e9463ba2c5e..976299d43b23 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1332,8 +1332,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
+@@ -1343,8 +1343,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
return snd_pcm_lib_preallocate_pages_for_all(
rtd->pcm,
diff --git a/patches/0163-pinctrl-rza1-Add-support-for-RZ-A1L.patch b/patches/0163-pinctrl-rza1-Add-support-for-RZ-A1L.patch
index 67306c4..123cf6b 100644
--- a/patches/0163-pinctrl-rza1-Add-support-for-RZ-A1L.patch
+++ b/patches/0163-pinctrl-rza1-Add-support-for-RZ-A1L.patch
@@ -17,7 +17,7 @@
1 file changed, 134 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c
-index 04d058706b80..717c0f4449a0 100644
+index a865dc56a491..f76edf664539 100644
--- a/drivers/pinctrl/pinctrl-rza1.c
+++ b/drivers/pinctrl/pinctrl-rza1.c
@@ -302,6 +302,134 @@ static const struct rza1_pinmux_conf rza1h_pmx_conf = {
@@ -155,7 +155,7 @@
/* ----------------------------------------------------------------------------
* RZ/A1 types
*/
-@@ -1283,9 +1411,15 @@ static int rza1_pinctrl_probe(struct platform_device *pdev)
+@@ -1285,9 +1413,15 @@ static int rza1_pinctrl_probe(struct platform_device *pdev)
static const struct of_device_id rza1_pinctrl_of_match[] = {
{
diff --git a/patches/0166-tty-add-SPDX-identifiers-to-all-remaining-files-in-d.patch b/patches/0166-tty-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
index 0b9d774..cba5332 100644
--- a/patches/0166-tty-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
+++ b/patches/0166-tty-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
@@ -555,7 +555,7 @@
* nozomi.c -- HSDPA driver Broadband Wireless Data Card - Globe Trotter
*
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
-index 20d79a6007d5..59cd4b218218 100644
+index 070733ca94d5..1e83bdfed7c6 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1,3 +1,4 @@
@@ -1077,7 +1077,7 @@
* Copyright (C) 2012 ARM Ltd.
* Author: Marc Zyngier <marc.zyngier@arm.com>
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
-index ac667b47f199..57144c78518f 100644
+index 7b0a3a1688e8..e6095ababa7a 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -1,3 +1,4 @@
@@ -1806,7 +1806,7 @@
* Creating audit events from TTY input.
*
diff --git a/drivers/tty/tty_baudrate.c b/drivers/tty/tty_baudrate.c
-index 5c33fd25676d..6ff8cdfc9d2a 100644
+index ebc797fc1afd..3e827a3d48d5 100644
--- a/drivers/tty/tty_baudrate.c
+++ b/drivers/tty/tty_baudrate.c
@@ -1,3 +1,4 @@
diff --git a/patches/0167-tty-serial-Remove-redundant-license-text.patch b/patches/0167-tty-serial-Remove-redundant-license-text.patch
index d548ffd..d35bf26 100644
--- a/patches/0167-tty-serial-Remove-redundant-license-text.patch
+++ b/patches/0167-tty-serial-Remove-redundant-license-text.patch
@@ -1038,7 +1038,7 @@
#include <linux/kernel.h>
#include <linux/console.h>
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
-index 57144c78518f..e20540dab7fb 100644
+index e6095ababa7a..24a1febc05b6 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -6,10 +6,6 @@
diff --git a/patches/0229-usb-gadget-udc-renesas_usb3-move-pm_runtime_-en-dis-.patch b/patches/0229-usb-gadget-udc-renesas_usb3-move-pm_runtime_-en-dis-.patch
index 47752e7..51a6cf0 100644
--- a/patches/0229-usb-gadget-udc-renesas_usb3-move-pm_runtime_-en-dis-.patch
+++ b/patches/0229-usb-gadget-udc-renesas_usb3-move-pm_runtime_-en-dis-.patch
@@ -21,10 +21,10 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 8de7d72b130b..3f662e524300 100644
+index 5f872c36f2d6..b3386fc82b60 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2247,7 +2247,6 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
+@@ -2250,7 +2250,6 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
/* hook up the driver */
usb3->driver = driver;
@@ -32,7 +32,7 @@
pm_runtime_get_sync(usb3_to_dev(usb3));
renesas_usb3_init_controller(usb3);
-@@ -2265,7 +2264,6 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
+@@ -2268,7 +2267,6 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
renesas_usb3_stop_controller(usb3);
pm_runtime_put(usb3_to_dev(usb3));
@@ -40,7 +40,7 @@
return 0;
}
-@@ -2418,6 +2416,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)
+@@ -2421,6 +2419,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)
renesas_usb3_dma_free_prd(usb3, &pdev->dev);
__renesas_usb3_ep_free_request(usb3->ep0_req);
@@ -48,7 +48,7 @@
return 0;
}
-@@ -2653,6 +2652,7 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2656,6 +2655,7 @@ static int renesas_usb3_probe(struct platform_device *pdev)
renesas_usb3_debugfs_init(usb3, &pdev->dev);
dev_info(&pdev->dev, "probed\n");
diff --git a/patches/0230-usb-gadget-udc-renesas_usb3-Add-suspend-resume-funct.patch b/patches/0230-usb-gadget-udc-renesas_usb3-Add-suspend-resume-funct.patch
index 58a3f9e..55a15d5 100644
--- a/patches/0230-usb-gadget-udc-renesas_usb3-Add-suspend-resume-funct.patch
+++ b/patches/0230-usb-gadget-udc-renesas_usb3-Add-suspend-resume-funct.patch
@@ -19,10 +19,10 @@
1 file changed, 34 insertions(+)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 3f662e524300..3368cb1ac51c 100644
+index b3386fc82b60..70023b64e191 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2668,11 +2668,45 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2671,11 +2671,45 @@ static int renesas_usb3_probe(struct platform_device *pdev)
return ret;
}
diff --git a/patches/0231-usb-gadget-udc-renesas_usb3-add-support-for-generic-.patch b/patches/0231-usb-gadget-udc-renesas_usb3-add-support-for-generic-.patch
index 57b060d..56520eb 100644
--- a/patches/0231-usb-gadget-udc-renesas_usb3-add-support-for-generic-.patch
+++ b/patches/0231-usb-gadget-udc-renesas_usb3-add-support-for-generic-.patch
@@ -38,7 +38,7 @@
usb3_peri0: usb@ee020000 {
compatible = "renesas,r8a7795-usb3-peri",
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 3368cb1ac51c..ef833f5c2523 100644
+index 70023b64e191..d7ed7ca1e38b 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -1,7 +1,7 @@
@@ -66,7 +66,7 @@
struct dentry *dentry;
struct renesas_usb3_ep *usb3_ep;
-@@ -2247,6 +2249,9 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
+@@ -2250,6 +2252,9 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
/* hook up the driver */
usb3->driver = driver;
@@ -76,7 +76,7 @@
pm_runtime_get_sync(usb3_to_dev(usb3));
renesas_usb3_init_controller(usb3);
-@@ -2263,6 +2268,9 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
+@@ -2266,6 +2271,9 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
usb3->driver = NULL;
renesas_usb3_stop_controller(usb3);
@@ -86,7 +86,7 @@
pm_runtime_put(usb3_to_dev(usb3));
return 0;
-@@ -2416,6 +2424,8 @@ static int renesas_usb3_remove(struct platform_device *pdev)
+@@ -2419,6 +2427,8 @@ static int renesas_usb3_remove(struct platform_device *pdev)
renesas_usb3_dma_free_prd(usb3, &pdev->dev);
__renesas_usb3_ep_free_request(usb3->ep0_req);
@@ -95,7 +95,7 @@
pm_runtime_disable(usb3_to_dev(usb3));
return 0;
-@@ -2647,11 +2657,19 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2650,11 +2660,19 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_dev_create;
@@ -116,7 +116,7 @@
pm_runtime_enable(usb3_to_dev(usb3));
return 0;
-@@ -2678,6 +2696,8 @@ static int renesas_usb3_suspend(struct device *dev)
+@@ -2681,6 +2699,8 @@ static int renesas_usb3_suspend(struct device *dev)
return 0;
renesas_usb3_stop_controller(usb3);
@@ -125,7 +125,7 @@
pm_runtime_put(dev);
return 0;
-@@ -2691,6 +2711,8 @@ static int renesas_usb3_resume(struct device *dev)
+@@ -2694,6 +2714,8 @@ static int renesas_usb3_resume(struct device *dev)
if (!usb3->driver)
return 0;
diff --git a/patches/0232-usb-gadget-udc-renesas_usb3-Use-of_device_get_match_.patch b/patches/0232-usb-gadget-udc-renesas_usb3-Use-of_device_get_match_.patch
index 4e893f8..fbc76f3 100644
--- a/patches/0232-usb-gadget-udc-renesas_usb3-Use-of_device_get_match_.patch
+++ b/patches/0232-usb-gadget-udc-renesas_usb3-Use-of_device_get_match_.patch
@@ -21,10 +21,10 @@
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index ef833f5c2523..0a74919bd754 100644
+index d7ed7ca1e38b..e40456899148 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2582,20 +2582,15 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2585,20 +2585,15 @@ static int renesas_usb3_probe(struct platform_device *pdev)
{
struct renesas_usb3 *usb3;
struct resource *res;
diff --git a/patches/0233-usb-gadget-udc-renesas_usb3-make-const-array-max_pac.patch b/patches/0233-usb-gadget-udc-renesas_usb3-make-const-array-max_pac.patch
index 0b1f67c..a9cd228 100644
--- a/patches/0233-usb-gadget-udc-renesas_usb3-make-const-array-max_pac.patch
+++ b/patches/0233-usb-gadget-udc-renesas_usb3-make-const-array-max_pac.patch
@@ -27,10 +27,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 0a74919bd754..7e0548f6bd9e 100644
+index e40456899148..08e08177a891 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2066,7 +2066,7 @@ static u32 usb3_calc_rammap_val(struct renesas_usb3_ep *usb3_ep,
+@@ -2069,7 +2069,7 @@ static u32 usb3_calc_rammap_val(struct renesas_usb3_ep *usb3_ep,
const struct usb_endpoint_descriptor *desc)
{
int i;
diff --git a/patches/0234-USB-add-SPDX-identifiers-to-all-remaining-files-in-d.patch b/patches/0234-USB-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
index 710c02b..ec7da7e 100644
--- a/patches/0234-USB-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
+++ b/patches/0234-USB-add-SPDX-identifiers-to-all-remaining-files-in-d.patch
@@ -950,7 +950,7 @@
* Copyright 2012 Freescale Semiconductor, Inc.
*
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index f2f31fc16f29..df5affe54b11 100644
+index feaa0d8f830a..14ec6670de6f 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1,3 +1,4 @@
@@ -959,7 +959,7 @@
* cdc-acm.c
*
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
-index 3e865dbf878c..80529ac4b083 100644
+index a9509ecccedb..6832a3d4f288 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -1,3 +1,4 @@
@@ -1040,7 +1040,7 @@
/*
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
-index ea829ad798c0..07d5919ccae1 100644
+index 5340d433cdf0..e1add5654851 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -1,3 +1,4 @@
@@ -1103,7 +1103,7 @@
* usb port device code
*
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 99f67764765f..bfd913ab5d7d 100644
+index 37a5e07b3488..e6eba4216fd5 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -1,3 +1,4 @@
@@ -1373,7 +1373,7 @@
* gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link
*
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
-index 4a3227543255..fe502e542c39 100644
+index 5cc9fd730656..1ce56bfb5c33 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -1,3 +1,4 @@
@@ -2561,7 +2561,7 @@
* PLX NET2272 high/full speed USB device controller
*
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
-index f608c1f85e61..a0b2ab0c04f7 100644
+index 9cbb061582a7..b3a3b7626c5a 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1,3 +1,4 @@
@@ -2651,7 +2651,7 @@
* R8A66597 UDC
*
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 7e0548f6bd9e..9f68b46d5d1a 100644
+index 08e08177a891..50ea346d4e64 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -1,3 +1,4 @@
@@ -3443,7 +3443,7 @@
* Sonics Silicon Backplane
* Broadcom USB-core driver (SSB bus glue)
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
-index c38855aed62c..228d22bfb36e 100644
+index 65c0086e25ae..30b9d9f3fc71 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -1,3 +1,4 @@
@@ -3722,7 +3722,7 @@
* xHCI host controller driver
*
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 6b11fd9d8efe..55bb05893c55 100644
+index 64ddba3f79a9..2ad4cb97e218 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1,3 +1,4 @@
@@ -4091,7 +4091,7 @@
#include <linux/errno.h>
#include <linux/init.h>
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
-index 8a13b2fcf3e1..876a7a32defc 100644
+index 03152f98108c..aa76496e806e 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -1,3 +1,4 @@
@@ -4100,7 +4100,7 @@
/*
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
-index 47763311a42e..ceb35dbcd4d0 100644
+index 0673f286afbd..64a53281df07 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -1,3 +1,4 @@
@@ -5036,7 +5036,7 @@
* Edgeport USB Serial Converter driver
*
diff --git a/drivers/usb/serial/io_ti.h b/drivers/usb/serial/io_ti.h
-index 1bd67b24f916..42eb4afc4550 100644
+index bc9ff5ebd67c..944e2a7e99e7 100644
--- a/drivers/usb/serial/io_ti.h
+++ b/drivers/usb/serial/io_ti.h
@@ -1,3 +1,4 @@
@@ -5333,7 +5333,7 @@
* Symbol USB barcode to serial driver
*
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
-index 8fc3854e5e69..eb184a78db94 100644
+index 57e9f6617084..b253593703a7 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1,3 +1,4 @@
@@ -5594,7 +5594,7 @@
* Driver for Realtek RTS51xx USB card reader
*
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
-index 8cd2926fb1fe..878922fb54b8 100644
+index 344ec8631481..ef9cc0790949 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -1,3 +1,4 @@
@@ -5657,7 +5657,7 @@
* Driver for USB Mass Storage compliant devices
* Transport Functions Header File
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
-index 33a6d624c843..4aadb1ccbf1f 100644
+index 24de9c00d8e2..30a4d5b09588 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -1,3 +1,4 @@
@@ -5693,7 +5693,7 @@
* Unusual Devices File for the Datafab USB Compact Flash reader
*
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
-index d100290628bd..389cb4a1f9ba 100644
+index 5e9b35a91431..f58d2072a1f7 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1,3 +1,4 @@
diff --git a/patches/0235-USB-gadget-udc-Remove-redundant-license-text.patch b/patches/0235-USB-gadget-udc-Remove-redundant-license-text.patch
index 3bd38af..0fc2575 100644
--- a/patches/0235-USB-gadget-udc-Remove-redundant-license-text.patch
+++ b/patches/0235-USB-gadget-udc-Remove-redundant-license-text.patch
@@ -799,7 +799,7 @@
#ifndef __NET2272_H__
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
-index a0b2ab0c04f7..318246d8b2e2 100644
+index b3a3b7626c5a..b02ab2a8d927 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -32,11 +32,6 @@
@@ -957,7 +957,7 @@
#ifndef __R8A66597_H__
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 9f68b46d5d1a..7e04b5c0fd32 100644
+index 50ea346d4e64..3c8e43b88a91 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -3,10 +3,6 @@
diff --git a/patches/0246-usb-host-xhci-support-option-to-disable-the-xHCI-USB.patch b/patches/0246-usb-host-xhci-support-option-to-disable-the-xHCI-USB.patch
index 3882dc1..d6e2e13 100644
--- a/patches/0246-usb-host-xhci-support-option-to-disable-the-xHCI-USB.patch
+++ b/patches/0246-usb-host-xhci-support-option-to-disable-the-xHCI-USB.patch
@@ -55,10 +55,10 @@
xhci->quirks |= XHCI_LPM_SUPPORT;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 55bb05893c55..ae7acaa420c6 100644
+index 2ad4cb97e218..3498eed602c3 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -4115,7 +4115,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
+@@ -4145,7 +4145,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
xhci_dbg(xhci, "%s port %d USB2 hardware LPM\n",
enable ? "enable" : "disable", port_num + 1);
diff --git a/patches/0248-usb-xhci-Add-debugfs-interface-for-xHCI-driver.patch b/patches/0248-usb-xhci-Add-debugfs-interface-for-xHCI-driver.patch
index f535d58..c6471ca 100644
--- a/patches/0248-usb-xhci-Add-debugfs-interface-for-xHCI-driver.patch
+++ b/patches/0248-usb-xhci-Add-debugfs-interface-for-xHCI-driver.patch
@@ -787,7 +787,7 @@
}
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index ae7acaa420c6..920bfb8162f7 100644
+index 3498eed602c3..5a32c431b4e3 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -33,6 +33,7 @@
@@ -798,7 +798,7 @@
#define DRIVER_AUTHOR "Sarah Sharp"
#define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"
-@@ -633,6 +634,9 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -648,6 +649,9 @@ int xhci_run(struct usb_hcd *hcd)
}
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB2 roothub");
@@ -808,7 +808,7 @@
return 0;
}
EXPORT_SYMBOL_GPL(xhci_run);
-@@ -661,6 +665,8 @@ static void xhci_stop(struct usb_hcd *hcd)
+@@ -676,6 +680,8 @@ static void xhci_stop(struct usb_hcd *hcd)
return;
}
@@ -817,7 +817,7 @@
spin_lock_irq(&xhci->lock);
xhci->xhc_state |= XHCI_STATE_HALTED;
xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
-@@ -1643,6 +1649,8 @@ static int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -1673,6 +1679,8 @@ static int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
ctrl_ctx->add_flags &= cpu_to_le32(~drop_flag);
new_add_flags = le32_to_cpu(ctrl_ctx->add_flags);
@@ -826,7 +826,7 @@
xhci_endpoint_zero(xhci, xhci->devs[udev->slot_id], ep);
if (xhci->quirks & XHCI_MTK_HOST)
-@@ -1766,6 +1774,8 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -1796,6 +1804,8 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
/* Store the usb_device pointer for later use */
ep->hcpriv = udev;
@@ -835,7 +835,7 @@
xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n",
(unsigned int) ep->desc.bEndpointAddress,
udev->slot_id,
-@@ -2816,6 +2826,7 @@ static void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -2846,6 +2856,7 @@ static void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
/* Free any rings allocated for added endpoints */
for (i = 0; i < 31; i++) {
if (virt_dev->eps[i].new_ring) {
@@ -843,7 +843,7 @@
xhci_ring_free(xhci, virt_dev->eps[i].new_ring);
virt_dev->eps[i].new_ring = NULL;
}
-@@ -3531,6 +3542,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3561,6 +3572,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
}
if (ep->ring) {
@@ -851,7 +851,7 @@
xhci_free_endpoint_ring(xhci, virt_dev, i);
last_freed_endpoint = i;
}
-@@ -3564,6 +3576,8 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3594,6 +3606,8 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
struct xhci_slot_ctx *slot_ctx;
int i, ret;
@@ -860,7 +860,7 @@
#ifndef CONFIG_USB_DEFAULT_PERSIST
/*
* We called pm_runtime_get_noresume when the device was attached.
-@@ -3727,6 +3741,8 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3757,6 +3771,8 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
udev->slot_id = slot_id;
@@ -869,7 +869,7 @@
#ifndef CONFIG_USB_DEFAULT_PERSIST
/*
* If resetting upon resume, we can't put the controller into runtime
-@@ -5040,6 +5056,8 @@ static int __init xhci_hcd_init(void)
+@@ -5070,6 +5086,8 @@ static int __init xhci_hcd_init(void)
if (usb_disabled())
return -ENODEV;
@@ -878,7 +878,7 @@
return 0;
}
-@@ -5047,7 +5065,10 @@ static int __init xhci_hcd_init(void)
+@@ -5077,7 +5095,10 @@ static int __init xhci_hcd_init(void)
* If an init function is provided, an exit function must also be provided
* to allow module unload.
*/
diff --git a/patches/0249-usb-xhci-Fix-memory-leak-when-xhci_disable_slot-retu.patch b/patches/0249-usb-xhci-Fix-memory-leak-when-xhci_disable_slot-retu.patch
index 02d55b5..8367cb6 100644
--- a/patches/0249-usb-xhci-Fix-memory-leak-when-xhci_disable_slot-retu.patch
+++ b/patches/0249-usb-xhci-Fix-memory-leak-when-xhci_disable_slot-retu.patch
@@ -26,10 +26,10 @@
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 920bfb8162f7..6dc536fa2e3b 100644
+index 5a32c431b4e3..eda3af130d2c 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3606,11 +3606,9 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3636,11 +3636,9 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
}
virt_dev->udev = NULL;
@@ -44,7 +44,7 @@
}
int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
-@@ -3757,7 +3755,11 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3787,7 +3785,11 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
return 1;
disable_slot:
diff --git a/patches/0250-usb-xhci-Remove-xhci-mutex-from-xhci_alloc_dev.patch b/patches/0250-usb-xhci-Remove-xhci-mutex-from-xhci_alloc_dev.patch
index 054d572..a7ddd25 100644
--- a/patches/0250-usb-xhci-Remove-xhci-mutex-from-xhci_alloc_dev.patch
+++ b/patches/0250-usb-xhci-Remove-xhci-mutex-from-xhci_alloc_dev.patch
@@ -27,10 +27,10 @@
1 file changed, 4 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 6dc536fa2e3b..2ac8f8622f8c 100644
+index eda3af130d2c..b64c55324916 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3684,13 +3684,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3714,13 +3714,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
if (!command)
return 0;
@@ -44,7 +44,7 @@
xhci_dbg(xhci, "FIXME: allocate a command ring segment\n");
xhci_free_command(xhci, command);
return 0;
-@@ -3700,7 +3697,6 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3730,7 +3727,6 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
wait_for_completion(command->completion);
slot_id = command->slot_id;
diff --git a/patches/0251-usb-xhci-Handle-USB-transaction-error-on-address-com.patch b/patches/0251-usb-xhci-Handle-USB-transaction-error-on-address-com.patch
index ce703ff..77bcf65 100644
--- a/patches/0251-usb-xhci-Handle-USB-transaction-error-on-address-com.patch
+++ b/patches/0251-usb-xhci-Handle-USB-transaction-error-on-address-com.patch
@@ -33,10 +33,10 @@
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 2ac8f8622f8c..e13f9bb99baf 100644
+index b64c55324916..6cbf4a156c2b 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3879,8 +3879,14 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3909,8 +3909,14 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
break;
case COMP_USB_TRANSACTION_ERROR:
dev_warn(&udev->dev, "Device not responding to setup %s.\n", act);
diff --git a/patches/0254-xhci-trace-slot-context-when-calling-xhci_configure_.patch b/patches/0254-xhci-trace-slot-context-when-calling-xhci_configure_.patch
index acb79d6..fc0e9b4 100644
--- a/patches/0254-xhci-trace-slot-context-when-calling-xhci_configure_.patch
+++ b/patches/0254-xhci-trace-slot-context-when-calling-xhci_configure_.patch
@@ -34,10 +34,10 @@
TP_PROTO(struct xhci_ring *ring),
TP_ARGS(ring),
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index e13f9bb99baf..1af90f1c59e8 100644
+index 6cbf4a156c2b..0ea7ff6e81a4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -2608,6 +2608,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
+@@ -2638,6 +2638,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
unsigned long flags;
struct xhci_input_control_ctx *ctrl_ctx;
struct xhci_virt_device *virt_dev;
@@ -45,7 +45,7 @@
if (!command)
return -EINVAL;
-@@ -2646,6 +2647,9 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
+@@ -2676,6 +2677,9 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
return -ENOMEM;
}
diff --git a/patches/0257-usb-host-xhci-mark-expected-switch-fall-through.patch b/patches/0257-usb-host-xhci-mark-expected-switch-fall-through.patch
index 52299d0..ccb7429 100644
--- a/patches/0257-usb-host-xhci-mark-expected-switch-fall-through.patch
+++ b/patches/0257-usb-host-xhci-mark-expected-switch-fall-through.patch
@@ -16,10 +16,10 @@
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 1af90f1c59e8..19bd1c1df9cc 100644
+index 0ea7ff6e81a4..264c722ae7e5 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -4338,6 +4338,7 @@ static unsigned long long xhci_calculate_intel_u1_timeout(
+@@ -4368,6 +4368,7 @@ static unsigned long long xhci_calculate_intel_u1_timeout(
break;
}
/* Otherwise the calculation is the same as isoc eps */
diff --git a/patches/0260-USB-host-xhci-Remove-redundant-license-text.patch b/patches/0260-USB-host-xhci-Remove-redundant-license-text.patch
index 88df1a9..4ec1872 100644
--- a/patches/0260-USB-host-xhci-Remove-redundant-license-text.patch
+++ b/patches/0260-USB-host-xhci-Remove-redundant-license-text.patch
@@ -420,7 +420,7 @@
#undef TRACE_SYSTEM
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 19bd1c1df9cc..4bceebb965ca 100644
+index 264c722ae7e5..7ec15e6a7267 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -6,19 +6,6 @@
diff --git a/patches/0261-xhci-Fix-xhci-debugfs-NULL-pointer-dereference-in-re.patch b/patches/0261-xhci-Fix-xhci-debugfs-NULL-pointer-dereference-in-re.patch
index 885082b..5e6af91 100644
--- a/patches/0261-xhci-Fix-xhci-debugfs-NULL-pointer-dereference-in-re.patch
+++ b/patches/0261-xhci-Fix-xhci-debugfs-NULL-pointer-dereference-in-re.patch
@@ -26,10 +26,10 @@
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 4bceebb965ca..05d45079a259 100644
+index 7ec15e6a7267..bd08e53f8426 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3567,8 +3567,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3597,8 +3597,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
struct xhci_slot_ctx *slot_ctx;
int i, ret;
@@ -38,7 +38,7 @@
#ifndef CONFIG_USB_DEFAULT_PERSIST
/*
* We called pm_runtime_get_noresume when the device was attached.
-@@ -3598,8 +3596,10 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3628,8 +3626,10 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
virt_dev->udev = NULL;
ret = xhci_disable_slot(xhci, udev->slot_id);
diff --git a/patches/0291-media-v4l-async-Move-async-subdev-notifier-operation.patch b/patches/0291-media-v4l-async-Move-async-subdev-notifier-operation.patch
index 68ee87d..feeb56d 100644
--- a/patches/0291-media-v4l-async-Move-async-subdev-notifier-operation.patch
+++ b/patches/0291-media-v4l-async-Move-async-subdev-notifier-operation.patch
@@ -154,10 +154,10 @@
&vpif_obj.notifier);
if (err) {
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
-index 56fe4e5b396e..ff2f75a328c9 100644
+index 4a65861433d6..688ed781e1e8 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
-@@ -1232,6 +1232,11 @@ static int vpif_async_complete(struct v4l2_async_notifier *notifier)
+@@ -1240,6 +1240,11 @@ static int vpif_async_complete(struct v4l2_async_notifier *notifier)
return vpif_probe_complete();
}
@@ -169,7 +169,7 @@
/*
* vpif_probe: This function creates device entries by register itself to the
* V4L2 driver and initializes fields of each channel objects
-@@ -1313,8 +1318,7 @@ static __init int vpif_probe(struct platform_device *pdev)
+@@ -1319,8 +1324,7 @@ static __init int vpif_probe(struct platform_device *pdev)
} else {
vpif_obj.notifier.subdevs = vpif_obj.config->asd;
vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
diff --git a/patches/0429-iommu-ipmmu-vmsa-Remove-redundant-of_iommu_init_fn-h.patch b/patches/0429-iommu-ipmmu-vmsa-Remove-redundant-of_iommu_init_fn-h.patch
index 31f1d75..d51fe88 100644
--- a/patches/0429-iommu-ipmmu-vmsa-Remove-redundant-of_iommu_init_fn-h.patch
+++ b/patches/0429-iommu-ipmmu-vmsa-Remove-redundant-of_iommu_init_fn-h.patch
@@ -19,10 +19,10 @@
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
-index 8dce3a9de9d8..331dad909301 100644
+index 7b49e8efc7e7..2747786dfe31 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
-@@ -1108,18 +1108,8 @@ static void __exit ipmmu_exit(void)
+@@ -1107,18 +1107,8 @@ static void __exit ipmmu_exit(void)
subsys_initcall(ipmmu_init);
module_exit(ipmmu_exit);
diff --git a/patches/0505-usb-gadget-udc-renesas_usb3-fix-oops-in-renesas_usb3.patch b/patches/0505-usb-gadget-udc-renesas_usb3-fix-oops-in-renesas_usb3.patch
index 2b15880..710bf33 100644
--- a/patches/0505-usb-gadget-udc-renesas_usb3-fix-oops-in-renesas_usb3.patch
+++ b/patches/0505-usb-gadget-udc-renesas_usb3-fix-oops-in-renesas_usb3.patch
@@ -19,10 +19,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 7e04b5c0fd32..94224101033e 100644
+index 3c8e43b88a91..55bfb37d3d14 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2423,7 +2423,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)
+@@ -2426,7 +2426,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)
__renesas_usb3_ep_free_request(usb3->ep0_req);
if (usb3->phy)
phy_put(usb3->phy);
diff --git a/patches/0519-usb-xhci-remove-unused-variable-last_freed_endpoint.patch b/patches/0519-usb-xhci-remove-unused-variable-last_freed_endpoint.patch
index 216ee23..4fead04 100644
--- a/patches/0519-usb-xhci-remove-unused-variable-last_freed_endpoint.patch
+++ b/patches/0519-usb-xhci-remove-unused-variable-last_freed_endpoint.patch
@@ -18,10 +18,10 @@
1 file changed, 3 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 05d45079a259..39e263780383 100644
+index bd08e53f8426..6fb8297f32f1 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3405,7 +3405,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3435,7 +3435,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
unsigned int slot_id;
struct xhci_virt_device *virt_dev;
struct xhci_command *reset_device_cmd;
@@ -29,7 +29,7 @@
struct xhci_slot_ctx *slot_ctx;
int old_active_eps = 0;
-@@ -3520,7 +3519,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3550,7 +3549,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
}
/* Everything but endpoint 0 is disabled, so free the rings. */
@@ -37,7 +37,7 @@
for (i = 1; i < 31; i++) {
struct xhci_virt_ep *ep = &virt_dev->eps[i];
-@@ -3535,7 +3533,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3565,7 +3563,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
if (ep->ring) {
xhci_debugfs_remove_endpoint(xhci, virt_dev, i);
xhci_free_endpoint_ring(xhci, virt_dev, i);
diff --git a/patches/0520-usb-xhci-remove-unused-variable-ep.patch b/patches/0520-usb-xhci-remove-unused-variable-ep.patch
index fa46c6f..2a4725b 100644
--- a/patches/0520-usb-xhci-remove-unused-variable-ep.patch
+++ b/patches/0520-usb-xhci-remove-unused-variable-ep.patch
@@ -16,10 +16,10 @@
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 39e263780383..0653680e62a8 100644
+index 6fb8297f32f1..9a7b53761a90 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -2880,12 +2880,10 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index,
+@@ -2910,12 +2910,10 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index,
unsigned int stream_id, struct xhci_td *td)
{
struct xhci_dequeue_state deq_state;
diff --git a/patches/0524-xhci-add-helper-to-allocate-command-with-input-conte.patch b/patches/0524-xhci-add-helper-to-allocate-command-with-input-conte.patch
index 0dbcd96..aee35f3 100644
--- a/patches/0524-xhci-add-helper-to-allocate-command-with-input-conte.patch
+++ b/patches/0524-xhci-add-helper-to-allocate-command-with-input-conte.patch
@@ -71,10 +71,10 @@
goto fail;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 0653680e62a8..47f77085d5ce 100644
+index 9a7b53761a90..59d50855c874 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3132,7 +3132,7 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3162,7 +3162,7 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
return -ENOSYS;
}
@@ -83,7 +83,7 @@
if (!config_cmd)
return -ENOMEM;
-@@ -4718,7 +4718,7 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+@@ -4748,7 +4748,7 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
return -EINVAL;
}
diff --git a/patches/0525-xhci-remove-unnecessary-boolean-parameter-from-xhci_.patch b/patches/0525-xhci-remove-unnecessary-boolean-parameter-from-xhci_.patch
index a332e73..f8a5cf8 100644
--- a/patches/0525-xhci-remove-unnecessary-boolean-parameter-from-xhci_.patch
+++ b/patches/0525-xhci-remove-unnecessary-boolean-parameter-from-xhci_.patch
@@ -123,10 +123,10 @@
return;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 47f77085d5ce..7dafd44cf1c2 100644
+index 59d50855c874..539e62c47995 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -610,7 +610,7 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -625,7 +625,7 @@ int xhci_run(struct usb_hcd *hcd)
if (xhci->quirks & XHCI_NEC_HOST) {
struct xhci_command *command;
@@ -135,7 +135,7 @@
if (!command)
return -ENOMEM;
-@@ -1285,7 +1285,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
+@@ -1300,7 +1300,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
* changes max packet sizes.
*/
@@ -144,7 +144,7 @@
if (!command)
return -ENOMEM;
-@@ -1540,7 +1540,7 @@ static int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -1570,7 +1570,7 @@ static int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
* the first cancellation to be handled.
*/
if (!(ep->ep_state & EP_STOP_CMD_PENDING)) {
@@ -153,7 +153,7 @@
if (!command) {
ret = -ENOMEM;
goto done;
-@@ -2725,7 +2725,7 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -2755,7 +2755,7 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev);
virt_dev = xhci->devs[udev->slot_id];
@@ -162,7 +162,7 @@
if (!command)
return -ENOMEM;
-@@ -3455,7 +3455,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3485,7 +3485,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
* reset as part of error handling, so use GFP_NOIO instead of
* GFP_KERNEL.
*/
@@ -171,7 +171,7 @@
if (!reset_device_cmd) {
xhci_dbg(xhci, "Couldn't allocate command structure.\n");
return -ENOMEM;
-@@ -3604,7 +3604,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
+@@ -3634,7 +3634,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
u32 state;
int ret = 0;
@@ -180,7 +180,7 @@
if (!command)
return -ENOMEM;
-@@ -3666,7 +3666,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3696,7 +3696,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
int ret, slot_id;
struct xhci_command *command;
@@ -189,7 +189,7 @@
if (!command)
return 0;
-@@ -3799,7 +3799,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3829,7 +3829,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
}
}
diff --git a/patches/0527-usb-xhci-Add-DbC-support-in-xHCI-driver.patch b/patches/0527-usb-xhci-Add-DbC-support-in-xHCI-driver.patch
index a6f5c9f..2f243f5 100644
--- a/patches/0527-usb-xhci-Add-DbC-support-in-xHCI-driver.patch
+++ b/patches/0527-usb-xhci-Add-DbC-support-in-xHCI-driver.patch
@@ -1939,7 +1939,7 @@
/* this part must be outside header guard */
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 7dafd44cf1c2..86a0aa13cc6e 100644
+index 539e62c47995..b383a7774a6c 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -21,6 +21,7 @@
@@ -1950,7 +1950,7 @@
#define DRIVER_AUTHOR "Sarah Sharp"
#define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"
-@@ -622,6 +623,8 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -637,6 +638,8 @@ int xhci_run(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB2 roothub");
@@ -1959,7 +1959,7 @@
xhci_debugfs_init(xhci);
return 0;
-@@ -654,6 +657,8 @@ static void xhci_stop(struct usb_hcd *hcd)
+@@ -669,6 +672,8 @@ static void xhci_stop(struct usb_hcd *hcd)
xhci_debugfs_exit(xhci);
@@ -1968,7 +1968,7 @@
spin_lock_irq(&xhci->lock);
xhci->xhc_state |= XHCI_STATE_HALTED;
xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
-@@ -905,6 +910,8 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
+@@ -920,6 +925,8 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
xhci->shared_hcd->state != HC_STATE_SUSPENDED)
return -EINVAL;
@@ -1977,7 +1977,7 @@
/* Clear root port wake on bits if wakeup not allowed. */
if (!do_wakeup)
xhci_disable_port_wake_on_bits(xhci);
-@@ -1108,6 +1115,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+@@ -1123,6 +1130,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
spin_unlock_irq(&xhci->lock);
diff --git a/patches/0528-usb-xhci-Cleanup-printk-debug-message-for-registers.patch b/patches/0528-usb-xhci-Cleanup-printk-debug-message-for-registers.patch
index b5aa976..34f36a1 100644
--- a/patches/0528-usb-xhci-Cleanup-printk-debug-message-for-registers.patch
+++ b/patches/0528-usb-xhci-Cleanup-printk-debug-message-for-registers.patch
@@ -312,10 +312,10 @@
/*
* XXX: Might need to set the Interrupter Moderation Register to
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 86a0aa13cc6e..b2238ca1c925 100644
+index b383a7774a6c..334c48f8abae 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -574,8 +574,6 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -589,8 +589,6 @@ int xhci_run(struct usb_hcd *hcd)
if (ret)
return ret;
@@ -324,7 +324,7 @@
xhci_dbg(xhci, "ERST memory map follows:\n");
xhci_dbg_erst(xhci, &xhci->erst);
temp_64 = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue);
-@@ -606,7 +604,6 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -621,7 +619,6 @@ int xhci_run(struct usb_hcd *hcd)
"// Enabling event ring interrupter %p by writing 0x%x to irq_pending",
xhci->ir_set, (unsigned int) ER_IRQ_ENABLE(temp));
writel(ER_IRQ_ENABLE(temp), &xhci->ir_set->irq_pending);
@@ -332,7 +332,7 @@
if (xhci->quirks & XHCI_NEC_HOST) {
struct xhci_command *command;
-@@ -686,7 +683,6 @@ static void xhci_stop(struct usb_hcd *hcd)
+@@ -701,7 +698,6 @@ static void xhci_stop(struct usb_hcd *hcd)
writel((temp & ~0x1fff) | STS_EINT, &xhci->op_regs->status);
temp = readl(&xhci->ir_set->irq_pending);
writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
@@ -340,7 +340,7 @@
xhci_dbg_trace(xhci, trace_xhci_dbg_init, "cleaning up memory");
xhci_mem_cleanup(xhci);
-@@ -1064,7 +1060,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+@@ -1079,7 +1075,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
writel((temp & ~0x1fff) | STS_EINT, &xhci->op_regs->status);
temp = readl(&xhci->ir_set->irq_pending);
writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
@@ -348,7 +348,7 @@
xhci_dbg(xhci, "cleaning up memory\n");
xhci_mem_cleanup(xhci);
-@@ -4883,7 +4878,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
+@@ -4913,7 +4908,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
xhci->hcc_params = readl(&xhci->cap_regs->hcc_params);
if (xhci->hci_version > 0x100)
xhci->hcc_params2 = readl(&xhci->cap_regs->hcc_params2);
diff --git a/patches/0529-usb-xhci-Cleanup-printk-debug-message-for-ERST.patch b/patches/0529-usb-xhci-Cleanup-printk-debug-message-for-ERST.patch
index cc4d1dc..1a2b522 100644
--- a/patches/0529-usb-xhci-Cleanup-printk-debug-message-for-ERST.patch
+++ b/patches/0529-usb-xhci-Cleanup-printk-debug-message-for-ERST.patch
@@ -49,10 +49,10 @@
struct xhci_container_ctx *ctx)
{
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index b2238ca1c925..786cca0eb73c 100644
+index 334c48f8abae..0f0b3c4e897d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -574,8 +574,6 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -589,8 +589,6 @@ int xhci_run(struct usb_hcd *hcd)
if (ret)
return ret;
diff --git a/patches/0530-usb-xhci-allow-imod-interval-to-be-configurable.patch b/patches/0530-usb-xhci-allow-imod-interval-to-be-configurable.patch
index 4052532..1f7d3ec 100644
--- a/patches/0530-usb-xhci-allow-imod-interval-to-be-configurable.patch
+++ b/patches/0530-usb-xhci-allow-imod-interval-to-be-configurable.patch
@@ -124,10 +124,10 @@
if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 786cca0eb73c..34bc8a678bd5 100644
+index 0f0b3c4e897d..cd73af37f967 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -583,11 +583,7 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -598,11 +598,7 @@ int xhci_run(struct usb_hcd *hcd)
"// Set the interrupt modulation register");
temp = readl(&xhci->ir_set->irq_control);
temp &= ~ER_IRQ_INTERVAL_MASK;
diff --git a/patches/0535-xhci-Fix-xhci-debugfs-devices-node-disappearance-aft.patch b/patches/0535-xhci-Fix-xhci-debugfs-devices-node-disappearance-aft.patch
index 270c4a0..406d1db 100644
--- a/patches/0535-xhci-Fix-xhci-debugfs-devices-node-disappearance-aft.patch
+++ b/patches/0535-xhci-Fix-xhci-debugfs-devices-node-disappearance-aft.patch
@@ -27,10 +27,10 @@
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 34bc8a678bd5..a25e0827941e 100644
+index cd73af37f967..7c3150632533 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -1057,6 +1057,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+@@ -1072,6 +1072,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
xhci_dbg(xhci, "cleaning up memory\n");
xhci_mem_cleanup(xhci);
diff --git a/patches/0536-xhci-xhci-debugfs-device-nodes-weren-t-removed-after.patch b/patches/0536-xhci-xhci-debugfs-device-nodes-weren-t-removed-after.patch
index 9248646..29cc09a 100644
--- a/patches/0536-xhci-xhci-debugfs-device-nodes-weren-t-removed-after.patch
+++ b/patches/0536-xhci-xhci-debugfs-device-nodes-weren-t-removed-after.patch
@@ -24,10 +24,10 @@
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index a25e0827941e..72ab7148c99b 100644
+index 7c3150632533..799b6d5352ac 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3588,12 +3588,11 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3618,12 +3618,11 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);
}
diff --git a/patches/0537-xhci-fix-xhci-debugfs-errors-in-xhci_stop.patch b/patches/0537-xhci-fix-xhci-debugfs-errors-in-xhci_stop.patch
index 1cb71f1..6969bac 100644
--- a/patches/0537-xhci-fix-xhci-debugfs-errors-in-xhci_stop.patch
+++ b/patches/0537-xhci-fix-xhci-debugfs-errors-in-xhci_stop.patch
@@ -27,10 +27,10 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 72ab7148c99b..b365d37aacbf 100644
+index 799b6d5352ac..5afe991e6bd2 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -646,8 +646,6 @@ static void xhci_stop(struct usb_hcd *hcd)
+@@ -661,8 +661,6 @@ static void xhci_stop(struct usb_hcd *hcd)
return;
}
@@ -39,7 +39,7 @@
xhci_dbc_exit(xhci);
spin_lock_irq(&xhci->lock);
-@@ -680,6 +678,7 @@ static void xhci_stop(struct usb_hcd *hcd)
+@@ -695,6 +693,7 @@ static void xhci_stop(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init, "cleaning up memory");
xhci_mem_cleanup(xhci);
diff --git a/patches/0560-ASoC-rsnd-call-snd_soc_disconnect_sync-when-remove.patch b/patches/0560-ASoC-rsnd-call-snd_soc_disconnect_sync-when-remove.patch
index e93b3d4..fc4d60b 100644
--- a/patches/0560-ASoC-rsnd-call-snd_soc_disconnect_sync-when-remove.patch
+++ b/patches/0560-ASoC-rsnd-call-snd_soc_disconnect_sync-when-remove.patch
@@ -26,10 +26,10 @@
1 file changed, 2 insertions(+)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index f12a88a21dfa..bd64dc6ec1c3 100644
+index 976299d43b23..86381967c4f2 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1496,6 +1496,8 @@ static int rsnd_remove(struct platform_device *pdev)
+@@ -1507,6 +1507,8 @@ static int rsnd_remove(struct platform_device *pdev)
};
int ret = 0, i;
diff --git a/patches/0561-ASoC-rsnd-TDM-6ch-needs-8ch-clock-for-hw-refine.patch b/patches/0561-ASoC-rsnd-TDM-6ch-needs-8ch-clock-for-hw-refine.patch
index ebc9b5c..e64abef 100644
--- a/patches/0561-ASoC-rsnd-TDM-6ch-needs-8ch-clock-for-hw-refine.patch
+++ b/patches/0561-ASoC-rsnd-TDM-6ch-needs-8ch-clock-for-hw-refine.patch
@@ -27,7 +27,7 @@
2 files changed, 80 insertions(+), 27 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index bd64dc6ec1c3..d76ad46a6fd9 100644
+index 86381967c4f2..3fc1a61965e3 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -197,16 +197,27 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io)
@@ -228,12 +228,12 @@
+ rsnd_dai_stream_quit(io);
}
- static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
+ static int rsnd_soc_dai_prepare(struct snd_pcm_substream *substream,
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 57cd2bc773c2..ad6523595b0a 100644
+index eb6706d22391..ecdce52416bb 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -399,9 +399,18 @@ void rsnd_parse_connect_common(struct rsnd_dai *rdai,
+@@ -406,9 +406,18 @@ void rsnd_parse_connect_common(struct rsnd_dai *rdai,
struct device_node *playback,
struct device_node *capture);
diff --git a/patches/0563-ASoC-rsnd-ssi-remove-unnesessary-period_pos.patch b/patches/0563-ASoC-rsnd-ssi-remove-unnesessary-period_pos.patch
index e790b5b..6c82ea1 100644
--- a/patches/0563-ASoC-rsnd-ssi-remove-unnesessary-period_pos.patch
+++ b/patches/0563-ASoC-rsnd-ssi-remove-unnesessary-period_pos.patch
@@ -21,7 +21,7 @@
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index cbf3bf312d23..f21202429000 100644
+index 6e608820afdb..215667cd3c4a 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -80,7 +80,6 @@ struct rsnd_ssi {
diff --git a/patches/0564-ASoC-rsnd-more-clear-rsnd_get_dalign-for-DALIGN.patch b/patches/0564-ASoC-rsnd-more-clear-rsnd_get_dalign-for-DALIGN.patch
index e1f867b..8bc08dd 100644
--- a/patches/0564-ASoC-rsnd-more-clear-rsnd_get_dalign-for-DALIGN.patch
+++ b/patches/0564-ASoC-rsnd-more-clear-rsnd_get_dalign-for-DALIGN.patch
@@ -20,7 +20,7 @@
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index d76ad46a6fd9..8e50b284230d 100644
+index 3fc1a61965e3..7cc0d38e56c1 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -294,11 +294,12 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
diff --git a/patches/0565-ASoC-rsnd-don-t-use-runtime-sample_bits.patch b/patches/0565-ASoC-rsnd-don-t-use-runtime-sample_bits.patch
index 239aed5..e201740 100644
--- a/patches/0565-ASoC-rsnd-don-t-use-runtime-sample_bits.patch
+++ b/patches/0565-ASoC-rsnd-don-t-use-runtime-sample_bits.patch
@@ -20,7 +20,7 @@
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 8e50b284230d..a96ebebd96de 100644
+index 7cc0d38e56c1..ef3a8afc4ec6 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -274,10 +274,10 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
@@ -60,7 +60,7 @@
for (i = 0; i < ARRAY_SIZE(playback_mods); i++) {
tmod = rsnd_io_to_mod(io, mods[i]);
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index f21202429000..5a70fdc3c680 100644
+index 215667cd3c4a..f5eb4e93cb9b 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -370,11 +370,11 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod,
@@ -77,7 +77,7 @@
cr_own |= DWL_24;
break;
}
-@@ -677,11 +677,8 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -672,11 +672,8 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
rsnd_ssi_pointer_offset(mod, io, 0));
int shift = 0;
diff --git a/patches/0566-ASoC-rsnd-PIO-related-function-cleanup.patch b/patches/0566-ASoC-rsnd-PIO-related-function-cleanup.patch
index b727ce3..dad7c9f 100644
--- a/patches/0566-ASoC-rsnd-PIO-related-function-cleanup.patch
+++ b/patches/0566-ASoC-rsnd-PIO-related-function-cleanup.patch
@@ -20,7 +20,7 @@
1 file changed, 72 insertions(+), 81 deletions(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 5a70fdc3c680..97a9db892a8f 100644
+index f5eb4e93cb9b..ffe9a8590a48 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -79,6 +79,7 @@ struct rsnd_ssi {
@@ -93,7 +93,7 @@
/*
* SSI mod common functions
*/
-@@ -481,8 +427,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
+@@ -480,8 +426,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
if (!rsnd_ssi_is_run_mods(mod, io))
return 0;
@@ -102,7 +102,7 @@
ssi->usrcnt++;
rsnd_mod_power_on(mod);
-@@ -653,6 +597,8 @@ static int rsnd_ssi_irq(struct rsnd_mod *mod,
+@@ -648,6 +592,8 @@ static int rsnd_ssi_irq(struct rsnd_mod *mod,
return 0;
}
@@ -111,7 +111,7 @@
static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
struct rsnd_dai_stream *io)
{
-@@ -671,27 +617,8 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -666,27 +612,8 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
status = rsnd_ssi_status_get(mod);
/* PIO only */
@@ -141,7 +141,7 @@
/* DMA only */
if (is_dma && (status & (UIRQ | OIRQ)))
-@@ -829,7 +756,71 @@ static int rsnd_ssi_common_remove(struct rsnd_mod *mod,
+@@ -824,7 +751,71 @@ static int rsnd_ssi_common_remove(struct rsnd_mod *mod,
return 0;
}
@@ -214,7 +214,7 @@
struct rsnd_dai_stream *io,
snd_pcm_uframes_t *pointer)
{
-@@ -845,12 +836,12 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
+@@ -847,12 +838,12 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
.name = SSI_NAME,
.probe = rsnd_ssi_common_probe,
.remove = rsnd_ssi_common_remove,
@@ -228,7 +228,7 @@
+ .pointer = rsnd_ssi_pio_pointer,
.pcm_new = rsnd_ssi_pcm_new,
.hw_params = rsnd_ssi_hw_params,
- };
+ .prepare = rsnd_ssi_prepare,
--
-2.19.0
+2.17.1
diff --git a/patches/0567-ASoC-rsnd-remove-unneeded-is_graph-from-__rsnd_dai_p.patch b/patches/0567-ASoC-rsnd-remove-unneeded-is_graph-from-__rsnd_dai_p.patch
index 1b25e2f..680e46c 100644
--- a/patches/0567-ASoC-rsnd-remove-unneeded-is_graph-from-__rsnd_dai_p.patch
+++ b/patches/0567-ASoC-rsnd-remove-unneeded-is_graph-from-__rsnd_dai_p.patch
@@ -14,10 +14,10 @@
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index a96ebebd96de..64d5ecb86528 100644
+index ef3a8afc4ec6..d486f082b248 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1017,7 +1017,7 @@ static struct device_node *rsnd_dai_of_node(struct rsnd_priv *priv,
+@@ -1028,7 +1028,7 @@ static struct device_node *rsnd_dai_of_node(struct rsnd_priv *priv,
static void __rsnd_dai_probe(struct rsnd_priv *priv,
struct device_node *dai_np,
@@ -26,7 +26,7 @@
{
struct device_node *playback, *capture;
struct rsnd_dai_stream *io_playback;
-@@ -1116,13 +1116,13 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
+@@ -1127,13 +1127,13 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
dai_i = 0;
if (is_graph) {
for_each_endpoint_of_node(dai_node, dai_np) {
diff --git a/patches/0898-xhci-refactor-xhci_urb_enqueue-a-bit-with-minor-chan.patch b/patches/0898-xhci-refactor-xhci_urb_enqueue-a-bit-with-minor-chan.patch
index 98e62d4..9ca4452 100644
--- a/patches/0898-xhci-refactor-xhci_urb_enqueue-a-bit-with-minor-chan.patch
+++ b/patches/0898-xhci-refactor-xhci_urb_enqueue-a-bit-with-minor-chan.patch
@@ -23,10 +23,10 @@
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index b365d37aacbf..c233ffc72b53 100644
+index 5afe991e6bd2..d91c51a8ce6d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -1329,7 +1329,8 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -1344,7 +1344,8 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
unsigned long flags;
int ret = 0;
@@ -36,7 +36,7 @@
struct urb_priv *urb_priv;
int num_tds;
-@@ -1339,6 +1340,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -1354,6 +1355,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
slot_id = urb->dev->slot_id;
ep_index = xhci_get_endpoint_index(&urb->ep->desc);
@@ -44,7 +44,7 @@
if (!HCD_HW_ACCESSIBLE(hcd)) {
if (!in_interrupt())
-@@ -1390,6 +1392,12 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -1405,6 +1407,12 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
ret = -ESHUTDOWN;
goto free_priv;
}
@@ -57,7 +57,7 @@
switch (usb_endpoint_type(&urb->ep->desc)) {
-@@ -1398,23 +1406,13 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -1413,23 +1421,13 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
slot_id, ep_index);
break;
case USB_ENDPOINT_XFER_BULK:
diff --git a/patches/0899-xhci-Clear-the-host-side-toggle-manually-when-endpoi.patch b/patches/0899-xhci-Clear-the-host-side-toggle-manually-when-endpoi.patch
index 4a461cc..e88875f 100644
--- a/patches/0899-xhci-Clear-the-host-side-toggle-manually-when-endpoi.patch
+++ b/patches/0899-xhci-Clear-the-host-side-toggle-manually-when-endpoi.patch
@@ -46,10 +46,10 @@
}
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index c233ffc72b53..5466d4db6ffe 100644
+index d91c51a8ce6d..ec926796930a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -1398,6 +1398,11 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -1413,6 +1413,11 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
ret = -EINVAL;
goto free_priv;
}
@@ -61,7 +61,7 @@
switch (usb_endpoint_type(&urb->ep->desc)) {
-@@ -2911,33 +2916,103 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index,
+@@ -2941,33 +2946,103 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index,
}
}
diff --git a/patches/0925-ASoC-rsnd-indicate-IRQ-error-status-for-debug.patch b/patches/0925-ASoC-rsnd-indicate-IRQ-error-status-for-debug.patch
index 3ad58a3..70dae06 100644
--- a/patches/0925-ASoC-rsnd-indicate-IRQ-error-status-for-debug.patch
+++ b/patches/0925-ASoC-rsnd-indicate-IRQ-error-status-for-debug.patch
@@ -25,10 +25,10 @@
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index ad6523595b0a..5241ea7cf153 100644
+index ecdce52416bb..ea254fc7e824 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -788,4 +788,14 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type);
+@@ -795,4 +795,14 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type);
#define rsnd_mod_confirm_dvc(mdvc)
#endif
@@ -93,7 +93,7 @@
return ret;
}
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 97a9db892a8f..333b802681ad 100644
+index ffe9a8590a48..88dfa82cbdec 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -11,6 +11,15 @@
@@ -112,7 +112,7 @@
#include <sound/simple_card_utils.h>
#include <linux/delay.h>
#include "rsnd.h"
-@@ -603,6 +612,7 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -598,6 +607,7 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
struct rsnd_dai_stream *io)
{
struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
@@ -120,7 +120,7 @@
int is_dma = rsnd_ssi_is_dma_mode(mod);
u32 status;
bool elapsed = false;
-@@ -621,8 +631,12 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -616,8 +626,12 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
elapsed = rsnd_ssi_pio_interrupt(mod, io);
/* DMA only */
diff --git a/patches/0926-ASoC-rsnd-suppress-rsnd_dai_call-debug-message.patch b/patches/0926-ASoC-rsnd-suppress-rsnd_dai_call-debug-message.patch
index 2e6f7ae..606890e 100644
--- a/patches/0926-ASoC-rsnd-suppress-rsnd_dai_call-debug-message.patch
+++ b/patches/0926-ASoC-rsnd-suppress-rsnd_dai_call-debug-message.patch
@@ -20,7 +20,7 @@
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 64d5ecb86528..5aafc37f5119 100644
+index d486f082b248..d3ede690c54f 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -93,6 +93,15 @@
@@ -49,10 +49,10 @@
(func_call && (mod)->ops->fn) ? #fn : ""); \
if (func_call && (mod)->ops->fn) \
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 5241ea7cf153..172c8d612890 100644
+index ea254fc7e824..84bea1d17f19 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -798,4 +798,14 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type);
+@@ -805,4 +805,14 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type);
if (!IS_BUILTIN(RSND_DEBUG_NO_IRQ_STATUS)) \
dev_dbg(dev, param)
diff --git a/patches/0928-ASoC-rsnd-set-pm_ops-in-hibernate-compatible-way.patch b/patches/0928-ASoC-rsnd-set-pm_ops-in-hibernate-compatible-way.patch
index 3432098..70af096 100644
--- a/patches/0928-ASoC-rsnd-set-pm_ops-in-hibernate-compatible-way.patch
+++ b/patches/0928-ASoC-rsnd-set-pm_ops-in-hibernate-compatible-way.patch
@@ -18,10 +18,10 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 5aafc37f5119..96526c91a94b 100644
+index d3ede690c54f..7505898d9428 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1569,8 +1569,7 @@ static int rsnd_resume(struct device *dev)
+@@ -1580,8 +1580,7 @@ static int rsnd_resume(struct device *dev)
}
static const struct dev_pm_ops rsnd_pm_ops = {
diff --git a/patches/0929-ASoC-rsnd-mark-PM-functions-__maybe_unused.patch b/patches/0929-ASoC-rsnd-mark-PM-functions-__maybe_unused.patch
index ec530d5..32ffa8a 100644
--- a/patches/0929-ASoC-rsnd-mark-PM-functions-__maybe_unused.patch
+++ b/patches/0929-ASoC-rsnd-mark-PM-functions-__maybe_unused.patch
@@ -25,10 +25,10 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 96526c91a94b..be92c11a22bb 100644
+index 7505898d9428..d4bedc30fd52 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1550,7 +1550,7 @@ static int rsnd_remove(struct platform_device *pdev)
+@@ -1561,7 +1561,7 @@ static int rsnd_remove(struct platform_device *pdev)
return ret;
}
@@ -37,7 +37,7 @@
{
struct rsnd_priv *priv = dev_get_drvdata(dev);
-@@ -1559,7 +1559,7 @@ static int rsnd_suspend(struct device *dev)
+@@ -1570,7 +1570,7 @@ static int rsnd_suspend(struct device *dev)
return 0;
}
diff --git a/patches/1209-ASoC-rsnd-makes-rsnd_cmd_mod_get-static.patch b/patches/1209-ASoC-rsnd-makes-rsnd_cmd_mod_get-static.patch
index db695a5..61f109f 100644
--- a/patches/1209-ASoC-rsnd-makes-rsnd_cmd_mod_get-static.patch
+++ b/patches/1209-ASoC-rsnd-makes-rsnd_cmd_mod_get-static.patch
@@ -50,10 +50,10 @@
{
struct device *dev = rsnd_priv_to_dev(priv);
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 172c8d612890..ab4d55548ed1 100644
+index 84bea1d17f19..5821f4ece2b1 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -775,7 +775,6 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
+@@ -782,7 +782,6 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
int rsnd_cmd_probe(struct rsnd_priv *priv);
void rsnd_cmd_remove(struct rsnd_priv *priv);
int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id);
diff --git a/patches/1210-ASoC-rsnd-add-RSND_GEN3-for-R-Car-Gen3.patch b/patches/1210-ASoC-rsnd-add-RSND_GEN3-for-R-Car-Gen3.patch
index 4f20ee2..cbb747a 100644
--- a/patches/1210-ASoC-rsnd-add-RSND_GEN3-for-R-Car-Gen3.patch
+++ b/patches/1210-ASoC-rsnd-add-RSND_GEN3-for-R-Car-Gen3.patch
@@ -25,7 +25,7 @@
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index be92c11a22bb..813dd673a7ae 100644
+index d4bedc30fd52..cda570691957 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -111,7 +111,7 @@
@@ -74,10 +74,10 @@
if (ret < 0)
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index ab4d55548ed1..b1896f1eb214 100644
+index 5821f4ece2b1..070f6a0d5cfc 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -538,6 +538,7 @@ struct rsnd_priv {
+@@ -545,6 +545,7 @@ struct rsnd_priv {
#define RSND_GEN_MASK (0xF << 0)
#define RSND_GEN1 (1 << 0)
#define RSND_GEN2 (2 << 0)
@@ -85,7 +85,7 @@
/*
* below value will be filled on rsnd_gen_probe()
-@@ -609,6 +610,7 @@ struct rsnd_priv {
+@@ -616,6 +617,7 @@ struct rsnd_priv {
#define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1)
#define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2)
diff --git a/patches/1211-ASoC-rsnd-don-t-assume-node-full-path-name-for-HDMI-.patch b/patches/1211-ASoC-rsnd-don-t-assume-node-full-path-name-for-HDMI-.patch
index 8d96704..09976cc 100644
--- a/patches/1211-ASoC-rsnd-don-t-assume-node-full-path-name-for-HDMI-.patch
+++ b/patches/1211-ASoC-rsnd-don-t-assume-node-full-path-name-for-HDMI-.patch
@@ -32,10 +32,10 @@
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 333b802681ad..31ffe3f0e163 100644
+index 88dfa82cbdec..fd1ee4943788 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
-@@ -1004,19 +1004,26 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv,
+@@ -1008,19 +1008,26 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv,
struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_mod *mod = rsnd_io_to_mod_ssi(io);
struct rsnd_ssi *ssi;
diff --git a/patches/1212-ASoC-rsnd-Enable-IPMMU-v2.patch b/patches/1212-ASoC-rsnd-Enable-IPMMU-v2.patch
index 9785760..165cc0e 100644
--- a/patches/1212-ASoC-rsnd-Enable-IPMMU-v2.patch
+++ b/patches/1212-ASoC-rsnd-Enable-IPMMU-v2.patch
@@ -34,10 +34,10 @@
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 813dd673a7ae..2660d2566021 100644
+index cda570691957..dc61f53dd8b5 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
-@@ -1352,6 +1352,37 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -1363,6 +1363,37 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
#define PREALLOC_BUFFER (32 * 1024)
#define PREALLOC_BUFFER_MAX (32 * 1024)
@@ -75,7 +75,7 @@
static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *dai = rtd->cpu_dai;
-@@ -1366,11 +1397,17 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
+@@ -1377,11 +1408,17 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
if (ret)
return ret;
@@ -117,10 +117,10 @@
dmac->dmaen_num++;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index b1896f1eb214..6d7280d2d9be 100644
+index 070f6a0d5cfc..e93032498a5b 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
-@@ -435,6 +435,7 @@ struct rsnd_dai_stream {
+@@ -442,6 +442,7 @@ struct rsnd_dai_stream {
struct snd_pcm_substream *substream;
struct rsnd_mod *mod[RSND_MOD_MAX];
struct rsnd_dai *rdai;
diff --git a/patches/1213-ASoC-rsnd-ssi-wait-maximum-5ms-for-status-check.patch b/patches/1213-ASoC-rsnd-ssi-wait-maximum-5ms-for-status-check.patch
index 840d711..533812f 100644
--- a/patches/1213-ASoC-rsnd-ssi-wait-maximum-5ms-for-status-check.patch
+++ b/patches/1213-ASoC-rsnd-ssi-wait-maximum-5ms-for-status-check.patch
@@ -23,7 +23,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 31ffe3f0e163..9538f76f8e20 100644
+index fd1ee4943788..8ce88ae68bfe 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -171,7 +171,7 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod,
diff --git a/patches/1261-rtc-simplify-getting-.drvdata.patch b/patches/1261-rtc-simplify-getting-.drvdata.patch
index f8067f7..3f3561c 100644
--- a/patches/1261-rtc-simplify-getting-.drvdata.patch
+++ b/patches/1261-rtc-simplify-getting-.drvdata.patch
@@ -31,7 +31,7 @@
15 files changed, 71 insertions(+), 131 deletions(-)
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c
-index bd170cb3361c..d768f6747961 100644
+index 5747a54cbd42..113493b52149 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -48,8 +48,7 @@ static void bq4802_write_mem(struct bq4802 *p, int off, u8 val)
diff --git a/patches/1265-usb-gadget-udc-renesas_usb3-should-call-pm_runtime_e.patch b/patches/1265-usb-gadget-udc-renesas_usb3-should-call-pm_runtime_e.patch
index bc558bc..684e35e 100644
--- a/patches/1265-usb-gadget-udc-renesas_usb3-should-call-pm_runtime_e.patch
+++ b/patches/1265-usb-gadget-udc-renesas_usb3-should-call-pm_runtime_e.patch
@@ -24,10 +24,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 94224101033e..2afb235006dc 100644
+index 55bfb37d3d14..2b17a7b008fe 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2641,6 +2641,7 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2644,6 +2644,7 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_alloc_prd;
@@ -35,7 +35,7 @@
ret = usb_add_gadget_udc(&pdev->dev, &usb3->gadget);
if (ret < 0)
goto err_add_udc;
-@@ -2662,7 +2663,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2665,7 +2666,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
renesas_usb3_debugfs_init(usb3, &pdev->dev);
dev_info(&pdev->dev, "probed%s\n", usb3->phy ? " with phy" : "");
diff --git a/patches/1266-usb-gadget-udc-renesas_usb3-should-call-devm_phy_get.patch b/patches/1266-usb-gadget-udc-renesas_usb3-should-call-devm_phy_get.patch
index f38a350..3d7df29 100644
--- a/patches/1266-usb-gadget-udc-renesas_usb3-should-call-devm_phy_get.patch
+++ b/patches/1266-usb-gadget-udc-renesas_usb3-should-call-devm_phy_get.patch
@@ -22,10 +22,10 @@
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 2afb235006dc..9a6e3d99dffd 100644
+index 2b17a7b008fe..f12501c8099e 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2641,6 +2641,14 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2644,6 +2644,14 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_alloc_prd;
@@ -40,7 +40,7 @@
pm_runtime_enable(&pdev->dev);
ret = usb_add_gadget_udc(&pdev->dev, &usb3->gadget);
if (ret < 0)
-@@ -2650,14 +2658,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2653,14 +2661,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_dev_create;
diff --git a/patches/1267-usb-gadget-udc-renesas_usb3-should-fail-if-devm_phy_.patch b/patches/1267-usb-gadget-udc-renesas_usb3-should-fail-if-devm_phy_.patch
index 63db903..80129ac 100644
--- a/patches/1267-usb-gadget-udc-renesas_usb3-should-fail-if-devm_phy_.patch
+++ b/patches/1267-usb-gadget-udc-renesas_usb3-should-fail-if-devm_phy_.patch
@@ -23,10 +23,10 @@
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 9a6e3d99dffd..2bb2cca5ca82 100644
+index f12501c8099e..3ace001d8f0f 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2645,9 +2645,11 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2648,9 +2648,11 @@ static int renesas_usb3_probe(struct platform_device *pdev)
* This is optional. So, if this driver cannot get a phy,
* this driver will not handle a phy anymore.
*/
diff --git a/patches/1268-usb-gadget-udc-renesas_usb3-fix-double-phy_put.patch b/patches/1268-usb-gadget-udc-renesas_usb3-fix-double-phy_put.patch
index 067b49b..83a1e49 100644
--- a/patches/1268-usb-gadget-udc-renesas_usb3-fix-double-phy_put.patch
+++ b/patches/1268-usb-gadget-udc-renesas_usb3-fix-double-phy_put.patch
@@ -21,10 +21,10 @@
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 2bb2cca5ca82..5caf78bbbf7c 100644
+index 3ace001d8f0f..4df8bf7ccfe9 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2421,8 +2421,6 @@ static int renesas_usb3_remove(struct platform_device *pdev)
+@@ -2424,8 +2424,6 @@ static int renesas_usb3_remove(struct platform_device *pdev)
renesas_usb3_dma_free_prd(usb3, &pdev->dev);
__renesas_usb3_ep_free_request(usb3->ep0_req);
diff --git a/patches/1269-USB-gadget-udc-renesas_usb3-no-need-to-check-return-.patch b/patches/1269-USB-gadget-udc-renesas_usb3-no-need-to-check-return-.patch
index 22742cb..4a0032f 100644
--- a/patches/1269-USB-gadget-udc-renesas_usb3-no-need-to-check-return-.patch
+++ b/patches/1269-USB-gadget-udc-renesas_usb3-no-need-to-check-return-.patch
@@ -21,10 +21,10 @@
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 5caf78bbbf7c..977ea1a02cf9 100644
+index 4df8bf7ccfe9..c7335fe97022 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -2391,22 +2391,10 @@ static const struct file_operations renesas_usb3_b_device_fops = {
+@@ -2394,22 +2394,10 @@ static const struct file_operations renesas_usb3_b_device_fops = {
static void renesas_usb3_debugfs_init(struct renesas_usb3 *usb3,
struct device *dev)
{
diff --git a/patches/1274-spi-Expose-spi_-map-unmap-_buf-for-internal-use.patch b/patches/1274-spi-Expose-spi_-map-unmap-_buf-for-internal-use.patch
index 43e21ff..e68ab6f 100644
--- a/patches/1274-spi-Expose-spi_-map-unmap-_buf-for-internal-use.patch
+++ b/patches/1274-spi-Expose-spi_-map-unmap-_buf-for-internal-use.patch
@@ -70,7 +70,7 @@
+
+#endif /* __LINUX_SPI_INTERNALS_H */
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index f85d30dc9187..ab173b06d147 100644
+index 670dbb7a8500..5800b1bb6fd1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -46,6 +46,8 @@
diff --git a/patches/1275-spi-Add-an-helper-to-flush-the-message-queue.patch b/patches/1275-spi-Add-an-helper-to-flush-the-message-queue.patch
index 37e76d8..6fc92fc 100644
--- a/patches/1275-spi-Add-an-helper-to-flush-the-message-queue.patch
+++ b/patches/1275-spi-Add-an-helper-to-flush-the-message-queue.patch
@@ -32,7 +32,7 @@
int spi_map_buf(struct spi_controller *ctlr, struct device *dev,
struct sg_table *sgt, void *buf, size_t len,
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index ab173b06d147..0fb91af66efd 100644
+index 5800b1bb6fd1..633c96681bc1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1523,6 +1523,22 @@ static int spi_controller_initialize_queue(struct spi_controller *ctlr)
diff --git a/patches/1441-xhci-set-hcd-pointers-for-xhci-usb2-and-usb3-roothub.patch b/patches/1441-xhci-set-hcd-pointers-for-xhci-usb2-and-usb3-roothub.patch
index dae8edb..448a95d 100644
--- a/patches/1441-xhci-set-hcd-pointers-for-xhci-usb2-and-usb3-roothub.patch
+++ b/patches/1441-xhci-set-hcd-pointers-for-xhci-usb2-and-usb3-roothub.patch
@@ -17,10 +17,10 @@
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 5466d4db6ffe..7155659bb920 100644
+index ec926796930a..efa1cb2c5d9b 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -4898,6 +4898,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
+@@ -4928,6 +4928,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
if (usb_hcd_is_primary_hcd(hcd)) {
xhci->main_hcd = hcd;
@@ -28,7 +28,7 @@
/* Mark the first roothub as being USB 2.0.
* The xHCI driver will register the USB 3.0 roothub.
*/
-@@ -4923,6 +4924,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
+@@ -4953,6 +4954,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
minor_rev,
minor_rev ? "Enhanced" : "");
diff --git a/patches/1449-xhci-use-port-structures-instead-of-port-arrays-in-x.patch b/patches/1449-xhci-use-port-structures-instead-of-port-arrays-in-x.patch
index 02ceaa2..0758911 100644
--- a/patches/1449-xhci-use-port-structures-instead-of-port-arrays-in-x.patch
+++ b/patches/1449-xhci-use-port-structures-instead-of-port-arrays-in-x.patch
@@ -25,10 +25,10 @@
1 file changed, 22 insertions(+), 28 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 7155659bb920..57d6fe654712 100644
+index efa1cb2c5d9b..ae1c84e35db4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -400,13 +400,15 @@ static void compliance_mode_recovery(unsigned long arg)
+@@ -415,13 +415,15 @@ static void compliance_mode_recovery(unsigned long arg)
{
struct xhci_hcd *xhci;
struct usb_hcd *hcd;
@@ -46,7 +46,7 @@
if ((temp & PORT_PLS_MASK) == USB_SS_PORT_LS_COMP_MOD) {
/*
* Compliance Mode Detected. Letting USB Core
-@@ -426,7 +428,7 @@ static void compliance_mode_recovery(unsigned long arg)
+@@ -441,7 +443,7 @@ static void compliance_mode_recovery(unsigned long arg)
}
}
@@ -55,7 +55,7 @@
mod_timer(&xhci->comp_mode_recovery_timer,
jiffies + msecs_to_jiffies(COMP_MODE_RCVRY_MSECS));
}
-@@ -483,7 +485,7 @@ static bool xhci_compliance_mode_recovery_timer_quirk_check(void)
+@@ -498,7 +500,7 @@ static bool xhci_compliance_mode_recovery_timer_quirk_check(void)
static int xhci_all_ports_seen_u0(struct xhci_hcd *xhci)
{
@@ -64,7 +64,7 @@
}
-@@ -812,33 +814,33 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci)
+@@ -827,33 +829,33 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci)
static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
{
@@ -107,7 +107,7 @@
}
spin_unlock_irqrestore(&xhci->lock, flags);
-@@ -4016,18 +4018,10 @@ static int xhci_enable_device(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -4046,18 +4048,10 @@ static int xhci_enable_device(struct usb_hcd *hcd, struct usb_device *udev)
*/
int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1)
{
@@ -129,7 +129,7 @@
}
/*
-@@ -4160,7 +4154,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
+@@ -4190,7 +4184,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
struct usb_device *udev, int enable)
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
@@ -138,7 +138,7 @@
__le32 __iomem *pm_addr, *hlpm_addr;
u32 pm_val, hlpm_val, field;
unsigned int port_num;
-@@ -4181,11 +4175,11 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
+@@ -4211,11 +4205,11 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
spin_lock_irqsave(&xhci->lock, flags);
diff --git a/patches/1452-xhci-Allow-more-than-32-quirks.patch b/patches/1452-xhci-Allow-more-than-32-quirks.patch
index 0662dcc..c485f1e 100644
--- a/patches/1452-xhci-Allow-more-than-32-quirks.patch
+++ b/patches/1452-xhci-Allow-more-than-32-quirks.patch
@@ -26,7 +26,7 @@
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 57d6fe654712..eb16066906a6 100644
+index ae1c84e35db4..0a1431889878 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -33,8 +33,8 @@ static int link_quirk;
@@ -39,8 +39,8 @@
+module_param(quirks, ullong, S_IRUGO);
MODULE_PARM_DESC(quirks, "Bit flags for quirks to be enabled as default");
- /* TODO: copied from ehci-hcd.c - can this be refactored? */
-@@ -4999,7 +4999,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
+ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
+@@ -5029,7 +5029,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
return retval;
xhci_dbg(xhci, "Called HCD init\n");
diff --git a/patches/1453-xhci-Add-quirk-to-zero-64bit-registers-on-Renesas-PC.patch b/patches/1453-xhci-Add-quirk-to-zero-64bit-registers-on-Renesas-PC.patch
index 42b300d..4c367fc 100644
--- a/patches/1453-xhci-Add-quirk-to-zero-64bit-registers-on-Renesas-PC.patch
+++ b/patches/1453-xhci-Add-quirk-to-zero-64bit-registers-on-Renesas-PC.patch
@@ -59,10 +59,10 @@
xhci->quirks |= XHCI_RESET_ON_RESUME;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index eb16066906a6..0b41acd84137 100644
+index 0a1431889878..6d6e90f53746 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -209,6 +209,68 @@ int xhci_reset(struct xhci_hcd *xhci)
+@@ -224,6 +224,68 @@ int xhci_reset(struct xhci_hcd *xhci)
return ret;
}
@@ -131,7 +131,7 @@
#ifdef CONFIG_USB_PCI
/*
-@@ -1046,6 +1108,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+@@ -1061,6 +1123,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
xhci_dbg(xhci, "Stop HCD\n");
xhci_halt(xhci);
@@ -139,7 +139,7 @@
xhci_reset(xhci);
spin_unlock_irq(&xhci->lock);
xhci_cleanup_msix(xhci);
-@@ -4957,6 +5020,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
+@@ -4987,6 +5050,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
if (retval)
return retval;
diff --git a/patches/1454-xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch b/patches/1454-xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch
index 8ff55f9..8e8e893 100644
--- a/patches/1454-xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch
+++ b/patches/1454-xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch
@@ -46,10 +46,10 @@
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 0b41acd84137..f4e3db0826ef 100644
+index 6d6e90f53746..a13f9f581bc0 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -910,7 +910,7 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
+@@ -925,7 +925,7 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
static bool xhci_pending_portevent(struct xhci_hcd *xhci)
{
@@ -58,7 +58,7 @@
int port_index;
u32 status;
u32 portsc;
-@@ -924,18 +924,18 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)
+@@ -939,18 +939,18 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)
* being written to the Event Ring. See note in xhci 1.1 section 4.19.2.
*/
@@ -83,7 +83,7 @@
if (portsc & PORT_CHANGE_MASK ||
(portsc & PORT_PLS_MASK) == XDEV_RESUME)
return true;
-@@ -3724,7 +3724,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3754,7 +3754,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
virt_dev->eps[i].ep_state &= ~EP_STOP_CMD_PENDING;
del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);
}
diff --git a/patches/1591-usb-xhci-Fix-memory-leak-in-xhci_endpoint_reset.patch b/patches/1591-usb-xhci-Fix-memory-leak-in-xhci_endpoint_reset.patch
index 3b77218..d989cc8 100644
--- a/patches/1591-usb-xhci-Fix-memory-leak-in-xhci_endpoint_reset.patch
+++ b/patches/1591-usb-xhci-Fix-memory-leak-in-xhci_endpoint_reset.patch
@@ -18,10 +18,10 @@
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index f4e3db0826ef..21736f55e39c 100644
+index a13f9f581bc0..688a81c97a31 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -3051,6 +3051,7 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd,
+@@ -3081,6 +3081,7 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd,
if (!list_empty(&ep->ring->td_list)) {
dev_err(&udev->dev, "EP not empty, refuse reset\n");
spin_unlock_irqrestore(&xhci->lock, flags);
diff --git a/patches/1622-usb-gadget-udc-renesas_usb3-Add-register-of-usb-role.patch b/patches/1622-usb-gadget-udc-renesas_usb3-Add-register-of-usb-role.patch
index c33f3ac..deb65f9 100644
--- a/patches/1622-usb-gadget-udc-renesas_usb3-Add-register-of-usb-role.patch
+++ b/patches/1622-usb-gadget-udc-renesas_usb3-Add-register-of-usb-role.patch
@@ -51,7 +51,7 @@
Renesas USB3.0 Peripheral controller is a USB peripheral controller
that supports super, high, and full speed USB 3.0 data transfers.
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 977ea1a02cf9..a94fd09ee6f4 100644
+index c7335fe97022..9a7c3cdf915e 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -23,6 +23,8 @@
@@ -116,7 +116,7 @@
usb3_vbus_out(usb3, a_dev);
/* for A-Peripheral or forced B-device mode */
if ((!host && a_dev) ||
-@@ -2302,6 +2327,41 @@ static const struct usb_gadget_ops renesas_usb3_gadget_ops = {
+@@ -2305,6 +2330,41 @@ static const struct usb_gadget_ops renesas_usb3_gadget_ops = {
.set_selfpowered = renesas_usb3_set_selfpowered,
};
@@ -158,7 +158,7 @@
static ssize_t role_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
-@@ -2405,6 +2465,8 @@ static int renesas_usb3_remove(struct platform_device *pdev)
+@@ -2408,6 +2468,8 @@ static int renesas_usb3_remove(struct platform_device *pdev)
debugfs_remove_recursive(usb3->dentry);
device_remove_file(&pdev->dev, &dev_attr_role);
@@ -167,7 +167,7 @@
usb_del_gadget_udc(&usb3->gadget);
renesas_usb3_dma_free_prd(usb3, &pdev->dev);
-@@ -2561,6 +2623,12 @@ static const unsigned int renesas_usb3_cable[] = {
+@@ -2564,6 +2626,12 @@ static const unsigned int renesas_usb3_cable[] = {
EXTCON_NONE,
};
@@ -180,7 +180,7 @@
static int renesas_usb3_probe(struct platform_device *pdev)
{
struct renesas_usb3 *usb3;
-@@ -2646,6 +2714,20 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2649,6 +2717,20 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_dev_create;
diff --git a/patches/1750-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch b/patches/1750-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
index 215426b..7edf334 100644
--- a/patches/1750-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
+++ b/patches/1750-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
@@ -29,10 +29,10 @@
1 file changed, 17 insertions(+), 47 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index fd7809004297..c3b6b47fd44a 100644
+index a1d5e0949dcf..ade8493cb69f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
-@@ -2545,61 +2545,29 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2547,61 +2547,29 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
* The lock and unlock are done within a preempt disable section.
* The current_context per_cpu variable can only be modified
* by the current task between lock and unlock. But it can
@@ -108,7 +108,7 @@
return 0;
}
-@@ -2607,7 +2575,9 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2609,7 +2577,9 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
static __always_inline void
trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
{
diff --git a/patches/1751-ring-buffer-Bring-back-context-level-recursive-check.patch b/patches/1751-ring-buffer-Bring-back-context-level-recursive-check.patch
index 8d96005..f6006d3 100644
--- a/patches/1751-ring-buffer-Bring-back-context-level-recursive-check.patch
+++ b/patches/1751-ring-buffer-Bring-back-context-level-recursive-check.patch
@@ -41,10 +41,10 @@
1 file changed, 45 insertions(+), 17 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index c3b6b47fd44a..5c4dc1c18519 100644
+index ade8493cb69f..f04c5b9f1ae9 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
-@@ -2545,29 +2545,59 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2547,29 +2547,59 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
* The lock and unlock are done within a preempt disable section.
* The current_context per_cpu variable can only be modified
* by the current task between lock and unlock. But it can
@@ -118,7 +118,7 @@
return 0;
}
-@@ -2575,9 +2605,7 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2577,9 +2607,7 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
static __always_inline void
trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
{
diff --git a/patches/1752-ring-buffer-Fix-duplicate-results-in-mapping-context.patch b/patches/1752-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
index 10ee97b..200e0fd 100644
--- a/patches/1752-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
+++ b/patches/1752-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
@@ -25,10 +25,10 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index 5c4dc1c18519..e3769d3c9bca 100644
+index f04c5b9f1ae9..052b44d616cb 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
-@@ -2590,8 +2590,7 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2592,8 +2592,7 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
bit = RB_CTX_NORMAL;
else
bit = pc & NMI_MASK ? RB_CTX_NMI :
diff --git a/patches/1753-ring-buffer-Add-interface-for-setting-absolute-time-.patch b/patches/1753-ring-buffer-Add-interface-for-setting-absolute-time-.patch
index 74da00a..af3dfd9 100644
--- a/patches/1753-ring-buffer-Add-interface-for-setting-absolute-time-.patch
+++ b/patches/1753-ring-buffer-Add-interface-for-setting-absolute-time-.patch
@@ -40,7 +40,7 @@
size_t ring_buffer_page_len(void *page);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index e3769d3c9bca..eed0e343b008 100644
+index 052b44d616cb..34179e57c355 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -488,6 +488,7 @@ struct ring_buffer {
diff --git a/patches/1754-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch b/patches/1754-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
index 8f5b1d0..03efa3d 100644
--- a/patches/1754-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
+++ b/patches/1754-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
@@ -69,7 +69,7 @@
/*
* ring_buffer_discard_commit will remove an event that has not
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index eed0e343b008..45fc91559aa6 100644
+index 34179e57c355..be296c38893f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -41,6 +41,8 @@ int ring_buffer_print_entry_header(struct trace_seq *s)
@@ -153,7 +153,7 @@
/* Flag when events were overwritten */
#define RB_MISSED_EVENTS (1 << 31)
/* Missed count stored at end */
-@@ -2228,12 +2254,15 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2230,12 +2256,15 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
/* Slow path, do not inline */
static noinline struct ring_buffer_event *
@@ -173,7 +173,7 @@
event->time_delta = delta & TS_MASK;
event->array[0] = delta >> TS_SHIFT;
} else {
-@@ -2276,7 +2305,9 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2278,7 +2307,9 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
* add it to the start of the resevered space.
*/
if (unlikely(info->add_timestamp)) {
@@ -184,7 +184,7 @@
length -= RB_LEN_TIME_EXTEND;
delta = 0;
}
-@@ -2464,7 +2495,7 @@ static __always_inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer
+@@ -2466,7 +2497,7 @@ static __always_inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer
static inline void rb_event_discard(struct ring_buffer_event *event)
{
@@ -193,7 +193,7 @@
event = skip_time_extend(event);
/* array[0] holds the actual length for the discarded event */
-@@ -2508,10 +2539,11 @@ rb_update_write_stamp(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2510,10 +2541,11 @@ rb_update_write_stamp(struct ring_buffer_per_cpu *cpu_buffer,
cpu_buffer->write_stamp =
cpu_buffer->commit_page->page->time_stamp;
else if (event->type_len == RINGBUF_TYPE_TIME_EXTEND) {
@@ -208,7 +208,7 @@
} else
cpu_buffer->write_stamp += event->time_delta;
}
-@@ -2691,7 +2723,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2693,7 +2725,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
* If this is the first commit on the page, then it has the same
* timestamp as the page itself.
*/
@@ -217,7 +217,7 @@
info->delta = 0;
/* See if we shot pass the end of this buffer page */
-@@ -2768,8 +2800,11 @@ rb_reserve_next_event(struct ring_buffer *buffer,
+@@ -2770,8 +2802,11 @@ rb_reserve_next_event(struct ring_buffer *buffer,
/* make sure this diff is calculated here */
barrier();
@@ -231,7 +231,7 @@
info.delta = diff;
if (unlikely(test_time_stamp(info.delta)))
rb_handle_timestamp(cpu_buffer, &info);
-@@ -3467,14 +3502,13 @@ rb_update_read_stamp(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -3469,14 +3504,13 @@ rb_update_read_stamp(struct ring_buffer_per_cpu *cpu_buffer,
return;
case RINGBUF_TYPE_TIME_EXTEND:
@@ -249,7 +249,7 @@
return;
case RINGBUF_TYPE_DATA:
-@@ -3498,14 +3532,13 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter,
+@@ -3500,14 +3534,13 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter,
return;
case RINGBUF_TYPE_TIME_EXTEND:
@@ -267,7 +267,7 @@
return;
case RINGBUF_TYPE_DATA:
-@@ -3729,6 +3762,8 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
+@@ -3731,6 +3764,8 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
struct buffer_page *reader;
int nr_loops = 0;
@@ -276,7 +276,7 @@
again:
/*
* We repeat when a time extend is encountered.
-@@ -3765,12 +3800,17 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
+@@ -3767,12 +3802,17 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
goto again;
case RINGBUF_TYPE_TIME_STAMP:
@@ -296,7 +296,7 @@
*ts = cpu_buffer->read_stamp + event->time_delta;
ring_buffer_normalize_time_stamp(cpu_buffer->buffer,
cpu_buffer->cpu, ts);
-@@ -3795,6 +3835,9 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
+@@ -3797,6 +3837,9 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
struct ring_buffer_event *event;
int nr_loops = 0;
@@ -306,7 +306,7 @@
cpu_buffer = iter->cpu_buffer;
buffer = cpu_buffer->buffer;
-@@ -3847,12 +3890,17 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
+@@ -3849,12 +3892,17 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
goto again;
case RINGBUF_TYPE_TIME_STAMP:
diff --git a/patches/1782-ring-buffer-Add-nesting-for-adding-events-within-eve.patch b/patches/1782-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
index a784d06..1ade99f 100644
--- a/patches/1782-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
+++ b/patches/1782-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
@@ -40,7 +40,7 @@
ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,
unsigned long *lost_events);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index 45fc91559aa6..75fea9321ffb 100644
+index be296c38893f..e8ca1e01facd 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -477,6 +477,7 @@ struct ring_buffer_per_cpu {
@@ -51,7 +51,7 @@
local_t entries_bytes;
local_t entries;
local_t overrun;
-@@ -2635,10 +2636,10 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2637,10 +2638,10 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
bit = pc & NMI_MASK ? RB_CTX_NMI :
pc & HARDIRQ_MASK ? RB_CTX_IRQ : RB_CTX_SOFTIRQ;
@@ -64,7 +64,7 @@
cpu_buffer->current_context = val;
return 0;
-@@ -2647,7 +2648,57 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2649,7 +2650,57 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
static __always_inline void
trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
{
