CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Tue Aug 13 04:24:07 UTC 2024 Modified Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: apply a DTS change from upstream to reduce pwm frequency for the backlight. should fix buzzing sometimes seen with the display. do this as an override rather than patching the dts source. (tested with a hack to ensure that the new value is set in the configuration.) XXX: pullup-10, perhaps pullup-9. upstream commit message: arm64: dts: rockchip: Raise Pinebook Pro's panel backlight PWM frequency Increase the frequency of the PWM signal that drives the LED backlight of the Pinebook Pro's panel, from about 1.35 KHz (which equals to the PWM period of 740,740 ns), to exactly 8 kHz (which equals to the PWM period of 125,000 ns). Using a higher PWM frequency for the panel backlight, which reduces the flicker, can only be beneficial to the end users' eyes. On top of that, increasing the backlight PWM signal frequency reportedly eliminates the buzzing emitted from the Pinebook Pro's built-in speakers when certain backlight levels are set, which cause some weird interference with some of the components of the Pinebook Pro's audio chain. The old value for the backlight PWM period, i.e. 740,740 ns, is pretty much an arbitrary value that was selected during the very early bring-up of the Pinebook Pro, only because that value seemed to minimize horizontal line distortion on the display, which resulted from the old X.org drivers causing screen tearing when dragging windows around. That's no longer an issue, so there are no reasons to stick with the old PWM period value. The lower and the upper backlight PWM frequency limits for the Pinebook Pro's panel, according to its datasheet, are 200 Hz and 10 kHz, respectively. [1] These changes still leave some headroom, which may have some positive effects on the lifetime expectancy of the panel's backlight LEDs. [1] https://files.pine64.org/doc/datasheet/PinebookPro/NV140FHM-N49_Rev.P0_20160804_201710235838.pdf Fixes: 5a65505a6988 ("arm64: dts: rockchip: Add initial support for Pinebook Pro") Cc: sta...@vger.kernel.org Reported-by: Nikola Radojevic Signed-off-by: Dragan Simic Tested-by: Nikola Radojevi# Link: https://lore.kernel.org/r/2a23b6cfd8c0513e5b233b4006ee3d3ed09b824f.1722805655.git.dsi...@manjaro.org Signed-off-by: Heiko Stuebner To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts 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/arm/dts/rk3399-pinebook-pro.dts diff -u src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.7 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.8 --- src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.7 Thu Sep 14 12:27:55 2023 +++ src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Tue Aug 13 04:24:07 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399-pinebook-pro.dts,v 1.7 2023/09/14 12:27:55 rjs Exp $ */ +/* $NetBSD: rk3399-pinebook-pro.dts,v 1.8 2024/08/13 04:24:07 mrg Exp $ */ /*- * Copyright (c) 2023 Robert Swindells @@ -28,3 +28,9 @@ #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts" #include "rk3399-crypto.dtsi" + +/ { + backlight: edp-backlight { + pwms = <&pwm0 0 125000 0>; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Tue Aug 13 04:24:07 UTC 2024 Modified Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: apply a DTS change from upstream to reduce pwm frequency for the backlight. should fix buzzing sometimes seen with the display. do this as an override rather than patching the dts source. (tested with a hack to ensure that the new value is set in the configuration.) XXX: pullup-10, perhaps pullup-9. upstream commit message: arm64: dts: rockchip: Raise Pinebook Pro's panel backlight PWM frequency Increase the frequency of the PWM signal that drives the LED backlight of the Pinebook Pro's panel, from about 1.35 KHz (which equals to the PWM period of 740,740 ns), to exactly 8 kHz (which equals to the PWM period of 125,000 ns). Using a higher PWM frequency for the panel backlight, which reduces the flicker, can only be beneficial to the end users' eyes. On top of that, increasing the backlight PWM signal frequency reportedly eliminates the buzzing emitted from the Pinebook Pro's built-in speakers when certain backlight levels are set, which cause some weird interference with some of the components of the Pinebook Pro's audio chain. The old value for the backlight PWM period, i.e. 740,740 ns, is pretty much an arbitrary value that was selected during the very early bring-up of the Pinebook Pro, only because that value seemed to minimize horizontal line distortion on the display, which resulted from the old X.org drivers causing screen tearing when dragging windows around. That's no longer an issue, so there are no reasons to stick with the old PWM period value. The lower and the upper backlight PWM frequency limits for the Pinebook Pro's panel, according to its datasheet, are 200 Hz and 10 kHz, respectively. [1] These changes still leave some headroom, which may have some positive effects on the lifetime expectancy of the panel's backlight LEDs. [1] https://files.pine64.org/doc/datasheet/PinebookPro/NV140FHM-N49_Rev.P0_20160804_201710235838.pdf Fixes: 5a65505a6988 ("arm64: dts: rockchip: Add initial support for Pinebook Pro") Cc: sta...@vger.kernel.org Reported-by: Nikola Radojevic Signed-off-by: Dragan Simic Tested-by: Nikola Radojevi# Link: https://lore.kernel.org/r/2a23b6cfd8c0513e5b233b4006ee3d3ed09b824f.1722805655.git.dsi...@manjaro.org Signed-off-by: Heiko Stuebner To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: rjs Date: Thu Sep 14 12:27:55 UTC 2023 Added Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: Enable crypto engine on Pinebook Pro. Only used for rng at present. To generate a diff of this commit: cvs rdiff -u -r0 -r1.7 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/rk3399-pinebook-pro.dts diff -u /dev/null src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.7 --- /dev/null Thu Sep 14 12:27:56 2023 +++ src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Thu Sep 14 12:27:55 2023 @@ -0,0 +1,30 @@ +/* $NetBSD: rk3399-pinebook-pro.dts,v 1.7 2023/09/14 12:27:55 rjs Exp $ */ + +/*- + * Copyright (c) 2023 Robert Swindells + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts" +#include "rk3399-crypto.dtsi"
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: rjs Date: Thu Sep 14 12:27:55 UTC 2023 Added Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: Enable crypto engine on Pinebook Pro. Only used for rng at present. To generate a diff of this commit: cvs rdiff -u -r0 -r1.7 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bouyer Date: Tue Sep 12 12:56:21 UTC 2023 Modified Files: src/sys/arch/arm/dts: sun8i-h3-orangepi-plus2e.dts Removed Files: src/sys/arch/arm/dts: sun8i-h3-orangepi-one.dts Log Message: Remove now-unneeded and brocken (probably since dts-5.15 import) sun8i-h3-orangepi-one.dts, and let the build use the one from sys/external. Problem reported and fix tested by Dave Tyson as reported on port-arm@ While there remove #include "sun8i-h3.dtsi" from sun8i-h3-orangepi-plus2e.dts, this file has been removed with the dts-5.15 import. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts 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/arm/dts/sun8i-h3-orangepi-plus2e.dts diff -u src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.5 --- src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 Tue May 21 22:31:39 2019 +++ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Tue Sep 12 12:56:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */ +/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.5 2023/09/12 12:56:21 bouyer Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -27,7 +27,6 @@ */ #include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts" -#include "sun8i-h3.dtsi" / { cpus {
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bouyer Date: Tue Sep 12 12:56:21 UTC 2023 Modified Files: src/sys/arch/arm/dts: sun8i-h3-orangepi-plus2e.dts Removed Files: src/sys/arch/arm/dts: sun8i-h3-orangepi-one.dts Log Message: Remove now-unneeded and brocken (probably since dts-5.15 import) sun8i-h3-orangepi-one.dts, and let the build use the one from sys/external. Problem reported and fix tested by Dave Tyson as reported on port-arm@ While there remove #include "sun8i-h3.dtsi" from sun8i-h3-orangepi-plus2e.dts, this file has been removed with the dts-5.15 import. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: gutteridge Date: Thu Aug 31 01:23:55 UTC 2023 Added Files: src/sys/arch/arm/dts: rk3328-nanopi-r2s.dts Log Message: Enable rkv1crypto on nanopi-r2s Follow the example of rock64. Tested by myself. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/rk3328-nanopi-r2s.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: gutteridge Date: Thu Aug 31 01:23:55 UTC 2023 Added Files: src/sys/arch/arm/dts: rk3328-nanopi-r2s.dts Log Message: Enable rkv1crypto on nanopi-r2s Follow the example of rock64. Tested by myself. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/rk3328-nanopi-r2s.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/rk3328-nanopi-r2s.dts diff -u /dev/null src/sys/arch/arm/dts/rk3328-nanopi-r2s.dts:1.1 --- /dev/null Thu Aug 31 01:23:55 2023 +++ src/sys/arch/arm/dts/rk3328-nanopi-r2s.dts Thu Aug 31 01:23:55 2023 @@ -0,0 +1,32 @@ +/* $NetBSD: rk3328-nanopi-r2s.dts,v 1.1 2023/08/31 01:23:55 gutteridge Exp $ */ + +/*- + * Copyright (c) 2023 David H. Gutteridge + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +/* Include the crypto block in RK3328. */ + +#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts" +#include "rk3328-crypto.dtsi"
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: rjs Date: Wed Aug 30 21:26:05 UTC 2023 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Re-enable the fan. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/rk3399-rockpro64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: rjs Date: Wed Aug 30 21:26:05 UTC 2023 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Re-enable the fan. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/rk3399-rockpro64.dts 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/arm/dts/rk3399-rockpro64.dts diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.14 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.15 --- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.14 Sun Nov 7 17:11:43 2021 +++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Wed Aug 30 21:26:05 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399-rockpro64.dts,v 1.14 2021/11/07 17:11:43 jmcneill Exp $ */ +/* $NetBSD: rk3399-rockpro64.dts,v 1.15 2023/08/30 21:26:05 rjs Exp $ */ /*- * Copyright (c) 2019,2021 Jared McNeill @@ -113,6 +113,10 @@ }; }; + fan: pwm-fan { + cooling-levels = <0 100 150 200 255>; + }; + #if 0 edp@ff97 { status = "okay";
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: nia Date: Wed Mar 1 21:07:57 UTC 2023 Modified Files: src/sys/arch/arm/dts: omap3-beagle-xm.dts Log Message: delete attribution per request of contributor To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/omap3-beagle-xm.dts 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/arm/dts/omap3-beagle-xm.dts diff -u src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.2 src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.3 --- src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.2 Thu Mar 5 14:24:46 2020 +++ src/sys/arch/arm/dts/omap3-beagle-xm.dts Wed Mar 1 21:07:57 2023 @@ -1,12 +1,9 @@ -/* $NetBSD: omap3-beagle-xm.dts,v 1.2 2020/03/05 14:24:46 tnn Exp $ */ +/* $NetBSD: omap3-beagle-xm.dts,v 1.3 2023/03/01 21:07:57 nia Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Sevan Janiyan - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met:
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: nia Date: Wed Mar 1 21:07:57 UTC 2023 Modified Files: src/sys/arch/arm/dts: omap3-beagle-xm.dts Log Message: delete attribution per request of contributor To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/omap3-beagle-xm.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Sun Mar 13 19:32:07 UTC 2022 Removed Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: don't disable the spi any more. it works fine (and i'm booting from it on one pbp directly to nvme.) To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Sun Mar 13 19:32:07 UTC 2022 Removed Files: src/sys/arch/arm/dts: rk3399-pinebook-pro.dts Log Message: don't disable the spi any more. it works fine (and i'm booting from it on one pbp directly to nvme.) To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 7 17:11:43 UTC 2021 Modified Files: src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi rk3399-pinebook-pro.dts rk3399-rockpro64.dts sun50i-a64-pine64-plus.dts sun50i-a64-pinebook.dts sun50i-a64-sopine-baseboard.dts sun50i-a64.dtsi sun7i-a20-olinuxino-lime2-emmc-spi.dts sun8i-a83t.dtsi sun8i-h3-nanopi-neo.dts Removed Files: src/sys/arch/arm/dts: meson-g12b-odroid-n2-plus.dts rk3328-rock64.dts rk3328.dtsi sun50i-h5-libretech-all-h3-cc.dts sun50i-h5-nanopi-neo-plus2.dts sun50i-h5.dtsi sun50i-h6-orangepi-lite2.dts sun8i-h3-nanopi-duo2.dts sun8i-h3-nanopi-m1.dts sun8i-h3-nanopi-r1.dts sun8i-h3.dtsi Log Message: arm: dts: adapt for dts-5.15 To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/dts/meson-g12b-odroid-n2-plus.dts \ src/sys/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts \ src/sys/arch/arm/dts/sun50i-h6-orangepi-lite2.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/meson8b-odroidc1.dts \ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/meson8b.dtsi cvs rdiff -u -r1.6 -r0 src/sys/arch/arm/dts/rk3328-rock64.dts \ src/sys/arch/arm/dts/sun8i-h3.dtsi cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/dts/rk3328.dtsi \ src/sys/arch/arm/dts/sun50i-h5.dtsi cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/dts/rk3399-rockpro64.dts cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts \ src/sys/arch/arm/dts/sun8i-a83t.dtsi cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/sun50i-a64.dtsi cvs rdiff -u -r1.4 -r0 src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts cvs rdiff -u -r1.1 -r1.2 \ src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-nanopi-m1.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts 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/arm/dts/meson8b-odroidc1.dts diff -u src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.5 src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.6 --- src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.5 Thu Mar 5 14:24:46 2020 +++ src/sys/arch/arm/dts/meson8b-odroidc1.dts Sun Nov 7 17:11:43 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: meson8b-odroidc1.dts,v 1.5 2020/03/05 14:24:46 tnn Exp $ */ +/* $NetBSD: meson8b-odroidc1.dts,v 1.6 2021/11/07 17:11:43 jmcneill Exp $ */ /*- - * Copyright (c) 2019 Jared McNeill + * Copyright (c) 2019,2021 Jared McNeill * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,11 +34,6 @@ }; &sdhc { - status = "okay"; - - pinctrl-0 = <&sdxc_c_pins>; - pinctrl-names = "default"; - /* eMMC card */ emmc_card_slot: slot@2 { compatible = "mmc-slot"; @@ -52,13 +47,3 @@ disable-wp; }; }; - -ðmac { - /delete-property/ snps,reset-gpio; - /delete-property/ snps,reset-active-low; - /delete-property/ snps,reset-delays-us; -}; - -&cpu0 { - /delete-property/ cpu-supply; -}; Index: src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts diff -u src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.5 src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.6 --- src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.5 Tue Aug 10 16:52:43 2021 +++ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts Sun Nov 7 17:11:43 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.5 2021/08/10 16:52:43 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.6 2021/11/07 17:11:43 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -36,16 +36,3 @@ &sound_hdmi { status = "okay"; }; - -&cpu0 { -cpu-supply = <®_dcdc2>; -operating-points = < -/* kHzuV */ -1152000 130 -1104000 126 -1008000 120 -816000 108 -648000 104 -408000 100 ->; -}; Index: src/sys/arch/arm/dts/meson8b.dtsi diff -u src/sys/arch/arm/dts/meson8b.dtsi:1.7 src/sys/arch/arm/dts/meson8b.dtsi:1.8 --- src/sys/arch/arm/dts/meson8b.dtsi:1.7 Wed Aug 14 09:54:34 2019 +++ src/sys/arch/arm/dts/meson8b.dtsi Sun Nov 7 17:11:43 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: meson8b.dtsi,v 1.7 2019/08/14 09:54:34 jmcneill Exp $ */ +/* $NetBSD: meson8b.dtsi,v 1.8 2021/11/07 17:11:43 jmcneill Exp $ */ /*- - * Copyright (c) 2019 Jared McNeill + * Copyright (c) 2019,2021 Jared McNeill * All rights reserved. * * Redistribution and use in source and binary forms, with or wi
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 7 17:11:43 UTC 2021 Modified Files: src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi rk3399-pinebook-pro.dts rk3399-rockpro64.dts sun50i-a64-pine64-plus.dts sun50i-a64-pinebook.dts sun50i-a64-sopine-baseboard.dts sun50i-a64.dtsi sun7i-a20-olinuxino-lime2-emmc-spi.dts sun8i-a83t.dtsi sun8i-h3-nanopi-neo.dts Removed Files: src/sys/arch/arm/dts: meson-g12b-odroid-n2-plus.dts rk3328-rock64.dts rk3328.dtsi sun50i-h5-libretech-all-h3-cc.dts sun50i-h5-nanopi-neo-plus2.dts sun50i-h5.dtsi sun50i-h6-orangepi-lite2.dts sun8i-h3-nanopi-duo2.dts sun8i-h3-nanopi-m1.dts sun8i-h3-nanopi-r1.dts sun8i-h3.dtsi Log Message: arm: dts: adapt for dts-5.15 To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/dts/meson-g12b-odroid-n2-plus.dts \ src/sys/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts \ src/sys/arch/arm/dts/sun50i-h6-orangepi-lite2.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/meson8b-odroidc1.dts \ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/meson8b.dtsi cvs rdiff -u -r1.6 -r0 src/sys/arch/arm/dts/rk3328-rock64.dts \ src/sys/arch/arm/dts/sun8i-h3.dtsi cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/dts/rk3328.dtsi \ src/sys/arch/arm/dts/sun50i-h5.dtsi cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/dts/rk3399-rockpro64.dts cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts \ src/sys/arch/arm/dts/sun8i-a83t.dtsi cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/sun50i-a64.dtsi cvs rdiff -u -r1.4 -r0 src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts cvs rdiff -u -r1.1 -r1.2 \ src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-nanopi-m1.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts/overlays
Module Name:src Committed By: thorpej Date: Thu Aug 26 00:00:35 UTC 2021 Added Files: src/sys/arch/arm/dts/overlays: sunxi-h3-h5-nanopi-neo-nas-dock.dts Log Message: Device tree overlay for the FriendlyARM NanoPi NAS Dock for the NanoPi NEO, NEO Air, and NEO2. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-nanopi-neo-nas-dock.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/overlays/sunxi-h3-h5-nanopi-neo-nas-dock.dts diff -u /dev/null src/sys/arch/arm/dts/overlays/sunxi-h3-h5-nanopi-neo-nas-dock.dts:1.1 --- /dev/null Thu Aug 26 00:00:35 2021 +++ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-nanopi-neo-nas-dock.dts Thu Aug 26 00:00:35 2021 @@ -0,0 +1,98 @@ +/* $NetBSD: sunxi-h3-h5-nanopi-neo-nas-dock.dts,v 1.1 2021/08/26 00:00:35 thorpej Exp $ */ + +/*- + * Copyright (c) 2021 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe. + * + * 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. + */ + +/* + * Overlay for the FriendlyARM NanoPi NAS Dock for the NanoPi NEO, NEO Air, + * and NEO2. + */ + +/dts-v1/; +/plugin/; + +/ { + compatible = "friendlyarm,nanopi-neo2", "friendlyarm,nanopi-neo-air", + "friendlyarm,nanopi-neo"; + + /* ohci1/ehci1 is brought out to a connector on the board. */ + fragment@0 { + target = <&ehci1>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&ohci1>; + __overlay__ { + status = "okay"; + }; + }; + + /* ohci2/ehci2 has the JM20329 USB2->SATA bridge. */ + fragment@2 { + target = <&ehci2>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&ohci2>; + __overlay__ { + status = "okay"; + }; + }; + + /* i2c0 has the DS1307 real time clock chip. */ + fragment@4 { + target = <&i2c0>; + __overlay__ { + status = "okay"; + + dock_rtc: rtc@68 { +compatible = "dallas,ds1307"; +reg = <0x68>; + }; + }; + }; + + /* + * Alias rtc0 to the DS1307 so the kernel will use it + * instead of the built-in RTC on the SoC (which is not + * battery-backed). + */ + fragment@5 { + target-path = "/aliases"; + __overlay__ { + rtc0 = &dock_rtc; + }; + }; +};
CVS commit: src/sys/arch/arm/dts/overlays
Module Name:src Committed By: thorpej Date: Thu Aug 26 00:00:35 UTC 2021 Added Files: src/sys/arch/arm/dts/overlays: sunxi-h3-h5-nanopi-neo-nas-dock.dts Log Message: Device tree overlay for the FriendlyARM NanoPi NAS Dock for the NanoPi NEO, NEO Air, and NEO2. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-nanopi-neo-nas-dock.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 24 02:06:16 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pinebook.dts Log Message: Enable HDMI and HDMI audio To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 24 02:06:16 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pinebook.dts Log Message: Enable HDMI and HDMI audio To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts 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/arm/dts/sun50i-a64-pinebook.dts diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.17 --- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16 Thu Jun 6 23:19:45 2019 +++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Sun Nov 24 02:06:16 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-pinebook.dts,v 1.16 2019/06/06 23:19:45 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-pinebook.dts,v 1.17 2019/11/24 02:06:16 jmcneill Exp $ */ /*- * Copyright (c) 2017-2019 Jared McNeill @@ -54,6 +54,17 @@ sound_spdif { status = "disabled"; }; + + hdmi-connector { + compatible = "hdmi-connector"; + type = "c"; + + port { + hdmi_con_in: endpoint { +remote-endpoint = <&hdmi_out_con>; + }; + }; + }; }; &cpu0 { @@ -151,3 +162,28 @@ }; }; }; + +®_dldo1 { + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + regulator-name = "vcc-hdmi"; +}; + +&hdmi { + hvcc-supply = <®_dldo1>; + status = "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&i2s2 { + status = "okay"; +}; + +&sound_hdmi { + status = "okay"; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 17 17:35:10 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pine64-plus.dts sun50i-a64-pine64.dts sun50i-a64-sopine-baseboard.dts sun50i-a64.dtsi Log Message: Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun50i-a64-pine64.dts \ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/dts/sun50i-a64.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Nov 17 17:35:10 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pine64-plus.dts sun50i-a64-pine64.dts sun50i-a64-sopine-baseboard.dts sun50i-a64.dtsi Log Message: Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun50i-a64-pine64.dts \ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/dts/sun50i-a64.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/arm/dts/sun50i-a64-pine64-plus.dts diff -u src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.2 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.3 --- src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.2 Sat Sep 9 12:05:28 2017 +++ src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts Sun Nov 17 17:35:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.2 2017/09/09 12:05:28 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.3 2019/11/17 17:35:10 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -49,3 +49,11 @@ &ohci0 { status = "okay"; }; + +&i2s2 { + status = "okay"; +}; + +&sound_hdmi { + status = "okay"; +}; Index: src/sys/arch/arm/dts/sun50i-a64-pine64.dts diff -u src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1 src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.2 --- src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1 Sun Feb 18 12:20:25 2018 +++ src/sys/arch/arm/dts/sun50i-a64-pine64.dts Sun Nov 17 17:35:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-pine64.dts,v 1.1 2018/02/18 12:20:25 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-pine64.dts,v 1.2 2019/11/17 17:35:10 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,3 +28,11 @@ #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts" #include "sun50i-a64.dtsi" + +&i2s2 { + status = "okay"; +}; + +&sound_hdmi { + status = "okay"; +}; Index: src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts diff -u src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.1 src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.2 --- src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.1 Thu Jun 7 00:51:41 2018 +++ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts Sun Nov 17 17:35:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.1 2018/06/07 00:51:41 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.2 2019/11/17 17:35:10 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,3 +28,11 @@ #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts" #include "sun50i-a64.dtsi" + +&i2s2 { + status = "okay"; +}; + +&sound_hdmi { + status = "okay"; +}; Index: src/sys/arch/arm/dts/sun50i-a64.dtsi diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.12 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.13 --- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.12 Fri Nov 8 11:12:09 2019 +++ src/sys/arch/arm/dts/sun50i-a64.dtsi Sun Nov 17 17:35:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64.dtsi,v 1.12 2019/11/08 11:12:09 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64.dtsi,v 1.13 2019/11/17 17:35:10 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -59,6 +59,36 @@ , ; }; + + i2s2: i2s@1c22800 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun50i-a64-i2s", + "allwinner,sun8i-h3-i2s"; + reg = <0x01c22800 0x400>; + interrupts = ; + clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; + clock-names = "apb", "mod"; + resets = <&ccu RST_BUS_I2S2>; + dma-names = "tx"; + dmas = <&dma 27>; + status = "disabled"; + }; + + sound_hdmi: sound-hdmi { + compatible = "simple-audio-card"; + simple-audio-card,name = "hdmi-audio"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + status = "disabled"; + + simple-audio-card,cpu { + sound-dai = <&i2s2>; + }; + + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + }; }; &cpu0 {
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sat Nov 16 13:24:25 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Enable HDMI audio on ROCKPro64 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/dts/rk3399-rockpro64.dts 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/arm/dts/rk3399-rockpro64.dts diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.8 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.9 --- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.8 Tue Aug 13 17:24:25 2019 +++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Sat Nov 16 13:24:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399-rockpro64.dts,v 1.8 2019/08/13 17:24:25 tnn Exp $ */ +/* $NetBSD: rk3399-rockpro64.dts,v 1.9 2019/11/16 13:24:25 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -88,3 +88,7 @@ status = "okay"; }; }; + +&hdmi_sound { + status = "okay"; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sat Nov 16 13:24:25 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Enable HDMI audio on ROCKPro64 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/dts/rk3399-rockpro64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Fri Nov 8 11:12:09 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64.dtsi Log Message: Fix PMU interrupt numbers on Allwinner A64. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/sun50i-a64.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/arm/dts/sun50i-a64.dtsi diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.12 --- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11 Thu Jun 6 23:19:45 2019 +++ src/sys/arch/arm/dts/sun50i-a64.dtsi Fri Nov 8 11:12:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64.dtsi,v 1.11 2019/06/06 23:19:45 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64.dtsi,v 1.12 2019/11/08 11:12:09 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -51,6 +51,14 @@ #thermal-sensor-cells = <0>; }; }; + + /* PMU interrupt numbers are wrong in mainline dts */ + pmu { + interrupts = , + , + , + ; + }; }; &cpu0 {
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Fri Nov 8 11:12:09 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64.dtsi Log Message: Fix PMU interrupt numbers on Allwinner A64. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/sun50i-a64.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu Oct 31 17:09:13 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-n900.dts Log Message: Use dss as console on Nokia N900. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-n900.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/omap3-n900.dts diff -u /dev/null src/sys/arch/arm/dts/omap3-n900.dts:1.1 --- /dev/null Thu Oct 31 17:09:13 2019 +++ src/sys/arch/arm/dts/omap3-n900.dts Thu Oct 31 17:09:13 2019 @@ -0,0 +1,35 @@ +/* $NetBSD: omap3-n900.dts,v 1.1 2019/10/31 17:09:13 jmcneill Exp $ */ + +/*- + * Copyright (c) 2019 Jared McNeill + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +#include_next "omap3-n900.dts" + +/ { + chosen { + stdout-path = &dss; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu Oct 31 17:09:13 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-n900.dts Log Message: Use dss as console on Nokia N900. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-n900.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: sevan Date: Thu Oct 31 01:25:56 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-beagle-xm.dts Log Message: Set the stdout-path on xM like Ti OMAP3 BeagleBoard To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle-xm.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: sevan Date: Thu Oct 31 01:25:56 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-beagle-xm.dts Log Message: Set the stdout-path on xM like Ti OMAP3 BeagleBoard To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle-xm.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/omap3-beagle-xm.dts diff -u /dev/null src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.1 --- /dev/null Thu Oct 31 01:25:56 2019 +++ src/sys/arch/arm/dts/omap3-beagle-xm.dts Thu Oct 31 01:25:56 2019 @@ -0,0 +1,38 @@ +/* $NetBSD: omap3-beagle-xm.dts,v 1.1 2019/10/31 01:25:56 sevan Exp $ */ + +/*- + * Copyright (c) 2008 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Sevan Janiyan + * + * 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. + */ + +#include_next "omap3-beagle-xm.dts" + +/ { + chosen { + stdout-path = &uart3; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue Oct 29 22:18:28 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-beagle.dts Log Message: Set stdout-path on TI OMAP3 BeagleBoard To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue Oct 29 22:18:28 UTC 2019 Added Files: src/sys/arch/arm/dts: omap3-beagle.dts Log Message: Set stdout-path on TI OMAP3 BeagleBoard To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/omap3-beagle.dts diff -u /dev/null src/sys/arch/arm/dts/omap3-beagle.dts:1.1 --- /dev/null Tue Oct 29 22:18:29 2019 +++ src/sys/arch/arm/dts/omap3-beagle.dts Tue Oct 29 22:18:28 2019 @@ -0,0 +1,35 @@ +/* $NetBSD: omap3-beagle.dts,v 1.1 2019/10/29 22:18:28 jmcneill Exp $ */ + +/*- + * Copyright (c) 2019 Jared McNeill + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +#include_next "omap3-beagle.dts" + +/ { + chosen { + stdout-path = &uart3; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: aymeric Date: Tue Oct 22 18:43:14 UTC 2019 Modified Files: src/sys/arch/arm/dts: socfpga_cyclone5_de0_nano_soc.dts Log Message: Disable private timer whose new driver clashes with the global timer's one. Stopgap measure to make the DE0 Nano Soc work again, targeted for netbsd-9 pullup. We'll see later if we switch to using the private timer. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts 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/arm/dts/socfpga_cyclone5_de0_nano_soc.dts diff -u src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts:1.2 src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts:1.3 --- src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts:1.2 Tue Jan 22 15:30:57 2019 +++ src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts Tue Oct 22 18:43:14 2019 @@ -4,6 +4,10 @@ / { soc { + timer@fffec600 { + status = "disabled"; + }; + gtimer@fffec200 { compatible = "arm,cortex-a9-global-timer"; reg = <0xfffec200 0x20>;
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: aymeric Date: Tue Oct 22 18:43:14 UTC 2019 Modified Files: src/sys/arch/arm/dts: socfpga_cyclone5_de0_nano_soc.dts Log Message: Disable private timer whose new driver clashes with the global timer's one. Stopgap measure to make the DE0 Nano Soc work again, targeted for netbsd-9 pullup. We'll see later if we switch to using the private timer. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts/overlays
Module Name:src Committed By: thorpej Date: Sun Oct 20 23:47:14 UTC 2019 Added Files: src/sys/arch/arm/dts/overlays: sunxi-h3-h5-orangepi-zero-nas.dts Log Message: Add a device tree Overlay for the Orange Pi Zero NAS expansion board for Orange Pi Zero and Orange Pi Zero Plus. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-orangepi-zero-nas.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts/overlays
Module Name:src Committed By: thorpej Date: Sun Oct 20 23:47:14 UTC 2019 Added Files: src/sys/arch/arm/dts/overlays: sunxi-h3-h5-orangepi-zero-nas.dts Log Message: Add a device tree Overlay for the Orange Pi Zero NAS expansion board for Orange Pi Zero and Orange Pi Zero Plus. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-orangepi-zero-nas.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/overlays/sunxi-h3-h5-orangepi-zero-nas.dts diff -u /dev/null src/sys/arch/arm/dts/overlays/sunxi-h3-h5-orangepi-zero-nas.dts:1.1 --- /dev/null Sun Oct 20 23:47:14 2019 +++ src/sys/arch/arm/dts/overlays/sunxi-h3-h5-orangepi-zero-nas.dts Sun Oct 20 23:47:14 2019 @@ -0,0 +1,56 @@ +/* $NetBSD: sunxi-h3-h5-orangepi-zero-nas.dts,v 1.1 2019/10/20 23:47:14 thorpej Exp $ */ + +/*- + * Copyright (c) 2019 Jason R Thorpe + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +/* + * Overlay for the Orange Pi Zero NAS expansion board for Orange Pi Zero + * and Orange Pi Zero Plus. + * + * https://www.aliexpress.com/item/Orange-Pi-Zero-NAS-Expansion-board-Interface-board-Development-board-beyond-Raspberry-Pi/32789632568.html + */ + +/dts-v1/; +/plugin/; + +/ { + compatible = "xunlong,orangepi-zero-plus", "xunlong,orangepi-zero"; + + /* ohci2/ehci2 has the JMS578 USB2->SATA bridge. */ + fragment@0 { + target = <&ehci2>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&ohci2>; + __overlay__ { + status = "okay"; + }; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bad Date: Tue Oct 8 23:00:36 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-r1.dts Log Message: Cherry pick a few changes from the armbian u-boot patch. Makes my NanoPi R1 boot reliably. >From >https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nano+pi-r1-and-duo2.patch To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bad Date: Tue Oct 8 23:00:36 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-r1.dts Log Message: Cherry pick a few changes from the armbian u-boot patch. Makes my NanoPi R1 boot reliably. >From >https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nano+pi-r1-and-duo2.patch To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts 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/arm/dts/sun8i-h3-nanopi-r1.dts diff -u src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.1 src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.2 --- src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.1 Tue Oct 8 22:55:58 2019 +++ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Tue Oct 8 23:00:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i-h3-nanopi-r1.dts,v 1.1 2019/10/08 22:55:58 bad Exp $ */ +/* $NetBSD: sun8i-h3-nanopi-r1.dts,v 1.2 2019/10/08 23:00:36 bad Exp $ */ /* * Copyright (C) 2019 Igor Pecovnik @@ -63,6 +63,7 @@ reg_gmac_3v3: gmac-3v3 { compatible = "regulator-fixed"; + pinctrl-names = "default"; regulator-name = "gmac-3v3"; regulator-min-microvolt = <330>; regulator-max-microvolt = <330>; @@ -129,6 +130,15 @@ }; }; +#if 0 /* XXX u-boot dts for NanoPi R1 has this but not needed? */ +&pio { + gmac_power_pin_nanopi: gmac_power_pin@0 { + pins = "PD6"; + function = "gpio_out"; + }; +}; +#endif + &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; @@ -170,6 +180,11 @@ vqmmc-supply = <®_vcc3v3>; bus-width = <8>; non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&ehci0 { status = "okay"; };
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bad Date: Tue Oct 8 22:55:59 UTC 2019 Added Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-duo2.dts sun8i-h3-nanopi-r1.dts Log Message: Add sun8i-h3-nanopi-r1.dts and sun8i-h3-nanopi-duo2.dts. >From >https://github.com/armbian/build/blob/master/patch/kernel/sunxi-next/xxx-add-nanopi-r1-and-duo2.patch To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: bad Date: Tue Oct 8 22:55:59 UTC 2019 Added Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-duo2.dts sun8i-h3-nanopi-r1.dts Log Message: Add sun8i-h3-nanopi-r1.dts and sun8i-h3-nanopi-duo2.dts. >From >https://github.com/armbian/build/blob/master/patch/kernel/sunxi-next/xxx-add-nanopi-r1-and-duo2.patch To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts \ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts diff -u /dev/null src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts:1.1 --- /dev/null Tue Oct 8 22:55:59 2019 +++ src/sys/arch/arm/dts/sun8i-h3-nanopi-duo2.dts Tue Oct 8 22:55:58 2019 @@ -0,0 +1,99 @@ +/* $NetBSD: sun8i-h3-nanopi-duo2.dts,v 1.1 2019/10/08 22:55:58 bad Exp $ */ + +/* + * Copyright (C) 2019 Igor + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "sun8i-h3-nanopi.dtsi" + +/ { + model = "FriendlyElec NanoPi-Duo2"; + compatible = "friendlyarm,nanopi-duo2", "allwinner,sun8i-h3"; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + post-power-on-delay-ms = <200>; + }; + +}; + +&r_pio { + wifi_en_npi: wifi_en_pin { + pins = "PL7"; + function = "gpio_out"; + }; +}; + +&mmc1 { + vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; + + sdio_wifi: sdio_wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + interrupt-parent = <&pio>; + interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ + interrupt-names = "host-wake"; + }; + +}; + +&emac { + phy-handle = <&int_mii_phy>; + phy-mode = "mii"; + allwinner,leds-active-low; + status = "okay"; +}; + +&usb_otg { + dr_mode = "peripheral"; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; Index: src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts diff -u /dev/null src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.1 --- /dev/null Tue Oct 8 22:55:59 2019 +++ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts Tue Oct 8 22:55:58 2019 @@ -0,0 +1,191 @@ +/* $NetBSD: sun8i-h3-nanopi-r1.dts,v 1.1 2019/10/08 22:55:58 bad Exp $ */ + +/* + * Copyright (C) 2019 Igor Pecovnik + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warr
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Fri Oct 4 00:04:28 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-h5-nanopi-neo-plus2.dts Log Message: Increase voltage for frequencies above 1GHz To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Fri Oct 4 00:04:28 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-h5-nanopi-neo-plus2.dts Log Message: Increase voltage for frequencies above 1GHz To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts 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/arm/dts/sun50i-h5-nanopi-neo-plus2.dts diff -u src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts:1.3 src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts:1.4 --- src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts:1.3 Mon Jul 2 17:13:15 2018 +++ src/sys/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts Fri Oct 4 00:04:28 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-h5-nanopi-neo-plus2.dts,v 1.3 2018/07/02 17:13:15 jakllsch Exp $ */ +/* $NetBSD: sun50i-h5-nanopi-neo-plus2.dts,v 1.4 2019/10/04 00:04:28 jmcneill Exp $ */ #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts" #include "sun50i-h5.dtsi" @@ -9,9 +9,9 @@ cpu-supply = <&vdd_cpux>; operating-points = < /* kHz uV */ -1152000 110 -1104000 110 -1008000 110 +1152000 130 +1104000 130 +1008000 130 816000 110 624000 110 >;
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Wed Aug 14 09:54:34 UTC 2019 Modified Files: src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi Log Message: Catch up to recent mainline dts changes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/meson8b-odroidc1.dts cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/dts/meson8b.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Wed Aug 14 09:54:34 UTC 2019 Modified Files: src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi Log Message: Catch up to recent mainline dts changes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/meson8b-odroidc1.dts cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/dts/meson8b.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/arm/dts/meson8b-odroidc1.dts diff -u src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.3 src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.4 --- src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.3 Sun Jan 20 00:44:01 2019 +++ src/sys/arch/arm/dts/meson8b-odroidc1.dts Wed Aug 14 09:54:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: meson8b-odroidc1.dts,v 1.3 2019/01/20 00:44:01 jmcneill Exp $ */ +/* $NetBSD: meson8b-odroidc1.dts,v 1.4 2019/08/14 09:54:34 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -52,3 +52,13 @@ disable-wp; }; }; + +ðmac { + /delete-property/ snps,reset-gpio; + /delete-property/ snps,reset-active-low; + /delete-property/ snps,reset-delays-us; +}; + +&cpu0 { + /delete-property/ cpu-supply; +}; Index: src/sys/arch/arm/dts/meson8b.dtsi diff -u src/sys/arch/arm/dts/meson8b.dtsi:1.6 src/sys/arch/arm/dts/meson8b.dtsi:1.7 --- src/sys/arch/arm/dts/meson8b.dtsi:1.6 Tue Aug 13 09:56:08 2019 +++ src/sys/arch/arm/dts/meson8b.dtsi Wed Aug 14 09:54:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: meson8b.dtsi,v 1.6 2019/08/13 09:56:08 skrll Exp $ */ +/* $NetBSD: meson8b.dtsi,v 1.7 2019/08/14 09:54:34 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#define CLKID_PERIPH 126 - / { genfb: fb@c8006000 { compatible = "amlogic,meson8b-fb"; @@ -36,84 +34,6 @@ <0xd010 0x10>; /* VPU */ status = "disabled"; }; - - cpu_opp_table: opp-table { - compatible = "operating-points-v2"; - opp-shared; - - opp-9600 { - opp-hz = /bits/ 64 <9600>; - opp-microvolt = <86>; - }; - opp-19200 { - opp-hz = /bits/ 64 <19200>; - opp-microvolt = <86>; - }; - opp-31200 { - opp-hz = /bits/ 64 <31200>; - opp-microvolt = <86>; - }; - opp-40800 { - opp-hz = /bits/ 64 <40800>; - opp-microvolt = <86>; - }; - opp-50400 { - opp-hz = /bits/ 64 <50400>; - opp-microvolt = <86>; - }; - opp-6 { - opp-hz = /bits/ 64 <6>; - opp-microvolt = <86>; - }; - opp-72000 { - opp-hz = /bits/ 64 <72000>; - opp-microvolt = <86>; - }; - opp-81600 { - opp-hz = /bits/ 64 <81600>; - opp-microvolt = <90>; - }; - opp-100800 { - opp-hz = /bits/ 64 <100800>; - opp-microvolt = <114>; - }; - opp-12 { - opp-hz = /bits/ 64 <12>; - opp-microvolt = <114>; - }; - opp-132000 { - opp-hz = /bits/ 64 <132000>; - opp-microvolt = <114>; - }; - opp-148800 { - opp-hz = /bits/ 64 <148800>; - opp-microvolt = <114>; - }; - opp-153600 { - opp-hz = /bits/ 64 <153600>; - opp-microvolt = <114>; - }; - }; -}; - -&cpu0 { - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -}; - -&cpu1 { - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -}; - -&cpu2 { - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -}; - -&cpu3 { - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; }; &pinctrl_cbus {
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: tnn Date: Tue Aug 13 17:24:25 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: rk3399-rockpro64.dts: enable spi1 and add spiflash as a child node To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/rk3399-rockpro64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: tnn Date: Tue Aug 13 17:24:25 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: rk3399-rockpro64.dts: enable spi1 and add spiflash as a child node To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/dts/rk3399-rockpro64.dts 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/arm/dts/rk3399-rockpro64.dts diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.7 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.8 --- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.7 Sun Jul 28 10:03:56 2019 +++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Tue Aug 13 17:24:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399-rockpro64.dts,v 1.7 2019/07/28 10:03:56 jmcneill Exp $ */ +/* $NetBSD: rk3399-rockpro64.dts,v 1.8 2019/08/13 17:24:25 tnn Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -79,3 +79,12 @@ vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; }; + +&spi1 { + status = "okay"; + spiflash { + compatible = "jedec,spi-nor"; + reg = <0>; + status = "okay"; + }; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Jul 28 10:03:56 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Set max link speed, remove assigned clocks To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/dts/rk3399-rockpro64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Sun Jul 28 10:03:56 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts Log Message: Set max link speed, remove assigned clocks To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/dts/rk3399-rockpro64.dts 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/arm/dts/rk3399-rockpro64.dts diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.6 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.7 --- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.6 Wed Jun 12 10:13:44 2019 +++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Sun Jul 28 10:03:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399-rockpro64.dts,v 1.6 2019/06/12 10:13:44 jmcneill Exp $ */ +/* $NetBSD: rk3399-rockpro64.dts,v 1.7 2019/07/28 10:03:56 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -71,12 +71,9 @@ }; &pcie0 { - assigned-clocks = <&cru SCLK_PCIEPHY_REF>; - assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>; - assigned-clock-rates = <1>; - ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; num-lanes = <4>; + max-link-speed = <2>; pinctrl-names = "default"; pinctrl-0 = <&pcie_clkreqn>; vpcie3v3-supply = <&vcc3v3_pcie>;
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu Jun 6 23:19:45 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pinebook.dts sun50i-a64.dtsi Log Message: Remove audio related nodes (they are present in mainline dts now) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/dts/sun50i-a64.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/arm/dts/sun50i-a64-pinebook.dts diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.15 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16 --- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.15 Sun Feb 3 13:19:20 2019 +++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Thu Jun 6 23:19:45 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64-pinebook.dts,v 1.15 2019/02/03 13:19:20 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64-pinebook.dts,v 1.16 2019/06/06 23:19:45 jmcneill Exp $ */ /*- * Copyright (c) 2017-2019 Jared McNeill @@ -91,18 +91,6 @@ status = "okay"; }; -&codec_analog { - status = "okay"; -}; - -&dai { - status = "okay"; -}; - -&sound { - status = "okay"; -}; - &de { status = "okay"; }; Index: src/sys/arch/arm/dts/sun50i-a64.dtsi diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.10 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11 --- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.10 Tue Jan 22 15:28:45 2019 +++ src/sys/arch/arm/dts/sun50i-a64.dtsi Thu Jun 6 23:19:45 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64.dtsi,v 1.10 2019/01/22 15:28:45 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64.dtsi,v 1.11 2019/06/06 23:19:45 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -40,53 +40,7 @@ }; }; - sound: sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "SUN50I Audio Card"; - simple-audio-card,format = "i2s"; - simple-audio-card,frame-master = <&cpudai>; - simple-audio-card,bitclock-master = <&cpudai>; - simple-audio-card,mclk-fs = <512>; - simple-audio-card,aux-devs = <&codec_analog>; - simple-audio-card,routing = -"Left DAC", "AIF1 Slot 0 Left", -"Right DAC", "AIF1 Slot 0 Right"; - status = "disabled"; - - cpudai: simple-audio-card,cpu { - sound-dai = <&dai>; - }; - - link_codec: simple-audio-card,codec { - sound-dai = <&codec>; - }; - }; - soc { - dai: dai@1c22c00 { - #sound-dai-cells = <0>; - compatible = "allwinner,sun50i-a64-acodec-i2s"; - reg = <0x01c22c00 0x200>; - interrupts = ; - clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; - clock-names = "apb", "mod"; - resets = <&ccu RST_BUS_CODEC>; - reset-names = "rst"; - dmas = <&dma 15>, <&dma 15>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - - codec: codec@1c22e00 { - #sound-dai-cells = <0>; - compatible = "allwinner,sun50i-a64-codec"; - reg = <0x01c22e00 0x600>; - interrupts = ; - clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; - clock-names = "bus", "mod"; - status = "disabled"; - }; - rtp: rtp@1c25000 { compatible = "allwinner,sun50i-a64-ts"; reg = <0x01c25000 0x400>; @@ -96,12 +50,6 @@ resets = <&ccu RST_BUS_THS>; #thermal-sensor-cells = <0>; }; - - codec_analog: codec-analog@1f015c0 { - compatible = "allwinner,sun50i-a64-codec-analog"; - reg = <0x01f015c0 0x4>; - status = "disabled"; - }; }; };
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu Jun 6 23:19:45 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pinebook.dts sun50i-a64.dtsi Log Message: Remove audio related nodes (they are present in mainline dts now) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/dts/sun50i-a64.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue May 28 21:57:21 UTC 2019 Added Files: src/sys/arch/arm/dts: sun9i-a80-cubieboard4.dts Log Message: Enable USB2 controllers on Cubieboard4. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun9i-a80-cubieboard4.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue May 28 21:57:21 UTC 2019 Added Files: src/sys/arch/arm/dts: sun9i-a80-cubieboard4.dts Log Message: Enable USB2 controllers on Cubieboard4. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun9i-a80-cubieboard4.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/dts/sun9i-a80-cubieboard4.dts diff -u /dev/null src/sys/arch/arm/dts/sun9i-a80-cubieboard4.dts:1.1 --- /dev/null Tue May 28 21:57:21 2019 +++ src/sys/arch/arm/dts/sun9i-a80-cubieboard4.dts Tue May 28 21:57:21 2019 @@ -0,0 +1,79 @@ +/* $NetBSD: sun9i-a80-cubieboard4.dts,v 1.1 2019/05/28 21:57:21 jmcneill Exp $ */ + +/*- + * Copyright (c) 2019 Jared McNeill + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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. + */ + +#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts" + +/ { + reg_usb1_vbus: usb1-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + regulator-min-microvolt = <500>; + regulator-max-microvolt = <500>; + enable-active-high; + gpio = <&pio 7 14 GPIO_ACTIVE_HIGH>; /* PH14 */ + }; + + reg_usb2_vbus: usb2-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + regulator-min-microvolt = <500>; + regulator-max-microvolt = <500>; + enable-active-high; + gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ + }; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&ehci2 { + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci2 { + status = "okay"; +}; + +&usbphy1 { + phy-supply = <®_usb1_vbus>; + status = "okay"; +}; + +&usbphy2 { + phy-supply = <®_usb2_vbus>; + status = "okay"; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu May 23 20:50:30 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: Remove vcc_host1_5v hack now that fixedregulator honours pin polarity To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/rk3328-rock64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Thu May 23 20:50:30 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: Remove vcc_host1_5v hack now that fixedregulator honours pin polarity To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/rk3328-rock64.dts 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/arm/dts/rk3328-rock64.dts diff -u src/sys/arch/arm/dts/rk3328-rock64.dts:1.3 src/sys/arch/arm/dts/rk3328-rock64.dts:1.4 --- src/sys/arch/arm/dts/rk3328-rock64.dts:1.3 Wed May 22 23:22:24 2019 +++ src/sys/arch/arm/dts/rk3328-rock64.dts Thu May 23 20:50:29 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3328-rock64.dts,v 1.3 2019/05/22 23:22:24 jmcneill Exp $ */ +/* $NetBSD: rk3328-rock64.dts,v 1.4 2019/05/23 20:50:29 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -36,7 +36,3 @@ snps,dis-u2-freeclk-exists-quirk; snps,dis_u2_susphy_quirk; }; - -&vcc_host1_5v { - /delete-property/ enable-active-high; -};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Wed May 22 23:22:24 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: Swap polarity of the vcc_host1_5v pin to enable USB power To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/rk3328-rock64.dts 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/arm/dts/rk3328-rock64.dts diff -u src/sys/arch/arm/dts/rk3328-rock64.dts:1.2 src/sys/arch/arm/dts/rk3328-rock64.dts:1.3 --- src/sys/arch/arm/dts/rk3328-rock64.dts:1.2 Tue May 21 03:42:52 2019 +++ src/sys/arch/arm/dts/rk3328-rock64.dts Wed May 22 23:22:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3328-rock64.dts,v 1.2 2019/05/21 03:42:52 mrg Exp $ */ +/* $NetBSD: rk3328-rock64.dts,v 1.3 2019/05/22 23:22:24 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -36,3 +36,7 @@ snps,dis-u2-freeclk-exists-quirk; snps,dis_u2_susphy_quirk; }; + +&vcc_host1_5v { + /delete-property/ enable-active-high; +};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Wed May 22 23:22:24 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: Swap polarity of the vcc_host1_5v pin to enable USB power To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/rk3328-rock64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue May 21 22:31:39 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-neo.dts sun8i-h3-orangepi-plus2e.dts Log Message: Mainline dts has switched to operating-points-v2 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts \ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Tue May 21 22:31:39 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun8i-h3-nanopi-neo.dts sun8i-h3-orangepi-plus2e.dts Log Message: Mainline dts has switched to operating-points-v2 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts \ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts 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/arm/dts/sun8i-h3-nanopi-neo.dts diff -u src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.3 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.4 --- src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.3 Thu Nov 30 21:36:45 2017 +++ src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts Tue May 21 22:31:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.3 2017/11/30 21:36:45 jmcneill Exp $ */ +/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -33,12 +33,6 @@ cpus { cpu@0 { cpu-supply = <&vdd_cpu>; - operating-points = < -/* kHz uV */ -1008000 130 -816000 110 -48 110 ->; }; }; Index: src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts diff -u src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.3 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 --- src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.3 Thu Nov 30 21:36:45 2017 +++ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Tue May 21 22:31:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.3 2017/11/30 21:36:45 jmcneill Exp $ */ +/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -33,18 +33,24 @@ cpus { cpu@0 { cpu-supply = <&vdd_cpu>; - operating-points = < -/* kHz uV */ -1296000 134 -120 132 -1008000 120 -816000 110 -648000 104 ->; }; }; }; +&cpu0_opp_table { + opp@12 { + opp-hz = /bits/ 64 <12>; + opp-microvolt = <132 132 132>; + clock-latency-ns = <244144>; + }; + + opp@129600 { + opp-hz = /bits/ 64 <129600>; + opp-microvolt = <134 134 134>; + clock-latency-ns = <244144>; + }; +}; + &r_i2c { status = "okay";
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Tue May 21 03:42:52 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: it's called "snps,dis_u2_susphy_quirk" in both upstream and what our drivers expect, not "snps,dis-u2-susphy-quirk". unfortunately, my rock64 usb still seems to be non functional. from jmcneill@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/rk3328-rock64.dts 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/arm/dts/rk3328-rock64.dts diff -u src/sys/arch/arm/dts/rk3328-rock64.dts:1.1 src/sys/arch/arm/dts/rk3328-rock64.dts:1.2 --- src/sys/arch/arm/dts/rk3328-rock64.dts:1.1 Thu Jun 21 10:46:39 2018 +++ src/sys/arch/arm/dts/rk3328-rock64.dts Tue May 21 03:42:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3328-rock64.dts,v 1.1 2018/06/21 10:46:39 jmcneill Exp $ */ +/* $NetBSD: rk3328-rock64.dts,v 1.2 2019/05/21 03:42:52 mrg Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -34,5 +34,5 @@ snps,phyif-utmi-bits = <16>; snps,dis-enblslpm-quirk; snps,dis-u2-freeclk-exists-quirk; - snps,dis-u2-susphy-quirk; + snps,dis_u2_susphy_quirk; };
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Tue May 21 03:42:52 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: it's called "snps,dis_u2_susphy_quirk" in both upstream and what our drivers expect, not "snps,dis-u2-susphy-quirk". unfortunately, my rock64 usb still seems to be non functional. from jmcneill@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/rk3328-rock64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/arm/dts
On Sep 14, 9:47am, p...@whooppee.com (Paul Goyette) wrote: -- Subject: Re: CVS commit: src/sys/arch/arm/dts | Additionally, use of this GNU extension might preclude a move to a | non-gcc compiler in the future... That ship has sailed for the kernel: - we are using too many gcc-specific stuff already eg. asm - most compilers that can compiler the kernel implement the gcc feature set. christos
Re: CVS commit: src/sys/arch/arm/dts
Additionally, use of this GNU extension might preclude a move to a non-gcc compiler in the future... On Thu, 14 Sep 2017, Jun Ebihara wrote: From: chris...@zoulas.com (Christos Zoulas) Subject: Re: CVS commit: src/sys/arch/arm/dts Date: Tue, 12 Sep 2017 11:42:56 -0400 | >>+#include | >>"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" | "/usr/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" ... original configration. | + | "/usr/src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts" .. config for NetBSD | + | "/usr/src/sys/arch/arm/dts/sun8i-h3.dtsi" ... framebuffer enabled How about #include_next "..."? I read https://gcc.gnu.org/onlinedocs/cpp/Wrapper-Headers.html . "The use #include_next can lead to great confusion. We recommend it be used only when there is no other alternative." -- Jun Ebihara !DSPAM:59b9d8ed225461032040117! +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
Re: CVS commit: src/sys/arch/arm/dts
On Sep 14, 10:17am, j...@soum.co.jp (Jun Ebihara) wrote: -- Subject: Re: CVS commit: src/sys/arch/arm/dts | I read https://gcc.gnu.org/onlinedocs/cpp/Wrapper-Headers.html . | | "The use #include_next can lead to great confusion. | We recommend it be used only when there is no other alternative." The alternative of duplicating the path is worse IMHO. The other alternative is to rename the file so there are no name conflicts. christos
Re: CVS commit: src/sys/arch/arm/dts
From: chris...@zoulas.com (Christos Zoulas) Subject: Re: CVS commit: src/sys/arch/arm/dts Date: Tue, 12 Sep 2017 11:42:56 -0400 > | >>+#include > | > >>"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" > | > "/usr/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" > ... original configration. > | + > | "/usr/src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts" .. config for NetBSD > | + > | "/usr/src/sys/arch/arm/dts/sun8i-h3.dtsi" ... framebuffer enabled > How about #include_next "..."? I read https://gcc.gnu.org/onlinedocs/cpp/Wrapper-Headers.html . "The use #include_next can lead to great confusion. We recommend it be used only when there is no other alternative." -- Jun Ebihara
Re: CVS commit: src/sys/arch/arm/dts
On Sep 12, 11:17am, j...@soum.co.jp (Jun Ebihara) wrote: -- Subject: Re: CVS commit: src/sys/arch/arm/dts | From: chris...@astron.com (Christos Zoulas) | Subject: Re: CVS commit: src/sys/arch/arm/dts | Date: Mon, 11 Sep 2017 21:10:04 + (UTC) | | >>+#include | >>"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" | >>+ | > Why does it need the full path? Doesn't: | > #include "sun8i-h3-orangepi-one.dts" | > work? | | it does not works,christos. | it makes "#include nested too deeply" error as looks itself. | | To recognize framebuffer console, | need merged result to make sun8i-h3-orangepi-one.dtb, | and copy sun8i-h3-orangepi-one.dtb to the directory with netbsd.ub. | | "/usr/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" ... original configration. | + | "/usr/src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts" .. config for NetBSD | + | "/usr/src/sys/arch/arm/dts/sun8i-h3.dtsi" ... framebuffer enabled How about #include_next "..."? christos
Re: CVS commit: src/sys/arch/arm/dts
On Tue, Sep 12, 2017 at 11:17:02AM +0900, Jun Ebihara wrote: > From: chris...@astron.com (Christos Zoulas) > Subject: Re: CVS commit: src/sys/arch/arm/dts > Date: Mon, 11 Sep 2017 21:10:04 + (UTC) > > >>+#include > >>"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" > >>+ > > Why does it need the full path? Doesn't: > > #include "sun8i-h3-orangepi-one.dts" > > work? > > it does not works,christos. > it makes "#include nested too deeply" error as looks itself. What about using #include_next "..." here? Joerg
Re: CVS commit: src/sys/arch/arm/dts
From: chris...@astron.com (Christos Zoulas) Subject: Re: CVS commit: src/sys/arch/arm/dts Date: Mon, 11 Sep 2017 21:10:04 + (UTC) >>+#include >>"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" >>+ > Why does it need the full path? Doesn't: > #include "sun8i-h3-orangepi-one.dts" > work? it does not works,christos. it makes "#include nested too deeply" error as looks itself. To recognize framebuffer console, need merged result to make sun8i-h3-orangepi-one.dtb, and copy sun8i-h3-orangepi-one.dtb to the directory with netbsd.ub. "/usr/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" ... original configration. + "/usr/src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts" .. config for NetBSD + "/usr/src/sys/arch/arm/dts/sun8i-h3.dtsi" ... framebuffer enabled -- Jun Ebihara
Re: CVS commit: src/sys/arch/arm/dts
In article <20170911204414.97484f...@cvs.netbsd.org>, Jun Ebihara wrote: >-=-=-=-=-=- > >+#include >"../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts" >+ Why does it need the full path? Doesn't: #include "sun8i-h3-orangepi-one.dts" work? christos