Browse Source

add usb and dts overlay func to default config

yanhong.wang 3 years ago
parent
commit
5789dff7e3

+ 8 - 8
arch/riscv/cpu/fu540/cache.c

@@ -59,12 +59,11 @@ int cache_enable_ways(void)
 
 #if CONFIG_IS_ENABLED(SIFIVE_FU540_L2CC_FLUSH)
 #define L2_CACHE_FLUSH64	0x200
+#define L2_CACHE_BASE_ADDR 	0x2010000
 
 void flush_dcache_range(unsigned long start, unsigned long end)
 {
-	fdt_addr_t base;
 	unsigned long line;
-
 	volatile unsigned long *flush64;
 
 	/* make sure the address is in the range */
@@ -74,11 +73,8 @@ void flush_dcache_range(unsigned long start, unsigned long end)
 				CONFIG_SIFIVE_FU540_L2CC_FLUSH_SIZE))
 		return;
 
-	base = l2cc_get_base_addr();
-	if (base == FDT_ADDR_T_NONE)
-		return;
-
-	flush64 = (volatile unsigned long *)(base + L2_CACHE_FLUSH64);
+	/*In order to improve the performance, change base addr to a fixed value*/
+	flush64 = (volatile unsigned long *)(L2_CACHE_BASE_ADDR + L2_CACHE_FLUSH64);
 
 	/* memory barrier */
 	mb();
@@ -88,7 +84,11 @@ void flush_dcache_range(unsigned long start, unsigned long end)
 		mb();
 	}
 
-
 	return;
 }
+
+void invalidate_dcache_range(unsigned long start, unsigned long end)
+{
+	flush_dcache_range(start,end);
+}
 #endif //SIFIVE_FU540_L2CC_FLUSH

+ 3 - 13
arch/riscv/dts/starfive_vic7100_evb.dts

@@ -16,6 +16,7 @@
 	aliases {
 		spi0="/soc/qspi@11860000";
 		mshc0="/soc/sdio0@10000000";
+		usb0="/soc/usb@104c0000";
 	};
 	cpus: cpus {
 		#address-cells = <1>;
@@ -251,14 +252,6 @@
 			status = "okay";
 		};
 
-		usb3_phy: usb3-phy {
-			compatible = "usb3-phy";
-			status = "okay";
-		};
-		usb2_phy: usb2-phy {
-			compatible = "usb2-phy";
-			status = "okay";
-		};
 		USB30: usb@104c0000 {
 			compatible = "cdns,usb3";
 			reg = <0x0 0x104c0000 0x0 0x10000>,	// memory area for HOST registers
@@ -270,12 +263,9 @@
 			interrupt-names = "otg",
 					"host",
 					"peripheral";
-			phys = <&usb3_phy>, <&usb2_phy>;
 			phy-names = "cdns3,usb3-phy", "cnds3,usb2-phy";
 			status = "okay";
-			/*maximum-speed = "high-speed";
-			dr_mode = "host";*/
-		};
+ 		};
 
 
 		gpio: gpio@11910000 {
@@ -496,7 +486,7 @@
 			clocks = <&dwmmc_biuclk>;
 			clock-names = "biu";
 			clock-frequency = <100000000>;
-			max-frequency = <26000000>;
+			max-frequency = <50000000>;
 			fifo-depth = <32>;
 			card-detect-delay = <300>;
 			fifo-watermark-aligned;

+ 64 - 6
configs/starfive_vic7100_evb_smode_defconfig

@@ -397,7 +397,7 @@ CONFIG_CMD_SF=y
 # CONFIG_CMD_SPI is not set
 # CONFIG_CMD_TSI148 is not set
 # CONFIG_CMD_UNIVERSE is not set
-# CONFIG_CMD_USB is not set
+CONFIG_CMD_USB=y
 # CONFIG_CMD_USB_SDP is not set
 # CONFIG_CMD_USB_MASS_STORAGE is not set
 
@@ -486,7 +486,7 @@ CONFIG_CMD_SYSBOOT=y
 # Filesystem commands
 #
 # CONFIG_CMD_BTRFS is not set
-# CONFIG_CMD_EXT2 is not set
+CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 # CONFIG_CMD_EXT4_WRITE is not set
 CONFIG_CMD_FAT=y
@@ -578,11 +578,10 @@ CONFIG_TFTP_WINDOWSIZE=1
 #
 CONFIG_DM=y
 CONFIG_DM_WARN=y
-CONFIG_DM_DEBUG=y
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_DEVICE_REMOVE=y
 CONFIG_DM_STDIO=y
 CONFIG_DM_SEQ_ALIAS=y
-# CONFIG_DM_DMA is not set
 # CONFIG_REGMAP is not set
 # CONFIG_DEVRES is not set
 CONFIG_SIMPLE_BUS=y
@@ -1071,7 +1070,66 @@ CONFIG_RISCV_TIMER=y
 #
 # TPM support
 #
-# CONFIG_USB is not set
+CONFIG_USB=y
+CONFIG_DM_USB=y
+# CONFIG_DM_USB_GADGET is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_HOST=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DWC3 is not set
+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
+# CONFIG_USB_XHCI_PCI is not set
+# CONFIG_USB_XHCI_FSL is not set
+# CONFIG_USB_XHCI_BRCM is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_PCI is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_TI=y
+# CONFIG_USB_DWC3 is not set
+
+#
+# Legacy MUSB Support
+#
+# CONFIG_USB_MUSB_HCD is not set
+# CONFIG_USB_MUSB_UDC is not set
+
+#
+# MUSB Controller Driver
+#
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+# CONFIG_USB_MUSB_DA8XX is not set
+# CONFIG_USB_MUSB_TI is not set
+# CONFIG_USB_MUSB_AM35X is not set
+# CONFIG_USB_MUSB_DSPS is not set
+# CONFIG_USB_MUSB_PIO_ONLY is not set
+
+#
+# USB Phy
+#
+# CONFIG_TWL4030_USB is not set
+# CONFIG_OMAP_USB_PHY is not set
+# CONFIG_ROCKCHIP_USB2_PHY is not set
+
+#
+# ULPI drivers
+#
+
+#
+# USB peripherals
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_HOST_ETHER is not set
 
 #
 # UFS Host Controller Support
@@ -1213,7 +1271,7 @@ CONFIG_ZLIB=y
 CONFIG_GETOPT=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT_ASSUME_MASK=0
-# CONFIG_OF_LIBFDT_OVERLAY is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_SPL_OF_LIBFDT=y
 CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
 # CONFIG_TPL_OF_LIBFDT is not set