Merge branch 'CR_9959_dts_6.6_hal.feng' into 'vf2-6.6.y-devel'

CR_9959_dts_6.6_hal.feng

See merge request sbc/linux!203
This commit is contained in:
andy.hu 2024-03-22 12:38:50 +00:00
commit 0135b61d57
5 changed files with 106 additions and 0 deletions

View file

@ -9,6 +9,7 @@ DTC_FLAGS_jh7110-evb := -@
dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-beaglev-starlight.dtb
dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb
subdir-y += vf2-overlay
dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb
dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb \
jh7110-starfive-visionfive-2-ac108.dtb \

View file

@ -15,7 +15,10 @@
ethernet0 = &gmac0;
ethernet1 = &gmac1;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
i2c6 = &i2c6;
mmc0 = &mmc0;
@ -23,6 +26,7 @@
pcie0 = &pcie0;
pcie1 = &pcie1;
serial0 = &uart0;
serial3 = &uart3;
};
chosen {

View file

@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_STARFIVE) += vf2-overlay-uart3-i2c.dtbo \
vf2-overlay-can.dtbo

View file

@ -0,0 +1,23 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/gpio.h>
#include "../jh7110-pinfunc.h"
/ {
compatible = "starfive,jh7110";
//can0
fragment@0 {
target-path = "/soc/can@130d0000";
__overlay__ {
status = "okay";
};
};
//can1
fragment@1 {
target-path = "/soc/can@130e0000";
__overlay__ {
status = "okay";
};
};
};

View file

@ -0,0 +1,75 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/gpio.h>
#include "../jh7110-pinfunc.h"
/ {
compatible = "starfive,jh7110";
//sysgpio
fragment@0 {
target-path = "/soc/pinctrl@13040000";
__overlay__ {
dt_uart3_pins: dt-uart3-0 {
tx-pins {
pinmux = <GPIOMUX(60, GPOUT_SYS_UART3_TX,
GPOEN_ENABLE,
GPI_NONE)>;
bias-disable;
drive-strength = <12>;
input-disable;
input-schmitt-disable;
slew-rate = <0>;
};
rx-pins {
pinmux = <GPIOMUX(63, GPOUT_LOW,
GPOEN_DISABLE,
GPI_SYS_UART3_RX)>;
bias-pull-up;
drive-strength = <2>;
input-enable;
input-schmitt-enable;
slew-rate = <0>;
};
};
dt_i2c1_pins: dt-i2c1-0 {
i2c-pins {
pinmux = <GPIOMUX(42, GPOUT_LOW,
GPOEN_SYS_I2C1_CLK,
GPI_SYS_I2C1_CLK)>,
<GPIOMUX(43, GPOUT_LOW,
GPOEN_SYS_I2C1_DATA,
GPI_SYS_I2C1_DATA)>;
bias-pull-up;
input-enable;
input-schmitt-enable;
};
};
};
};
//uart3
fragment@1 {
target-path = "/soc/serial@12000000";
__overlay__ {
pinctrl-names = "default";
pinctrl-0 = <&dt_uart3_pins>;
status = "okay";
};
};
//i2c1
fragment@2 {
target-path = "/soc/i2c@10040000";
__overlay__ {
clock-frequency = <100000>;
i2c-sda-hold-time-ns = <300>;
i2c-sda-falling-time-ns = <510>;
i2c-scl-falling-time-ns = <510>;
pinctrl-names = "default";
pinctrl-0 = <&dt_i2c1_pins>;
status = "okay";
};
};
};