kernel: bump 5.10 to 5.10.61
Manually rebased: bcm27xx/patches-5.10/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch Removed upstreamed: mvebu/patches-5.10/101-cpufreq-armada-37xx-forbid-cpufreq-for-1.2-GHz-variant.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
1c8214d6f2
commit
6b1cd3e345
@@ -17,9 +17,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
|
||||
create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
|
||||
deleted file mode 100644
|
||||
index 5eedb02965622..0000000000000
|
||||
--- a/Documentation/devicetree/bindings/usb/mediatek,musb.txt
|
||||
+++ /dev/null
|
||||
@@ -1,57 +0,0 @@
|
||||
@@ -80,9 +77,6 @@ index 5eedb02965622..0000000000000
|
||||
- vbus-supply = <&usb_vbus>;
|
||||
- };
|
||||
-};
|
||||
diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
new file mode 100644
|
||||
index 0000000000000..790efe8b62746
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
@@ -0,0 +1,113 @@
|
||||
@@ -199,6 +193,3 @@ index 0000000000000..790efe8b62746
|
||||
+ };
|
||||
+ };
|
||||
+...
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
index 790efe8b62746..84ddacfdbe9b0 100644
|
||||
--- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
@@ -17,6 +17,7 @@ properties:
|
||||
@@ -25,6 +23,3 @@ index 790efe8b62746..84ddacfdbe9b0 100644
|
||||
- mediatek,mt2701-musb
|
||||
- const: mediatek,mtk-musb
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@ Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
|
||||
Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
index 84ddacfdbe9b0..03d62d60ce5fe 100644
|
||||
--- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
|
||||
@@ -19,6 +19,7 @@ properties:
|
||||
@@ -23,6 +21,3 @@ index 84ddacfdbe9b0..03d62d60ce5fe 100644
|
||||
- const: mediatek,mtk-musb
|
||||
|
||||
reg:
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
||||
@@ -11,11 +11,9 @@ Signed-off-by: Sungbo Eo <mans0n@gorani.run>
|
||||
arch/arm/boot/dts/mt7623a.dtsi | 4 ++++
|
||||
2 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
|
||||
index 3c11f7cfcc401..790d74439cc66 100644
|
||||
--- a/arch/arm/boot/dts/mt7623.dtsi
|
||||
+++ b/arch/arm/boot/dts/mt7623.dtsi
|
||||
@@ -585,6 +585,40 @@ spi2: spi@11017000 {
|
||||
@@ -585,6 +585,40 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -56,11 +54,9 @@ index 3c11f7cfcc401..790d74439cc66 100644
|
||||
audsys: clock-controller@11220000 {
|
||||
compatible = "mediatek,mt7623-audsys",
|
||||
"mediatek,mt2701-audsys",
|
||||
diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
|
||||
index 0735a1fb8ad9a..d304b62d24b58 100644
|
||||
--- a/arch/arm/boot/dts/mt7623a.dtsi
|
||||
+++ b/arch/arm/boot/dts/mt7623a.dtsi
|
||||
@@ -35,6 +35,10 @@ &scpsys {
|
||||
@@ -35,6 +35,10 @@
|
||||
clock-names = "ethif";
|
||||
};
|
||||
|
||||
@@ -71,6 +67,3 @@ index 0735a1fb8ad9a..d304b62d24b58 100644
|
||||
&usb1 {
|
||||
power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
|
||||
};
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
||||
@@ -836,7 +836,7 @@
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/of_platform.h>
|
||||
|
||||
@@ -608,6 +609,8 @@ static int mtk_snand_probe(struct platfo
|
||||
@@ -612,6 +613,8 @@ static int mtk_snand_probe(struct platfo
|
||||
mtd->_block_isbad = mtk_snand_mtd_block_isbad;
|
||||
mtd->_block_markbad = mtk_snand_mtd_block_markbad;
|
||||
|
||||
@@ -845,7 +845,7 @@
|
||||
ret = mtd_device_register(mtd, NULL, 0);
|
||||
if (ret) {
|
||||
dev_err(msm->pdev.dev, "failed to register mtd partition\n");
|
||||
@@ -619,6 +622,7 @@ static int mtk_snand_probe(struct platfo
|
||||
@@ -623,6 +626,7 @@ static int mtk_snand_probe(struct platfo
|
||||
return 0;
|
||||
|
||||
errout4:
|
||||
@@ -853,7 +853,7 @@
|
||||
devm_kfree(msm->pdev.dev, msm->page_cache);
|
||||
|
||||
errout3:
|
||||
@@ -646,6 +650,8 @@ static int mtk_snand_remove(struct platf
|
||||
@@ -650,6 +654,8 @@ static int mtk_snand_remove(struct platf
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
||||
#interrupt-cells = <1>;
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -296,18 +296,16 @@
|
||||
@@ -288,18 +288,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
@@ -281,7 +281,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
||||
&pio {
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||
@@ -801,45 +801,41 @@
|
||||
@@ -802,45 +802,41 @@
|
||||
#reset-cells = <1>;
|
||||
};
|
||||
|
||||
@@ -344,7 +344,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
||||
interrupt-map-mask = <0 0 0 7>;
|
||||
interrupt-map = <0 0 0 1 &pcie_intc0 0>,
|
||||
<0 0 0 2 &pcie_intc0 1>,
|
||||
@@ -851,15 +847,39 @@
|
||||
@@ -852,15 +848,39 @@
|
||||
#interrupt-cells = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -149,7 +149,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
||||
&pciephy1 {
|
||||
--- a/arch/arm/boot/dts/mt7629.dtsi
|
||||
+++ b/arch/arm/boot/dts/mt7629.dtsi
|
||||
@@ -382,16 +382,21 @@
|
||||
@@ -376,16 +376,21 @@
|
||||
#reset-cells = <1>;
|
||||
};
|
||||
|
||||
@@ -177,7 +177,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
||||
clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
|
||||
<&pciesys CLK_PCIE_P0_AHB_EN>,
|
||||
<&pciesys CLK_PCIE_P1_AUX_EN>,
|
||||
@@ -412,21 +417,19 @@
|
||||
@@ -406,21 +411,19 @@
|
||||
power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
|
||||
bus-range = <0x00 0xff>;
|
||||
ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
interface-type = "ace";
|
||||
reg = <0x5000 0x1000>;
|
||||
};
|
||||
@@ -976,6 +976,8 @@
|
||||
@@ -977,6 +977,8 @@
|
||||
power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
|
||||
mediatek,ethsys = <ðsys>;
|
||||
mediatek,sgmiisys = <&sgmiisys>;
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||
@@ -812,6 +812,8 @@
|
||||
@@ -813,6 +813,8 @@
|
||||
reg = <0 0x1a143000 0 0x1000>;
|
||||
reg-names = "port0";
|
||||
mediatek,pcie-cfg = <&pciecfg>;
|
||||
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_LOW>;
|
||||
@@ -829,6 +831,7 @@
|
||||
@@ -830,6 +832,7 @@
|
||||
bus-range = <0x00 0xff>;
|
||||
ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>;
|
||||
status = "disabled";
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
slot0: pcie@0,0 {
|
||||
reg = <0x0000 0 0 0 0>;
|
||||
@@ -855,6 +858,8 @@
|
||||
@@ -856,6 +859,8 @@
|
||||
reg = <0 0x1a145000 0 0x1000>;
|
||||
reg-names = "port1";
|
||||
mediatek,pcie-cfg = <&pciecfg>;
|
||||
@@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
|
||||
@@ -873,6 +878,7 @@
|
||||
@@ -874,6 +879,7 @@
|
||||
bus-range = <0x00 0xff>;
|
||||
ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>;
|
||||
status = "disabled";
|
||||
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
slot1: pcie@1,0 {
|
||||
reg = <0x0800 0 0 0 0>;
|
||||
@@ -932,6 +938,11 @@
|
||||
@@ -933,6 +939,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -305,14 +305,14 @@
|
||||
@@ -297,14 +297,14 @@
|
||||
&pcie1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie1_pins>;
|
||||
|
||||
Reference in New Issue
Block a user