667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
97 lines
1.9 KiB
Diff
97 lines
1.9 KiB
Diff
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
@@ -554,6 +554,19 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ snfi: spi@1100d000 {
|
|
+ compatible = "mediatek,mt7622-snfi";
|
|
+ reg = <0 0x1100d000 0 0x1000>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
+ clocks = <&pericfg CLK_PERI_NFI_PD>,
|
|
+ <&pericfg CLK_PERI_SNFI_PD>;
|
|
+ clock-names = "nfi_clk", "spi_clk";
|
|
+ ecc-engine = <&bch>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
nor_flash: spi@11014000 {
|
|
compatible = "mediatek,mt7622-nor",
|
|
"mediatek,mt8173-nor";
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
@@ -99,7 +99,7 @@
|
|
};
|
|
|
|
&bch {
|
|
- status = "disabled";
|
|
+ status = "okay";
|
|
};
|
|
|
|
&btif {
|
|
@@ -551,6 +551,62 @@
|
|
status = "disable";
|
|
};
|
|
|
|
+&snfi {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&serial_nand_pins>;
|
|
+ status = "okay";
|
|
+
|
|
+ spi_nand@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ compatible = "spi-nand";
|
|
+ spi-max-frequency = <104000000>;
|
|
+ reg = <0>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "Preloader";
|
|
+ reg = <0x00000 0x0080000>;
|
|
+ read-only;
|
|
+ };
|
|
+
|
|
+ partition@80000 {
|
|
+ label = "ATF";
|
|
+ reg = <0x80000 0x0040000>;
|
|
+ };
|
|
+
|
|
+ partition@c0000 {
|
|
+ label = "Bootloader";
|
|
+ reg = <0xc0000 0x0080000>;
|
|
+ };
|
|
+
|
|
+ partition@140000 {
|
|
+ label = "Config";
|
|
+ reg = <0x140000 0x0080000>;
|
|
+ };
|
|
+
|
|
+ partition@1c0000 {
|
|
+ label = "Factory";
|
|
+ reg = <0x1c0000 0x0040000>;
|
|
+ };
|
|
+
|
|
+ partition@200000 {
|
|
+ label = "firmware";
|
|
+ reg = <0x200000 0x2000000>;
|
|
+ };
|
|
+
|
|
+ partition@2200000 {
|
|
+ label = "User_data";
|
|
+ reg = <0x2200000 0x4000000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&spi0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spic0_pins>;
|