mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 19:46:51 +00:00
kernel: bump 5.4 to 5.4.154
Removed upstreamed: generic/backport-5.4/070-v5.5-MIPS-BPF-Restore-MIPS32-cBPF-JIT.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
43a5bebda1
commit
b4ed8a9275
@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
|
||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||
endif
|
||||
|
||||
LINUX_VERSION-5.4 = .150
|
||||
LINUX_VERSION-5.4 = .154
|
||||
|
||||
LINUX_KERNEL_HASH-5.4.150 = f424a9bbb05007f04c17f96a2e4f041a8001554a9060d2c291606e8a97c62aa2
|
||||
LINUX_KERNEL_HASH-5.4.154 = 058994f4666b6b0474a4d5228583e394594e406783b7e93d487c2a66c35f3c06
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
device, it has to decide which ones to send first, which ones to
|
||||
--- a/net/sched/sch_api.c
|
||||
+++ b/net/sched/sch_api.c
|
||||
@@ -2272,7 +2272,7 @@ static int __init pktsched_init(void)
|
||||
@@ -2278,7 +2278,7 @@ static int __init pktsched_init(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
|
||||
{
|
||||
struct dst_entry *dst = __sk_dst_get(sk);
|
||||
@@ -1742,9 +1755,11 @@ static void __sk_free(struct sock *sk)
|
||||
@@ -1760,9 +1773,11 @@ static void __sk_free(struct sock *sk)
|
||||
if (likely(sk->sk_net_refcnt))
|
||||
sock_inuse_add(sock_net(sk), -1);
|
||||
|
||||
|
@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/core/sock.c
|
||||
+++ b/net/core/sock.c
|
||||
@@ -3623,6 +3623,8 @@ static __net_initdata struct pernet_oper
|
||||
@@ -3643,6 +3643,8 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
static int __init proto_init(void)
|
||||
{
|
||||
|
@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
cfg->fc_flags |= RTF_REJECT;
|
||||
|
||||
if (rtm->rtm_type == RTN_LOCAL)
|
||||
@@ -6028,6 +6059,8 @@ static int ip6_route_dev_notify(struct n
|
||||
@@ -6029,6 +6060,8 @@ static int ip6_route_dev_notify(struct n
|
||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
||||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
||||
@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
||||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
||||
#endif
|
||||
@@ -6039,6 +6072,7 @@ static int ip6_route_dev_notify(struct n
|
||||
@@ -6040,6 +6073,7 @@ static int ip6_route_dev_notify(struct n
|
||||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
||||
@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
||||
#endif
|
||||
}
|
||||
@@ -6231,6 +6265,8 @@ static int __net_init ip6_route_net_init
|
||||
@@ -6232,6 +6266,8 @@ static int __net_init ip6_route_net_init
|
||||
|
||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||
net->ipv6.fib6_has_custom_rules = false;
|
||||
@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
||||
sizeof(*net->ipv6.ip6_prohibit_entry),
|
||||
GFP_KERNEL);
|
||||
@@ -6241,11 +6277,21 @@ static int __net_init ip6_route_net_init
|
||||
@@ -6242,11 +6278,21 @@ static int __net_init ip6_route_net_init
|
||||
ip6_template_metrics, true);
|
||||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
||||
|
||||
@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
||||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
||||
ip6_template_metrics, true);
|
||||
@@ -6269,6 +6315,8 @@ out:
|
||||
@@ -6270,6 +6316,8 @@ out:
|
||||
return ret;
|
||||
|
||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
out_ip6_prohibit_entry:
|
||||
kfree(net->ipv6.ip6_prohibit_entry);
|
||||
out_ip6_null_entry:
|
||||
@@ -6288,6 +6336,7 @@ static void __net_exit ip6_route_net_exi
|
||||
@@ -6289,6 +6337,7 @@ static void __net_exit ip6_route_net_exi
|
||||
kfree(net->ipv6.ip6_null_entry);
|
||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||
kfree(net->ipv6.ip6_prohibit_entry);
|
||||
@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
kfree(net->ipv6.ip6_blk_hole_entry);
|
||||
#endif
|
||||
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
||||
@@ -6365,6 +6414,9 @@ void __init ip6_route_init_special_entri
|
||||
@@ -6366,6 +6415,9 @@ void __init ip6_route_init_special_entri
|
||||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
||||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||
|
@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @tf: Target ATA taskfile
|
||||
@@ -5121,6 +5134,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
@@ -5149,6 +5162,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
if (tag < 0)
|
||||
return NULL;
|
||||
}
|
||||
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
qc = __ata_qc_from_tag(ap, tag);
|
||||
qc->tag = qc->hw_tag = tag;
|
||||
@@ -6057,6 +6073,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -6085,6 +6101,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
return ap;
|
||||
@@ -6092,6 +6111,12 @@ static void ata_host_release(struct kref
|
||||
@@ -6120,6 +6139,12 @@ static void ata_host_release(struct kref
|
||||
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
host->ports[i] = NULL;
|
||||
}
|
||||
@@ -6555,7 +6580,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -6583,7 +6608,23 @@ int ata_host_register(struct ata_host *h
|
||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||
host->ports[i]->local_port_no = i + 1;
|
||||
}
|
||||
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
/*
|
||||
* Define if arch has non-standard setup. This is a _PCI_ standard
|
||||
@@ -881,6 +884,12 @@ struct ata_port {
|
||||
@@ -882,6 +885,12 @@ struct ata_port {
|
||||
#ifdef CONFIG_ATA_ACPI
|
||||
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
||||
#endif
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -631,6 +631,56 @@
|
||||
@@ -649,6 +649,56 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -85,10 +85,14 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
||||
*
|
||||
* Harninder Rai <harninder.rai@nxp.com>
|
||||
*
|
||||
@@ -287,6 +287,26 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -301,6 +301,26 @@
|
||||
reg = <0x0 0x2190000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&sysclk>, <&clockgen 4 1>;
|
||||
+ clock-names = "ipg", "per";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ can0: can@2180000 {
|
||||
+ compatible = "fsl,ls1028ar1-flexcan",
|
||||
+ "fsl,lx2160ar1-flexcan";
|
||||
@ -105,10 +109,6 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
||||
+ reg = <0x0 0x2190000 0x0 0x10000>;
|
||||
+ interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&sysclk>, <&clockgen 4 1>;
|
||||
+ clock-names = "ipg", "per";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
duart0: serial@21c0500 {
|
||||
compatible = "fsl,ns16550", "ns16550a";
|
||||
reg = <0x00 0x21c0500 0x0 0x100>;
|
||||
clock-names = "ipg", "per";
|
||||
status = "disabled";
|
||||
};
|
||||
|
@ -12,8 +12,8 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -538,6 +538,16 @@
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
@@ -556,6 +556,16 @@
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
+ gpu@f0c0000 {
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Sahil Malhotra <sahil.malhotra@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -771,6 +771,13 @@
|
||||
@@ -789,6 +789,13 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -769,6 +773,19 @@
|
||||
@@ -787,6 +791,19 @@
|
||||
little-endian;
|
||||
};
|
||||
};
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -750,7 +750,9 @@
|
||||
@@ -768,7 +768,9 @@
|
||||
/* PF1: VF0-1 BAR0 - non-prefetchable memory */
|
||||
0x82000000 0x0 0x00000000 0x1 0xf8210000 0x0 0x020000
|
||||
/* PF1: VF0-1 BAR2 - prefetchable memory */
|
||||
@ -33,7 +33,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
||||
|
||||
enetc_port0: ethernet@0,0 {
|
||||
compatible = "fsl,enetc";
|
||||
@@ -766,12 +768,66 @@
|
||||
@@ -784,12 +786,66 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -732,7 +732,6 @@
|
||||
@@ -750,7 +750,6 @@
|
||||
reg = <0x01 0xf0000000 0x0 0x100000>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -23,7 +23,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
msi-parent = <&its>;
|
||||
device_type = "pci";
|
||||
bus-range = <0x0 0x0>;
|
||||
@@ -785,6 +784,8 @@
|
||||
@@ -803,6 +802,8 @@
|
||||
switch@0,5 {
|
||||
compatible = "mscc,felix-switch";
|
||||
reg = <0x000500 0 0 0 0>;
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -814,6 +814,7 @@
|
||||
@@ -832,6 +832,7 @@
|
||||
};
|
||||
port@5 {
|
||||
reg = <5>;
|
||||
@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
@@ -821,7 +822,7 @@
|
||||
@@ -839,7 +840,7 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -836,6 +836,7 @@
|
||||
@@ -854,6 +854,7 @@
|
||||
compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";
|
||||
reg = <0x0 0x1e34040 0x0 0x1c>;
|
||||
#fsl,rcpm-wakeup-cells = <7>;
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -695,10 +695,10 @@
|
||||
@@ -713,10 +713,10 @@
|
||||
msi-parent = <&its>;
|
||||
#interrupt-cells = <1>;
|
||||
interrupt-map-mask = <0 0 0 7>;
|
||||
@ -28,7 +28,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -720,10 +720,10 @@
|
||||
@@ -738,10 +738,10 @@
|
||||
msi-parent = <&its>;
|
||||
#interrupt-cells = <1>;
|
||||
interrupt-map-mask = <0 0 0 7>;
|
||||
|
@ -16,7 +16,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -689,6 +689,7 @@
|
||||
@@ -707,6 +707,7 @@
|
||||
#size-cells = <2>;
|
||||
device_type = "pci";
|
||||
dma-coherent;
|
||||
@ -24,7 +24,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
||||
bus-range = <0x0 0xff>;
|
||||
ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000 /* downstream I/O */
|
||||
0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
|
||||
@@ -714,6 +715,7 @@
|
||||
@@ -732,6 +733,7 @@
|
||||
#size-cells = <2>;
|
||||
device_type = "pci";
|
||||
dma-coherent;
|
||||
|
@ -43,7 +43,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
reboot {
|
||||
compatible ="syscon-reboot";
|
||||
regmap = <&rst>;
|
||||
@@ -862,7 +848,8 @@
|
||||
@@ -880,7 +866,8 @@
|
||||
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<0 223 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "DE", "SE";
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
clocks = <&osc_27m>;
|
||||
};
|
||||
|
||||
@@ -848,7 +848,7 @@
|
||||
@@ -866,7 +866,7 @@
|
||||
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<0 223 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "DE", "SE";
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -856,7 +856,23 @@
|
||||
@@ -874,7 +874,23 @@
|
||||
|
||||
port {
|
||||
dp0_out: endpoint {
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -795,6 +795,8 @@
|
||||
@@ -813,6 +813,8 @@
|
||||
/* internal to-cpu ports */
|
||||
port@4 {
|
||||
reg = <4>;
|
||||
@ -24,7 +24,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
@@ -803,6 +805,8 @@
|
||||
@@ -821,6 +823,8 @@
|
||||
port@5 {
|
||||
reg = <5>;
|
||||
ethernet = <&enetc_port3>;
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -770,7 +770,6 @@
|
||||
@@ -788,7 +788,6 @@
|
||||
little-endian;
|
||||
};
|
||||
switch@0,5 {
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -797,7 +797,7 @@
|
||||
@@ -815,7 +815,7 @@
|
||||
phy-mode = "gmii";
|
||||
|
||||
fixed-link {
|
||||
|
@ -27,7 +27,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -755,7 +755,7 @@
|
||||
@@ -773,7 +773,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
@ -36,7 +36,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
compatible = "fsl,enetc";
|
||||
reg = <0x000200 0 0 0 0>;
|
||||
fixed-link {
|
||||
@@ -794,6 +794,7 @@
|
||||
@@ -812,6 +812,7 @@
|
||||
/* internal to-cpu ports */
|
||||
port@4 {
|
||||
reg = <4>;
|
||||
@ -44,7 +44,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
phy-mode = "gmii";
|
||||
|
||||
fixed-link {
|
||||
@@ -803,7 +804,6 @@
|
||||
@@ -821,7 +822,6 @@
|
||||
};
|
||||
port@5 {
|
||||
reg = <5>;
|
||||
@ -52,7 +52,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
phy-mode = "gmii";
|
||||
|
||||
fixed-link {
|
||||
@@ -816,6 +816,8 @@
|
||||
@@ -834,6 +834,8 @@
|
||||
enetc_port3: ethernet@0,6 {
|
||||
compatible = "fsl,enetc";
|
||||
reg = <0x000600 0 0 0 0>;
|
||||
|
@ -67,7 +67,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
|
||||
<&edma0 1 44>;
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -544,8 +544,9 @@
|
||||
@@ -562,8 +562,9 @@
|
||||
reg = <0x0 0xf100000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
||||
@ -79,7 +79,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
|
||||
dma-names = "tx", "rx";
|
||||
dmas = <&edma0 1 4>,
|
||||
<&edma0 1 3>;
|
||||
@@ -558,8 +559,9 @@
|
||||
@@ -576,8 +577,9 @@
|
||||
reg = <0x0 0xf110000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
||||
@ -91,7 +91,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
|
||||
dma-names = "tx", "rx";
|
||||
dmas = <&edma0 1 6>,
|
||||
<&edma0 1 5>;
|
||||
@@ -572,8 +574,9 @@
|
||||
@@ -590,8 +592,9 @@
|
||||
reg = <0x0 0xf130000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
|
||||
|
@ -34,7 +34,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
||||
sata: sata@3200000 {
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -381,6 +381,7 @@
|
||||
@@ -399,6 +399,7 @@
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
@ -42,7 +42,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
||||
};
|
||||
|
||||
usb1: usb@3110000 {
|
||||
@@ -391,6 +392,7 @@
|
||||
@@ -409,6 +410,7 @@
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Peng Ma <peng.ma@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -327,7 +327,7 @@
|
||||
@@ -345,7 +345,7 @@
|
||||
|
||||
edma0: dma-controller@22c0000 {
|
||||
#dma-cells = <2>;
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -810,6 +810,7 @@
|
||||
@@ -828,6 +828,7 @@
|
||||
port@5 {
|
||||
reg = <5>;
|
||||
phy-mode = "gmii";
|
||||
|
@ -385,7 +385,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
&sai4 {
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -774,30 +774,39 @@
|
||||
@@ -792,30 +792,39 @@
|
||||
clocks = <&clockgen 2 3>;
|
||||
little-endian;
|
||||
};
|
||||
@ -432,7 +432,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
reg = <4>;
|
||||
ethernet = <&enetc_port2>;
|
||||
phy-mode = "gmii";
|
||||
@@ -807,7 +816,8 @@
|
||||
@@ -825,7 +834,8 @@
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
@ -442,7 +442,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
reg = <5>;
|
||||
phy-mode = "gmii";
|
||||
status = "disabled";
|
||||
@@ -819,6 +829,7 @@
|
||||
@@ -837,6 +847,7 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
||||
@@ -788,21 +788,25 @@
|
||||
@@ -806,21 +806,25 @@
|
||||
mscc_felix_port0: port@0 {
|
||||
reg = <0>;
|
||||
status = "disabled";
|
||||
|
@ -15,7 +15,7 @@
|
||||
/* initialize internal qc */
|
||||
qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
|
||||
|
||||
@@ -5128,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
@@ -5156,6 +5164,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
|
||||
return NULL;
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
/* libsas case */
|
||||
if (ap->flags & ATA_FLAG_SAS_HOST) {
|
||||
tag = ata_sas_allocate_tag(ap);
|
||||
@@ -5173,6 +5184,8 @@ void ata_qc_free(struct ata_queued_cmd *
|
||||
@@ -5201,6 +5212,8 @@ void ata_qc_free(struct ata_queued_cmd *
|
||||
qc->tag = ATA_TAG_POISON;
|
||||
if (ap->flags & ATA_FLAG_SAS_HOST)
|
||||
ata_sas_free_tag(tag, ap);
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
--- a/include/linux/libata.h
|
||||
+++ b/include/linux/libata.h
|
||||
@@ -910,6 +910,8 @@ struct ata_port_operations {
|
||||
@@ -911,6 +911,8 @@ struct ata_port_operations {
|
||||
enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc);
|
||||
unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
|
||||
bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
/*
|
||||
* Configuration and exception handling
|
||||
@@ -1000,6 +1002,9 @@ struct ata_port_operations {
|
||||
@@ -1001,6 +1003,9 @@ struct ata_port_operations {
|
||||
void (*phy_reset)(struct ata_port *ap);
|
||||
void (*eng_timeout)(struct ata_port *ap);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user