summaryrefslogtreecommitdiff
path: root/drivers/ram/starfive
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-05-20 13:35:03 -0600
committerTom Rini <[email protected]>2024-05-20 13:35:03 -0600
commit03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch)
tree57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/ram/starfive
parentd4781422d1268aa6deca3e49d2fb227e79c160b4 (diff)
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow for all of these changes to exist here. Reported-by: Jonas Karlman <[email protected]> Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/ram/starfive')
-rw-r--r--drivers/ram/starfive/ddrcsr_boot.c1
-rw-r--r--drivers/ram/starfive/ddrphy_start.c1
-rw-r--r--drivers/ram/starfive/ddrphy_train.c2
-rw-r--r--drivers/ram/starfive/ddrphy_utils.c2
-rw-r--r--drivers/ram/starfive/starfive_ddr.c1
-rw-r--r--drivers/ram/starfive/starfive_ddr.h2
6 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ram/starfive/ddrcsr_boot.c b/drivers/ram/starfive/ddrcsr_boot.c
index f2dd55f74a0..6764b3ed5cc 100644
--- a/drivers/ram/starfive/ddrcsr_boot.c
+++ b/drivers/ram/starfive/ddrcsr_boot.c
@@ -4,7 +4,6 @@
* Author: Yanhong Wang<[email protected]>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/regs.h>
#include <linux/delay.h>
diff --git a/drivers/ram/starfive/ddrphy_start.c b/drivers/ram/starfive/ddrphy_start.c
index 479b6ef1041..efe3f8a181a 100644
--- a/drivers/ram/starfive/ddrphy_start.c
+++ b/drivers/ram/starfive/ddrphy_start.c
@@ -4,7 +4,6 @@
* Author: Yanhong Wang<[email protected]>
*/
-#include <common.h>
#include <asm/io.h>
#include "starfive_ddr.h"
diff --git a/drivers/ram/starfive/ddrphy_train.c b/drivers/ram/starfive/ddrphy_train.c
index 0740f49be5b..0aff1e8727e 100644
--- a/drivers/ram/starfive/ddrphy_train.c
+++ b/drivers/ram/starfive/ddrphy_train.c
@@ -4,7 +4,7 @@
* Author: Yanhong Wang<[email protected]>
*/
-#include <common.h>
+#include <linux/kernel.h>
#include <asm/io.h>
static const u32 ddr_train_data[] = {
diff --git a/drivers/ram/starfive/ddrphy_utils.c b/drivers/ram/starfive/ddrphy_utils.c
index 1c9fe0a7846..d6dd6ee7a85 100644
--- a/drivers/ram/starfive/ddrphy_utils.c
+++ b/drivers/ram/starfive/ddrphy_utils.c
@@ -4,7 +4,7 @@
* Author: Yanhong Wang<[email protected]>
*/
-#include <common.h>
+#include <linux/kernel.h>
#include <asm/io.h>
static const u32 ddr_phy_data[] = {
diff --git a/drivers/ram/starfive/starfive_ddr.c b/drivers/ram/starfive/starfive_ddr.c
index a0a3d6b33dc..b31ed3bcf61 100644
--- a/drivers/ram/starfive/starfive_ddr.c
+++ b/drivers/ram/starfive/starfive_ddr.c
@@ -4,7 +4,6 @@
* Author: Yanhong Wang<[email protected]>
*/
-#include <common.h>
#include <asm/arch/regs.h>
#include <asm/io.h>
#include <clk.h>
diff --git a/drivers/ram/starfive/starfive_ddr.h b/drivers/ram/starfive/starfive_ddr.h
index d0ec1c1da80..c29d26b510c 100644
--- a/drivers/ram/starfive/starfive_ddr.h
+++ b/drivers/ram/starfive/starfive_ddr.h
@@ -7,6 +7,8 @@
#ifndef __STARFIVE_DDR_H__
#define __STARFIVE_DDR_H__
+#include <linux/kernel.h>
+
#define SEC_CTRL_ADDR 0x1000
#define PHY_BASE_ADDR 0x800
#define PHY_AC_BASE_ADDR 0x1000