summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-evb.dtsi40
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi47
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110.dtsi5
-rw-r--r--arch/riscv/configs/starfive_jh7110_defconfig5
-rw-r--r--arch/riscv/configs/starfive_visionfive2_defconfig3
5 files changed, 47 insertions, 53 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi b/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi
index bd08c242fb67..ed6fa2fd18c5 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi
@@ -9,46 +9,8 @@
&i2c5 {
pmic: jh7110_evb_reg@50 {
- compatible = "starfive,jh7110-evb-regulator";
+ compatible = "x-powers,axp15060";
reg = <0x50>;
-
- regulators {
- hdmi_1p8: LDO_REG1 {
- regulator-name = "hdmi_1p8";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- };
- mipitx_1p8: LDO_REG2 {
- regulator-name = "mipitx_1p8";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- };
- mipirx_1p8: LDO_REG3 {
- regulator-name = "mipirx_1p8";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- };
- hdmi_0p9: LDO_REG4 {
- regulator-name = "hdmi_0p9";
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <900000>;
- };
- mipitx_0p9: LDO_REG5 {
- regulator-name = "mipitx_0p9";
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <900000>;
- };
- mipirx_0p9: LDO_REG6 {
- regulator-name = "mipirx_0p9";
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <900000>;
- };
- sdio_vdd: LDO_REG7 {
- regulator-name = "sdio_vdd";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- };
- };
};
};
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
index ebb192a45405..944b0fd5ba46 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
@@ -520,13 +520,13 @@
};
pmic: axp15060_reg@36 {
- compatible = "stf,axp15060-regulator";
+ compatible = "x-powers,axp15060";
reg = <0x36>;
regulators {
mipi_0p9: ALDO1 {
regulator-boot-on;
- regulator-compatible = "mipi_0p9";
+ regulator-compatible = "aldo1";
regulator-name = "mipi_0p9";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
@@ -534,7 +534,7 @@
hdmi_0p9: ALDO5 {
regulator-boot-on;
- regulator-compatible = "hdmi_0p9";
+ regulator-compatible = "aldo5";
regulator-name = "hdmi_0p9";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
@@ -542,7 +542,7 @@
hdmi_1p8: ALDO3 {
regulator-boot-on;
- regulator-compatible = "hdmi_1p8";
+ regulator-compatible = "aldo3";
regulator-name = "hdmi_1p8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@@ -551,7 +551,7 @@
sdio_vdd: ALDO4 {
regulator-boot-on;
regulator-always-on;
- regulator-compatible = "sdio_vdd";
+ regulator-compatible = "aldo4";
regulator-name = "sdio_vdd";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@@ -560,7 +560,7 @@
vcc_3v3: DCDC1 {
regulator-boot-on;
regulator-always-on;
- regulator-compatible = "vcc_3v3";
+ regulator-compatible = "dcdc1";
regulator-name = "vcc_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -569,7 +569,7 @@
cpu_vdd: DCDC2 {
regulator-boot-on;
regulator-always-on;
- regulator-compatible = "cpu_vdd";
+ regulator-compatible = "dcdc2";
regulator-name = "cpu_vdd";
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1540000>;
@@ -741,6 +741,21 @@
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
+ clock-names = "gtx",
+ "tx",
+ "ptp_ref",
+ "stmmaceth",
+ "pclk",
+ "gtxc",
+ "rmii_rtx";
+ clocks = <&clkgen JH7110_GMAC0_GTXCLK>,
+ <&clkgen JH7110_U0_GMAC5_CLK_TX>,
+ <&clkgen JH7110_GMAC0_PTP>,
+ <&clkgen JH7110_U0_GMAC5_CLK_AHB>,
+ <&clkgen JH7110_U0_GMAC5_CLK_AXI>,
+ <&clkgen JH7110_GMAC0_GTXC>,
+ <&clkgen JH7110_GMAC0_RMII_RTX>;
+
phy0: ethernet-phy@0 {
rgmii_sw_dr_2 = <0x0>;
rgmii_sw_dr = <0x3>;
@@ -759,6 +774,21 @@
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
+ clock-names = "gtx",
+ "tx",
+ "ptp_ref",
+ "stmmaceth",
+ "pclk",
+ "gtxc",
+ "rmii_rtx";
+ clocks = <&clkgen JH7110_GMAC1_GTXCLK>,
+ <&clkgen JH7110_GMAC5_CLK_TX>,
+ <&clkgen JH7110_GMAC5_CLK_PTP>,
+ <&clkgen JH7110_GMAC5_CLK_AHB>,
+ <&clkgen JH7110_GMAC5_CLK_AXI>,
+ <&clkgen JH7110_GMAC1_GTXC>,
+ <&clkgen JH7110_GMAC1_RMII_RTX>;
+
phy1: ethernet-phy@1 {
rgmii_sw_dr_2 = <0x0>;
rgmii_sw_dr = <0x3>;
@@ -1020,7 +1050,7 @@
reg = <0x0 0x40000>;
};
uboot-env@100000 {
- reg = <0xf0000 0x100000>;
+ reg = <0xf0000 0x10000>;
};
uboot@100000 {
reg = <0x100000 0x300000>;
@@ -1031,3 +1061,4 @@
};
};
};
+
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index bf452f57f68d..b35ced46f514 100644
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -249,9 +249,8 @@
};
stmmac_axi_setup: stmmac-axi-config {
- snps,lpi_en;
- snps,wr_osr_lmt = <4>;
- snps,rd_osr_lmt = <4>;
+ snps,wr_osr_lmt = <0xf>;
+ snps,rd_osr_lmt = <0xf>;
snps,blen = <256 128 64 32 0 0 0>;
};
diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig
index a67e67712419..0185e8fc19d4 100644
--- a/arch/riscv/configs/starfive_jh7110_defconfig
+++ b/arch/riscv/configs/starfive_jh7110_defconfig
@@ -47,6 +47,7 @@ CONFIG_KVM=m
CONFIG_JUMP_LABEL=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
CONFIG_CMA=y
CONFIG_NET=y
CONFIG_PACKET=y
@@ -190,8 +191,9 @@ CONFIG_THERMAL_EMULATION=y
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_STARFIVE_WATCHDOG=y
+CONFIG_MFD_AXP20X_I2C=y
CONFIG_REGULATOR=y
-CONFIG_REGULATOR_AXP15060=y
+CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_STARFIVE_JH7110=y
# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_SUPPORT=y
@@ -317,7 +319,6 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_APPARMOR=y
CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_INIT_STACK_NONE=y
CONFIG_CRYPTO_USER=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
index 5002af3bc6a0..e5dbe9427321 100644
--- a/arch/riscv/configs/starfive_visionfive2_defconfig
+++ b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -198,8 +198,9 @@ CONFIG_THERMAL_EMULATION=y
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_STARFIVE_WATCHDOG=y
+CONFIG_MFD_AXP20X_I2C=y
CONFIG_REGULATOR=y
-CONFIG_REGULATOR_AXP15060=y
+CONFIG_REGULATOR_AXP20X=y
# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_USB_SUPPORT=y
generated by cgit v1.2.3 (git 2.39.0) at 2024-10-21 08:17:29 +0300