kernel: bump 5.4 to 5.4.174
Removed upstreamed patches: layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.4.174&id=65816c1034769e714edb70f59a33bc5472d9e55f Build system: x86_64 Build-tested: ramips/mt7621 Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
76725938f1
commit
30cff7c3b0
@@ -18,7 +18,7 @@ Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
@@ -222,6 +222,21 @@
|
||||
@@ -226,6 +226,21 @@
|
||||
phy-connection-type = "rgmii-id";
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
@@ -244,3 +244,15 @@
|
||||
@@ -248,3 +248,15 @@
|
||||
&sata {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From d4c7270a63b1d78b89d91f74d782cce2a2bd9690 Mon Sep 17 00:00:00 2001
|
||||
From: Biwen Li <biwen.li@nxp.com>
|
||||
Date: Wed, 4 Sep 2019 11:39:30 +0800
|
||||
Subject: [PATCH] arm64: ls1028a-qds: correct bus of rtc
|
||||
|
||||
The rtc is on i2c2 bus(hardware), not on i2c1 channel 3,
|
||||
so correct it
|
||||
|
||||
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
---
|
||||
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
@@ -169,11 +169,6 @@
|
||||
vcc-supply = <&sb_3v3>;
|
||||
};
|
||||
|
||||
- rtc@51 {
|
||||
- compatible = "nxp,pcf2129";
|
||||
- reg = <0x51>;
|
||||
- };
|
||||
-
|
||||
eeprom@56 {
|
||||
compatible = "atmel,24c512";
|
||||
reg = <0x56>;
|
||||
@@ -217,6 +212,14 @@
|
||||
|
||||
};
|
||||
|
||||
+&i2c1 {
|
||||
+ status = "okay";
|
||||
+ rtc@51 {
|
||||
+ compatible = "nxp,pcf2129";
|
||||
+ reg = <0x51>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&enetc_port1 {
|
||||
phy-handle = <&qds_phy1>;
|
||||
phy-connection-type = "rgmii-id";
|
||||
@@ -346,7 +346,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
};
|
||||
};
|
||||
|
||||
@@ -259,3 +283,6 @@
|
||||
@@ -260,3 +284,6 @@
|
||||
edp_num_lanes = <0x4>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
@@ -273,14 +273,7 @@
|
||||
@@ -274,14 +274,7 @@
|
||||
};
|
||||
|
||||
&hdptx0 {
|
||||
|
||||
@@ -884,7 +884,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
|
||||
-};
|
||||
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
|
||||
@@ -276,6 +276,3 @@
|
||||
@@ -277,6 +277,3 @@
|
||||
lane-mapping = <0x4e>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com>
|
||||
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -4777,7 +4777,8 @@ hub_port_init(struct usb_hub *hub, struc
|
||||
@@ -4780,7 +4780,8 @@ hub_port_init(struct usb_hub *hub, struc
|
||||
}
|
||||
if (r) {
|
||||
if (r != -ENODEV)
|
||||
|
||||
Reference in New Issue
Block a user