Module Name: src
Committed By: skrll
Date: Thu Oct 24 12:03:16 UTC 2024
Modified Files:
src/sys/arch/riscv/dts: jh7100-beaglev-starlight.dts jh7100.dtsi
Added Files:
src/sys/arch/riscv/dts: jh7100-common.dtsi
Log Message:
risc-v: (re-) add the usb nodes for beagle-v.
The audio clocks are also added, but no driver exists as yet. USB works
again, but relies on u-boot setup.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts \
src/sys/arch/riscv/dts/jh7100.dtsi
cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/dts/jh7100-common.dtsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts
diff -u src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts:1.1 src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts:1.2
--- src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts:1.1 Thu Oct 24 09:46:37 2024
+++ src/sys/arch/riscv/dts/jh7100-beaglev-starlight.dts Thu Oct 24 12:03:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: jh7100-beaglev-starlight.dts,v 1.1 2024/10/24 09:46:37 skrll Exp $ */
+/* $NetBSD: jh7100-beaglev-starlight.dts,v 1.2 2024/10/24 12:03:16 skrll Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,4 +32,5 @@
#include "../../../external/gpl2/dts/dist/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts"
#include "jh7100.dtsi"
+#include "jh7100-common.dtsi"
Index: src/sys/arch/riscv/dts/jh7100.dtsi
diff -u src/sys/arch/riscv/dts/jh7100.dtsi:1.1 src/sys/arch/riscv/dts/jh7100.dtsi:1.2
--- src/sys/arch/riscv/dts/jh7100.dtsi:1.1 Thu Oct 24 09:46:37 2024
+++ src/sys/arch/riscv/dts/jh7100.dtsi Thu Oct 24 12:03:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: jh7100.dtsi,v 1.1 2024/10/24 09:46:37 skrll Exp $ */
+/* $NetBSD: jh7100.dtsi,v 1.2 2024/10/24 12:03:16 skrll Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -29,6 +29,61 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "../../../external/gpl2/dts/dist/include/dt-bindings/clock/starfive-jh7100-audio.h"
+
+/ {
+ soc {
+ audclk: clock-controller@10480000 {
+ compatible = "starfive,jh7100-audclk";
+ reg = <0x0 0x10480000 0x0 0x10000>;
+ clocks = <&clkgen JH7100_CLK_AUDIO_SRC>,
+ <&clkgen JH7100_CLK_AUDIO_12288>,
+ <&clkgen JH7100_CLK_DOM7AHB_BUS>;
+ clock-names = "audio_src", "audio_12288", "dom7ahb_bus";
+ #clock-cells = <1>;
+ };
+
+ audrst: reset-controller@10490000 {
+ compatible = "starfive,jh7100-audrst";
+ reg = <0x0 0x10490000 0x0 0x10000>;
+ #reset-cells = <1>;
+ };
+
+ sysaudio: syscon@104a0000 {
+ compatible = "starfive,jh7100-sysaudio", "syscon";
+ reg = <0x0 0x104a0000 0x0 0x10000>;
+ };
+
+ usb3: usb@104c0000 {
+ compatible = "starfive,jh7100-usb";
+ ranges = <0x0 0x0 0x104c0000 0x100000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ clocks = <&audclk JH7100_AUDCLK_USB_LPM>,
+ <&audclk JH7100_AUDCLK_USB_STB>,
+ <&clkgen JH7100_CLK_USB_AXI>,
+ <&clkgen JH7100_CLK_USBNOC_AXI>;
+ clock-names = "lpm", "stb", "axi", "nocaxi";
+ resets = <&rstgen JH7100_RSTN_USB_AXI>,
+ <&rstgen JH7100_RSTN_USBNOC_AXI>;
+ reset-names = "axi", "nocaxi";
+ starfive,syscon = <&sysaudio>;
+ status = "disabled";
+
+ usb_cdns3: usb@0 {
+ compatible = "cdns,usb3";
+ reg = <0x00000 0x10000>,
+ <0x10000 0x10000>,
+ <0x20000 0x10000>;
+ reg-names = "otg", "xhci", "dev";
+ interrupts = <44>, <52>, <43>;
+ interrupt-names = "host", "peripheral", "otg";
+ };
+ };
+ };
+};
+
+
&sdio0 {
max-frequency = <10000000>;
};
Added files:
Index: src/sys/arch/riscv/dts/jh7100-common.dtsi
diff -u /dev/null src/sys/arch/riscv/dts/jh7100-common.dtsi:1.1
--- /dev/null Thu Oct 24 12:03:16 2024
+++ src/sys/arch/riscv/dts/jh7100-common.dtsi Thu Oct 24 12:03:16 2024
@@ -0,0 +1,38 @@
+/* $NetBSD: jh7100-common.dtsi,v 1.1 2024/10/24 12:03:16 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2024 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+&usb3 {
+ status = "okay";
+};
+
+&usb_cdns3 {
+ dr_mode = "host";
+};
