Merge branch 'esmil:beaglev' into jh7100

esmil · Jun 23, 2021 · 52735ad · 52735ad
2 parents 0630c4c + 18f0e8a
commit 52735ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
@@ -35,31 +35,6 @@ config SOC_STARFIVE_VIC7100
 menu "StarFive VIC7100 SoC Debug Option"
 	depends on SOC_STARFIVE_VIC7100
 
-config FPGA_GMAC_FLUSH_DDR
-	bool "VIC7100 SOC GMAC description and packet buffer flush"
-	depends on SOC_STARFIVE_VIC7100
-	depends on STMMAC_ETH
-	default y if SOC_STARFIVE_VIC7100
-	help
-	  enable VIC7100 GMAC description and packet buffer flush
-
-config MMC_DW_FLUSH_DDR
-	bool "VIC7100 SOC DW MMC buffer flush"
-	depends on SOC_STARFIVE_VIC7100
-	depends on MMC_DW
-	default y if SOC_STARFIVE_VIC7100
-	help
-	  enable VIC7100 DW MMC description and data buffer flush
-
-config USB_CDNS3_HOST_FLUSH_DMA
-	bool "Cadence USB3 host controller flush dma memery"
-	depends on USB
-	depends on USB_CDNS3
-	depends on SOC_STARFIVE_VIC7100
-	default y if SOC_STARFIVE_VIC7100
-	help
-	  enable VIC7100 DW USB CDNS3 driver data buffer flush
-
 config SOC_STARFIVE_VIC7100_I2C_GPIO
 	bool "VIC7100 SOC I2C GPIO init"
 	depends on I2C_DESIGNWARE_CORE

diff --git a/drivers/video/fbdev/starfive/starfive_displayer.c b/drivers/video/fbdev/starfive/starfive_displayer.c
@@ -28,11 +28,6 @@
 #include "starfive_fb.h"
 #include "starfive_display_dev.h"
 
-#ifdef _ALIGN_UP
-#undef _ALIGN_UP
-#define _ALIGN_UP(addr, size) (((addr)+((size)-1))&(~((typeof(addr))(size)-1)))
-#endif
-
 #define DSI_CMD_LEN(hdr)	(sizeof(*hdr) + (hdr)->dlen)
 
 static int sf_displayer_reset(struct sf_fb_data *fbi)
@@ -613,7 +608,7 @@ static int of_parse_wr_cmd(struct device_node *np,
 		return -EINVAL;
 	}
 	dev_cmds->n_pack = cnt;
-	dev_cmds->cmds = kzalloc(_ALIGN_UP(alloc_bytes, 4), GFP_KERNEL);
+	dev_cmds->cmds = kzalloc(round_up(alloc_bytes, 4), GFP_KERNEL);
 
 	if (IS_ERR_OR_NULL(dev_cmds->cmds))
 		return -ENOMEM;