meson64-6.13: rebase against 6.13-rc7
This commit is contained in:
parent
51f111f171
commit
c814ed2256
@ -19,7 +19,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -5965,7 +5965,7 @@ static const struct usb_device_id hub_id_table[] = {
|
||||
@@ -5967,7 +5967,7 @@ static const struct usb_device_id hub_id_table[] = {
|
||||
| USB_DEVICE_ID_MATCH_INT_CLASS,
|
||||
.idVendor = USB_VENDOR_GENESYS_LOGIC,
|
||||
.bInterfaceClass = USB_CLASS_HUB,
|
||||
|
||||
@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
|
||||
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
|
||||
@@ -1437,6 +1437,8 @@ patternProperties:
|
||||
@@ -1453,6 +1453,8 @@ patternProperties:
|
||||
description: Sundance DSP Inc.
|
||||
"^sunplus,.*":
|
||||
description: Sunplus Technology Co., Ltd.
|
||||
|
||||
@ -24,7 +24,7 @@ diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
|
||||
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
|
||||
@@ -204,7 +204,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
|
||||
@@ -205,7 +205,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
|
||||
|
||||
panfrost_devfreq_record_busy(&pfdev->pfdevfreq);
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/kernel/cpuinfo.c
|
||||
+++ b/arch/arm64/kernel/cpuinfo.c
|
||||
@@ -206,8 +206,7 @@ static int c_show(struct seq_file *m, void *v)
|
||||
@@ -207,8 +207,7 @@ static int c_show(struct seq_file *m, void *v)
|
||||
* "processor". Give glibc what it expects.
|
||||
*/
|
||||
seq_printf(m, "processor\t: %d\n", i);
|
||||
|
||||
@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -1475,4 +1475,10 @@
|
||||
@@ -1479,4 +1479,10 @@
|
||||
#define USB_VENDOR_ID_SIGNOTEC 0x2133
|
||||
#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018
|
||||
|
||||
@ -45,7 +45,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/input/touchscreen/Kconfig
|
||||
+++ b/drivers/input/touchscreen/Kconfig
|
||||
@@ -1388,4 +1388,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
|
||||
@@ -1390,4 +1390,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called himax_hx83112b.
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/of/of_reserved_mem.c
|
||||
+++ b/drivers/of/of_reserved_mem.c
|
||||
@@ -82,15 +82,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
|
||||
@@ -131,15 +131,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
|
||||
phys_addr_t size, bool nomap)
|
||||
{
|
||||
if (nomap) {
|
||||
|
||||
@ -19,7 +19,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/aml
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
|
||||
@@ -420,6 +420,7 @@ hwrng: rng@5118 {
|
||||
@@ -625,6 +625,7 @@ hwrng: rng@5118 {
|
||||
sec_AO: ao-secure@5a20 {
|
||||
compatible = "amlogic,meson-gx-ao-secure", "syscon";
|
||||
reg = <0x0 0x5a20 0x0 0x140>;
|
||||
|
||||
@ -46,7 +46,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mtd/spi-nor/core.c
|
||||
+++ b/drivers/mtd/spi-nor/core.c
|
||||
@@ -1977,6 +1977,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
|
||||
@@ -1980,6 +1980,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
|
||||
&spi_nor_sst,
|
||||
&spi_nor_winbond,
|
||||
&spi_nor_xmc,
|
||||
@ -58,7 +58,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mtd/spi-nor/core.h
|
||||
+++ b/drivers/mtd/spi-nor/core.h
|
||||
@@ -593,6 +593,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
|
||||
@@ -594,6 +594,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
|
||||
extern const struct spi_nor_manufacturer spi_nor_sst;
|
||||
extern const struct spi_nor_manufacturer spi_nor_winbond;
|
||||
extern const struct spi_nor_manufacturer spi_nor_xmc;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user