Merge branch 'CR_871_PWM_hal.feng' into 'jh7110_fpga_dev_5.15'

[platform/kernel/linux-starfive.git] / arch / riscv / boot / dts / starfive / jh7110_pinctrl.dtsi

diff --git a/arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi b/arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi
index c6b4377..57c5629 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi
@@ -479,6 +479,12 @@
        pinctrl-0 = <&gmac1_pins>;
 };
 
+&i2c6 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c6_pins>;
+       status = "okay";
+};
+
 &i2c0 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
@@ -497,7 +503,7 @@
        status = "okay";
 };
 
-&ipmscan0 {
+&can0 {
        pinctrl-names = "default";
        pinctrl-0 = <&can0_pins>;
        status = "okay";
@@ -525,4 +531,4 @@
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins>;
        status = "okay";
-};
\ No newline at end of file
+};