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>
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
--- a/drivers/usb/host/Kconfig
|
|
+++ b/drivers/usb/host/Kconfig
|
|
@@ -334,6 +334,13 @@ config USB_OCTEON_EHCI
|
|
USB 2.0 device support. All CN6XXX based chips with USB are
|
|
supported.
|
|
|
|
+config USB_EHCI_OXNAS
|
|
+ tristate "OXNAS EHCI Module"
|
|
+ depends on USB_EHCI_HCD && ARCH_OXNAS
|
|
+ select USB_EHCI_ROOT_HUB_TT
|
|
+ ---help---
|
|
+ Enable support for the OX820 SOC's on-chip EHCI controller.
|
|
+
|
|
endif # USB_EHCI_HCD
|
|
|
|
config USB_OXU210HP_HCD
|
|
--- a/drivers/usb/host/Makefile
|
|
+++ b/drivers/usb/host/Makefile
|
|
@@ -43,6 +43,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
|
|
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
|
|
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
|
|
obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o
|
|
+obj-$(CONFIG_USB_EHCI_OXNAS) += ehci-oxnas.o
|
|
|
|
obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
|
|
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
|
|
--- a/arch/arm/boot/dts/ox820.dtsi
|
|
+++ b/arch/arm/boot/dts/ox820.dtsi
|
|
@@ -105,6 +105,22 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ ehci: ehci@40200100 {
|
|
+ compatible = "plxtech,nas782x-ehci";
|
|
+ reg = <0x40200100 0xf00>;
|
|
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&stdclk CLK_820_USBMPH>, <&pllb>, <&stdclk CLK_820_REF600>;
|
|
+ clock-names = "usb", "refsrc", "phyref";
|
|
+ resets = <&reset RESET_USBHS>, <&reset RESET_USBPHYA>, <&reset RESET_USBPHYB>;
|
|
+ reset-names = "host", "phya", "phyb";
|
|
+ oxsemi,sys-ctrl = <&sys>;
|
|
+ /* Otherwise ref300 is used, which is derived from sata phy
|
|
+ * in that case, usb depends on sata initialization */
|
|
+ /* FIXME: how to make this dependency explicit ? */
|
|
+ oxsemi,ehci_use_pllb;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
apb-bridge@44000000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|