e52f3e9b13
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
--- a/drivers/ata/Kconfig
|
|
+++ b/drivers/ata/Kconfig
|
|
@@ -492,6 +492,13 @@ config SATA_VITESSE
|
|
|
|
If unsure, say N.
|
|
|
|
+config SATA_OXNAS
|
|
+ tristate "PLXTECH NAS782X SATA support"
|
|
+ help
|
|
+ This option enables support for Nas782x Serial ATA controller.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
comment "PATA SFF controllers with BMDMA"
|
|
|
|
config PATA_ALI
|
|
--- a/drivers/ata/Makefile
|
|
+++ b/drivers/ata/Makefile
|
|
@@ -46,6 +46,7 @@ obj-$(CONFIG_SATA_SVW) += sata_svw.o
|
|
obj-$(CONFIG_SATA_ULI) += sata_uli.o
|
|
obj-$(CONFIG_SATA_VIA) += sata_via.o
|
|
obj-$(CONFIG_SATA_VITESSE) += sata_vsc.o
|
|
+obj-$(CONFIG_SATA_OXNAS) += sata_oxnas.o
|
|
|
|
# SFF PATA w/ BMDMA
|
|
obj-$(CONFIG_PATA_ALI) += pata_ali.o
|
|
--- a/arch/arm/boot/dts/ox820.dtsi
|
|
+++ b/arch/arm/boot/dts/ox820.dtsi
|
|
@@ -385,5 +385,20 @@
|
|
};
|
|
|
|
};
|
|
+
|
|
+ sata: sata@45900000 {
|
|
+ compatible = "plxtech,nas782x-sata";
|
|
+ /* ports dmactl sgdma */
|
|
+ reg = <0x45900000 0x20000>, <0x459A0000 0x40>, <0x459B0000 0x20>,
|
|
+ /* core phy descriptors (optional) */
|
|
+ <0x459E0000 0x2000>, <0x44900000 0x0C>, <0x50000000 0x1000>;
|
|
+ interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&stdclk CLK_820_SATA>;
|
|
+ resets = <&reset RESET_SATA>, <&reset RESET_SATA_LINK>, <&reset RESET_SATA_PHY>;
|
|
+ reset-names = "sata", "link", "phy";
|
|
+ nr-ports = <1>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
};
|
|
};
|