Skip to content

Commit

Permalink
linux-iot2050: Update to v5.10.184-cip36[-rt14]
Browse files Browse the repository at this point in the history
2 upstreamed patches less.

Signed-off-by: Jan Kiszka <[email protected]>
  • Loading branch information
jan-kiszka authored and BaochengSu committed Jun 25, 2023
1 parent 5a33de8 commit 14d3c6b
Show file tree
Hide file tree
Showing 103 changed files with 132 additions and 238 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Link: https://lore.kernel.org/r/[email protected]
2 files changed, 2 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index d04189771c77..344c81ff31e9 100644
index 4265f627ca16..8b797a0a05cd 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -615,7 +615,6 @@ ringacc: ringacc@3c000000 {
@@ -614,7 +614,6 @@ ringacc: ringacc@3c000000 {
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";
ti,num-rings = <818>;
ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ Link: https://lore.kernel.org/r/[email protected]
2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 344c81ff31e9..ee7b7c356f01 100644
index 8b797a0a05cd..8d081ee03320 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -772,8 +772,6 @@ mcasp0: mcasp@2b00000 {
@@ -771,8 +771,6 @@ mcasp0: mcasp@2b00000 {
clocks = <&k3_clks 104 0>;
clock-names = "fck";
power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
Expand All @@ -69,7 +69,7 @@ index 344c81ff31e9..ee7b7c356f01 100644
};

mcasp1: mcasp@2b10000 {
@@ -791,8 +789,6 @@ mcasp1: mcasp@2b10000 {
@@ -790,8 +788,6 @@ mcasp1: mcasp@2b10000 {
clocks = <&k3_clks 105 0>;
clock-names = "fck";
power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
Expand All @@ -78,7 +78,7 @@ index 344c81ff31e9..ee7b7c356f01 100644
};

mcasp2: mcasp@2b20000 {
@@ -810,8 +806,6 @@ mcasp2: mcasp@2b20000 {
@@ -809,8 +805,6 @@ mcasp2: mcasp@2b20000 {
clocks = <&k3_clks 106 0>;
clock-names = "fck";
power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
Expand All @@ -87,7 +87,7 @@ index 344c81ff31e9..ee7b7c356f01 100644
};

cal: cal@6f03000 {
@@ -867,8 +861,6 @@ dss: dss@4a00000 {
@@ -866,8 +860,6 @@ dss: dss@4a00000 {

interrupts = <GIC_SPI 166 IRQ_TYPE_EDGE_RISING>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Link: https://lore.kernel.org/r/[email protected]
2 files changed, 3 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index ee7b7c356f01..ba1529436128 100644
index 8d081ee03320..4ad46fddc12c 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -122,7 +122,6 @@ crypto: crypto@4e00000 {
Expand All @@ -31,7 +31,7 @@ index ee7b7c356f01..ba1529436128 100644
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
<&main_udmap 0x4001>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 0350ddfe2c72..b8ca6e03de36 100644
index 691d73f0f1e0..afb8fd7df629 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -362,8 +362,6 @@ main_crypto: crypto@4e00000 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Link: https://lore.kernel.org/r/[email protected]
3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index ba1529436128..cf7656cf650e 100644
index 4ad46fddc12c..5be027228e88 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -259,7 +259,7 @@ main_spi4: spi@2140000 {
@@ -258,7 +258,7 @@ main_spi4: spi@2140000 {
#size-cells = <0>;
};

Expand All @@ -38,7 +38,7 @@ index ba1529436128..cf7656cf650e 100644
compatible = "ti,am654-sdhci-5.1";
reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>;
power-domains = <&k3_pds 47 TI_SCI_PD_EXCLUSIVE>;
@@ -283,7 +283,7 @@ sdhci0: sdhci@4f80000 {
@@ -282,7 +282,7 @@ sdhci0: sdhci@4f80000 {
dma-coherent;
};

Expand Down Expand Up @@ -74,10 +74,10 @@ index bef47f96376d..cb22e65d61ab 100644
ti,otap-del-sel-sd-hs = <0x0>;
ti,otap-del-sel-sdr12 = <0xf>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index b8ca6e03de36..81fddd145b86 100644
index afb8fd7df629..7c0a8f1fca85 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1072,13 +1072,13 @@ main_gpio7: gpio@631000 {
@@ -1071,13 +1071,13 @@ main_gpio7: gpio@631000 {
clock-names = "gpio";
};

Expand All @@ -94,7 +94,7 @@ index b8ca6e03de36..81fddd145b86 100644
assigned-clocks = <&k3_clks 91 1>;
assigned-clock-parents = <&k3_clks 91 2>;
bus-width = <8>;
@@ -1090,13 +1090,13 @@ main_sdhci0: sdhci@4f80000 {
@@ -1089,13 +1089,13 @@ main_sdhci0: sdhci@4f80000 {
dma-coherent;
};

Expand All @@ -111,7 +111,7 @@ index b8ca6e03de36..81fddd145b86 100644
assigned-clocks = <&k3_clks 92 0>;
assigned-clock-parents = <&k3_clks 92 1>;
ti,otap-del-sel = <0x2>;
@@ -1106,13 +1106,13 @@ main_sdhci1: sdhci@4fb0000 {
@@ -1105,13 +1105,13 @@ main_sdhci1: sdhci@4fb0000 {
no-1-8-v;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ Link: https://lore.kernel.org/r/881dfd6c75423efce1d10261909939cd5ef19937.1613071
1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index cf7656cf650e..3c36ae6d7816 100644
index 5be027228e88..57d1088f8f61 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -709,6 +709,7 @@ pcie0_rc: pcie@5500000 {
@@ -708,6 +708,7 @@ pcie0_rc: pcie@5500000 {
dma-coherent;
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x0 0x10000>;
+ device_type = "pci";
};

pcie0_ep: pcie-ep@5500000 {
@@ -741,6 +742,7 @@ pcie1_rc: pcie@5600000 {
@@ -740,6 +741,7 @@ pcie1_rc: pcie@5600000 {
dma-coherent;
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x10000 0x10000>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ Link: https://lore.kernel.org/r/[email protected]
1 file changed, 393 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 3c36ae6d7816..6d2662588565 100644
index 57d1088f8f61..8bf4fefd83fd 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -923,4 +923,397 @@ ehrpwm5: pwm@3050000 {
@@ -922,4 +922,397 @@ ehrpwm5: pwm@3050000 {
clocks = <&ehrpwm_tbclk 5>, <&k3_clks 45 0>;
clock-names = "tbclk", "fck";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Signed-off-by: Jan Kiszka <[email protected]>
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 6d2662588565..92f55840a08d 100644
index 8bf4fefd83fd..dcd1d8fe6c9f 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -447,11 +447,11 @@ intr_main_gpio: interrupt-controller0 {
@@ -446,11 +446,11 @@ intr_main_gpio: interrupt-controller0 {
ti,interrupt-ranges = <0 392 32>;
};

Expand Down Expand Up @@ -66,7 +66,7 @@ index 0388c02c2203..f5b8ef2f5f77 100644
dma-ranges;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 81fddd145b86..b85889ae50e1 100644
index 7c0a8f1fca85..4c3ee45bdcf9 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -136,11 +136,11 @@ main_gpio_intr: interrupt-controller0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ Signed-off-by: Jan Kiszka <[email protected]>
6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 92f55840a08d..75afafdcee6f 100644
index dcd1d8fe6c9f..2814acfc07b5 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -436,8 +436,9 @@ usb1_phy: phy@4110000 {
@@ -435,8 +435,9 @@ usb1_phy: phy@4110000 {
#phy-cells = <0>;
};

Expand All @@ -53,7 +53,7 @@ index 92f55840a08d..75afafdcee6f 100644
ti,intr-trigger-type = <1>;
interrupt-controller;
interrupt-parent = <&gic500>;
@@ -457,8 +458,9 @@ main_navss: bus@30800000 {
@@ -456,8 +457,9 @@ main_navss: bus@30800000 {

ti,sci-dev-id = <118>;

Expand Down Expand Up @@ -106,10 +106,10 @@ index cb22e65d61ab..a0365890571e 100644
interrupt-controller;
interrupt-parent = <&gic500>;
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
index eb2a78a53512..c4e63272fbdb 100644
index 7f252cc6eb37..7988b9660f65 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
@@ -96,8 +96,9 @@ mcu_uart0: serial@40a00000 {
@@ -123,8 +123,9 @@ mcu_uart0: serial@40a00000 {
clock-names = "fclk";
};

Expand All @@ -121,7 +121,7 @@ index eb2a78a53512..c4e63272fbdb 100644
interrupt-controller;
interrupt-parent = <&gic500>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index b85889ae50e1..6b377d93b121 100644
index 4c3ee45bdcf9..b14fe61782d3 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -125,8 +125,9 @@ gic_its: msi-controller@1820000 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Signed-off-by: Ulf Hansson <[email protected]>
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 24cd6d3dc647..4964509f2f3e 100644
index 8e52905458f9..c72e10f36c1c 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -803,11 +803,9 @@ static int sdhci_am654_probe(struct platform_device *pdev)
@@ -801,11 +801,9 @@ static int sdhci_am654_probe(struct platform_device *pdev)

/* Clocks are enabled using pm_runtime */
pm_runtime_enable(dev);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ index f4ec9ed52939..d90abda1de84 100644

&usb0 {
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 75afafdcee6f..c288d03da908 100644
index 2814acfc07b5..11982ae5593c 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -304,7 +304,6 @@ sdhci1: mmc@4fa0000 {
@@ -303,7 +303,6 @@ sdhci1: mmc@4fa0000 {
ti,otap-del-sel = <0x2>;
ti,trm-icp = <0x8>;
dma-coherent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ index d90abda1de84..8c6b538c53f3 100644
+ status = "disabled";
+};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index c288d03da908..a506a24bd9c2 100644
index 11982ae5593c..fb94d61eae0e 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -1054,6 +1054,16 @@ tx_pru0_1: txpru@c000 {
@@ -1053,6 +1053,16 @@ tx_pru0_1: txpru@c000 {
reg-names = "iram", "control", "debug";
firmware-name = "am65x-txpru0_1-fw";
};
Expand All @@ -71,7 +71,7 @@ index c288d03da908..a506a24bd9c2 100644
};

icssg1: icssg@b100000 {
@@ -1185,6 +1195,16 @@ tx_pru1_1: txpru@c000 {
@@ -1184,6 +1194,16 @@ tx_pru1_1: txpru@c000 {
reg-names = "iram", "control", "debug";
firmware-name = "am65x-txpru1_1-fw";
};
Expand All @@ -88,7 +88,7 @@ index c288d03da908..a506a24bd9c2 100644
};

icssg2: icssg@b200000 {
@@ -1316,5 +1336,15 @@ tx_pru2_1: txpru@c000 {
@@ -1315,5 +1335,15 @@ tx_pru2_1: txpru@c000 {
reg-names = "iram", "control", "debug";
firmware-name = "am65x-txpru2_1-fw";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Signed-off-by: Bjorn Andersson <[email protected]>
3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 369a97f3eca9..5250a081ea93 100644
index cc55ff0128cf..742da1079010 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1936,6 +1936,69 @@ struct rproc *rproc_get_by_phandle(phandle phandle)
@@ -1943,6 +1943,69 @@ struct rproc *rproc_get_by_phandle(phandle phandle)
#endif
EXPORT_SYMBOL(rproc_get_by_phandle);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Tested-by: Praneeth Bajjuri <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index a506a24bd9c2..dd1e475f2c18 100644
index fb94d61eae0e..9f8031fe6d08 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -861,7 +861,7 @@ dss: dss@4a00000 {
@@ -860,7 +860,7 @@ dss: dss@4a00000 {
assigned-clocks = <&k3_clks 67 2>;
assigned-clock-parents = <&k3_clks 67 5>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Vignesh Raghavendra <[email protected]>
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index ea5a337e0f8b..e653708f59ba 100644
index 9b9743f7538c..a1a143007fa9 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -387,6 +387,8 @@ extern void irq_domain_disassociate(struct irq_domain *domain,
Expand All @@ -31,10 +31,10 @@ index ea5a337e0f8b..e653708f59ba 100644
extern void irq_dispose_mapping(unsigned int virq);

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index c6b419db68ef..a17e4ce3811d 100644
index fd3f7c16c299..5d4aeb6c8678 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -734,9 +734,8 @@ static int irq_domain_translate(struct irq_domain *d,
@@ -784,9 +784,8 @@ static int irq_domain_translate(struct irq_domain *d,
return 0;
}

Expand All @@ -46,7 +46,7 @@ index c6b419db68ef..a17e4ce3811d 100644
{
int i;

@@ -746,6 +745,7 @@ static void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,
@@ -796,6 +795,7 @@ static void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,
for (i = 0; i < count; i++)
fwspec->param[i] = args[i];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Signed-off-by: Jan Kiszka <[email protected]>
1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index dd1e475f2c18..2911b4286c97 100644
index 9f8031fe6d08..49f731818961 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -700,8 +700,8 @@ pcie0_rc: pcie@5500000 {
@@ -699,8 +699,8 @@ pcie0_rc: pcie@5500000 {
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <3>;
#size-cells = <2>;
Expand All @@ -30,7 +30,7 @@ index dd1e475f2c18..2911b4286c97 100644
ti,syscon-pcie-id = <&pcie_devid>;
ti,syscon-pcie-mode = <&pcie0_mode>;
bus-range = <0x0 0xff>;
@@ -711,6 +711,19 @@ pcie0_rc: pcie@5500000 {
@@ -710,6 +710,19 @@ pcie0_rc: pcie@5500000 {
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x0 0x10000>;
device_type = "pci";
Expand All @@ -50,7 +50,7 @@ index dd1e475f2c18..2911b4286c97 100644
};

pcie0_ep: pcie-ep@5500000 {
@@ -733,8 +746,8 @@ pcie1_rc: pcie@5600000 {
@@ -732,8 +745,8 @@ pcie1_rc: pcie@5600000 {
power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <3>;
#size-cells = <2>;
Expand All @@ -61,7 +61,7 @@ index dd1e475f2c18..2911b4286c97 100644
ti,syscon-pcie-id = <&pcie_devid>;
ti,syscon-pcie-mode = <&pcie1_mode>;
bus-range = <0x0 0xff>;
@@ -744,6 +757,19 @@ pcie1_rc: pcie@5600000 {
@@ -743,6 +756,19 @@ pcie1_rc: pcie@5600000 {
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x10000 0x10000>;
device_type = "pci";
Expand Down
Loading

0 comments on commit 14d3c6b

Please sign in to comment.