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 <jmcne...@invisible.ca>
+ * Copyright (c) 2019,2021 Jared McNeill <jmcne...@invisible.ca>
* 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 <jmcne...@invisible.ca>
@@ -36,16 +36,3 @@
&sound_hdmi {
status = "okay";
};
-
-&cpu0 {
- cpu-supply = <®_dcdc2>;
- operating-points = <
- /* kHz uV */
- 1152000 1300000
- 1104000 1260000
- 1008000 1200000
- 816000 1080000
- 648000 1040000
- 408000 1000000
- >;
-};
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 <jmcne...@invisible.ca>
+ * Copyright (c) 2019,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,33 +35,3 @@
status = "disabled";
};
};
-
-&pinctrl_cbus {
- sdxc_c_pins: sdxc-c {
- mux {
- groups = "sdxc_d0_c", "sdxc_d13_c", "sdxc_d47_c", "sdxc_clk_c", "sdxc_cmd_c";
- function = "sdxc_c";
- };
- };
-};
-
-&cbus {
- sdhc: mmc@8e00 {
- compatible = "amlogic,meson8b-sdhc";
- reg = <0x8e00 0x30>;
- interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>;
- clocks = <&clkc CLKID_SDHC>, <&clkc CLKID_FCLK_DIV3>;
- clock-names = "core", "clkin";
- #address-cells = <1>;
- #size-cells = <0>;
- status = "disabled";
- };
-};
-
-&aobus {
- rtc: rtc@740 {
- compatible = "amlogic,meson8b-rtc";
- reg = <0x740 0x14>;
- interrupts = <GIC_SPI 72 IRQ_TYPE_EDGE_RISING>;
- };
-};
Index: src/sys/arch/arm/dts/rk3399-pinebook-pro.dts
diff -u src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.4 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.5
--- src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.4 Sat Oct 2 20:41:47 2021
+++ src/sys/arch/arm/dts/rk3399-pinebook-pro.dts Sun Nov 7 17:11:43 2021
@@ -1,1094 +1,35 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
- * Copyright (c) 2018 Akash Gajjar <akash_gaj...@mentor.com>
+/* $NetBSD: rk3399-pinebook-pro.dts,v 1.5 2021/11/07 17:11:43 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2021 Jared McNeill <jmcne...@invisible.ca>
+ * 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.
*/
-/dts-v1/;
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/usb/pd.h>
-//#include <dt-bindings/leds/common.h>
-#include <dt-bindings/pinctrl/rockchip.h>
-#include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
+#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts"
#include "rk3399-crypto.dtsi"
-/ {
- model = "Pine64 Pinebook Pro";
- compatible = "pine64,pinebook-pro", "rockchip,rk3399";
-
- edp_panel: edp-panel { /* "boe,nv140fhmn49" */
- compatible = "boe,nv140fhmn49", "simple-panel";
- backlight = <&backlight>;
- power-supply = <&vcc3v3_s0>;
-// pinctrl-names = "default";
-// pinctrl-0 = <&panel_en>;
- enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
- prepare-delay-ms = <20>;
- enable-delay-ms = <20>;
- status = "okay";
-
- ports {
- #address-cells = <0x01>;
- #size-cells = <0x00>;
- port@0 {
- panel_in_edp: endpoint@0 {
- remote-endpoint = <&edp_out_panel>;
- };
- };
- };
- };
-
- chosen {
- bootargs = "earlycon=uart8250,mmio32,0xff1a0000";
- stdout-path = "serial2:1500000n8";
- };
-
- leds {
- compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&pwrled &slpled>;
-
- /* Hack using active_low as inversion. A real, inverted trigger would be nicer */
- green-led {
- gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
- label = "green:disk-activity";
-// function = LED_FUNCTION_POWER;
- linux,default-trigger = "disk-activity";
- default-state = "off";
-// color = <LED_COLOR_ID_GREEN>;
- };
-
- red-led {
- gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
- label = "red:standby";
-// function = LED_FUNCTION_STANDBY;
- default-state = "off";
- panic-indicator;
- retain-state-suspended;
-// color = <LED_COLOR_ID_RED>;
- };
- };
-
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
- drm_logo: drm-logo@00000000 {
- compatible = "rockchip,drm-logo";
- reg = <0x0 0x0 0x0 0x0>;
- };
- };
-
- dc_12v: dc-12v {
- compatible = "regulator-fixed";
- regulator-name = "dc_12v";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- };
-
- gpio-keys {
- compatible = "gpio-keys";
- autorepeat;
- pinctrl-names = "default";
- pinctrl-0 = <&pwrbtn &lidbtn>;
-
- power {
- debounce-interval = <20>;
- gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
- label = "Power";
- linux,code = <KEY_POWER>;
- wakeup-source;
- };
-
- lid {
- debounce-interval = <20>;
- gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
- label = "Lid";
- linux,code = <SW_LID>;
- linux,input-type = <EV_SW>;
- wakeup-source;
- };
- };
-
- backlight: edp-backlight {
- compatible = "pwm-backlight";
- pwms = <&pwm0 0 740740 0>;
- power-supply = <&vcc3v3_s3>;
- brightness-levels = <
- 0 1 2 3 4 5 6 7
- 8 9 10 11 12 13 14 15
- 16 17 18 19 20 21 22 23
- 24 25 26 27 28 29 30 31
- 32 33 34 35 36 37 38 39
- 40 41 42 43 44 45 46 47
- 48 49 50 51 52 53 54 55
- 56 57 58 59 60 61 62 63
- 64 65 66 67 68 69 70 71
- 72 73 74 75 76 77 78 79
- 80 81 82 83 84 85 86 87
- 88 89 90 91 92 93 94 95
- 96 97 98 99 100 101 102 103
- 104 105 106 107 108 109 110 111
- 112 113 114 115 116 117 118 119
- 120 121 122 123 124 125 126 127
- 128 129 130 131 132 133 134 135
- 136 137 138 139 140 141 142 143
- 144 145 146 147 148 149 150 151
- 152 153 154 155 156 157 158 159
- 160 161 162 163 164 165 166 167
- 168 169 170 171 172 173 174 175
- 176 177 178 179 180 181 182 183
- 184 185 186 187 188 189 190 191
- 192 193 194 195 196 197 198 199
- 200 201 202 203 204 205 206 207
- 208 209 210 211 212 213 214 215
- 216 217 218 219 220 221 222 223
- 224 225 226 227 228 229 230 231
- 232 233 234 235 236 237 238 239
- 240 241 242 243 244 245 246 247
- 248 249 250 251 252 253 254 255>;
- default-brightness-level = <200>;
- status = "okay";
- };
-
- panel {
- vcc_lcd_en_drv: vcc-lcd-en-drv {
- rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- panel_en: panel-en {
- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- vcc_lcd_en: vcc-lcd-en-regulator {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
-// pinctrl-names = "default";
-// pinctrl-0 = <&vcc_lcd_en_drv>;
- regulator-name = "vcc_lcd_en";
- regulator-enable-ramp-delay = <100000>;
- vin-supply = <&vcc3v3_sys>;
- regulator-always-on;
-
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
- clocks = <&rk808 1>;
- clock-names = "ext_clock";
- pinctrl-names = "default";
- pinctrl-0 = <&wifi_enable_h>;
- power-off-delay-us = <500000>;
- post-power-on-delay-ms = <100>;
-
- /*
- * On the module itself this is one of these (depending
- * on the actual card populated):
- * - SDIO_RESET_L_WL_REG_ON
- * - PDN (power down when low)
- */
- reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
- };
-
- wireless-wlan {
- compatible = "wlan-platdata";
- rockchip,grf = <&grf>;
- wifi_chip_type = "ap6354";
- sdio_vref = <1800>;
- WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-
- es8316-sound {
- status = "okay";
- compatible = "simple-audio-card";
- simple-audio-card,name = "rockchip,es8316-codec";
- simple-audio-card,format = "i2s";
- simple-audio-card,mclk-fs = <256>;
-
- simple-audio-card,widgets =
- "Microphone", "Mic Jack",
- "Headphone", "Headphones",
- "Speaker", "Speaker";
- simple-audio-card,routing =
- "MIC1", "Mic Jack",
- "Headphones", "HPOL",
- "Headphones", "HPOR",
- "Speaker Amplifier INL", "HPOL",
- "Speaker Amplifier INR", "HPOR",
- "Speaker", "Speaker Amplifier OUTL",
- "Speaker", "Speaker Amplifier OUTR";
-
- simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
- simple-audio-card,aux-devs = <&speaker_amp>;
-
- simple-audio-card,cpu {
- sound-dai = <&i2s1>;
- };
-
- simple-audio-card,codec {
- sound-dai = <&es8316>;
- };
- };
-
- speaker_amp: speaker-amplifier {
- status = "okay";
- compatible = "simple-audio-amplifier";
- enable-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
- VCC-supply = <&vcc5v0_host>;
- sound-name-prefix = "Speaker Amplifier";
- };
-
- /* switched by pmic_sleep */
- vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
- compatible = "regulator-fixed";
- regulator-name = "vcc1v8_s3";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- vin-supply = <&vcc_1v8>;
- };
-
- vcc3v3_pcie: vcc3v3-pcie-regulator {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie_pwr_en>;
- regulator-name = "vcc3v3_pcie";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&dc_12v>;
- };
-
- vcc_phy: vcc-phy-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc_phy";
- regulator-always-on;
- regulator-boot-on;
- };
-
- vcc3v3_sys: vcc3v3-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc3v3_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&vcc_sys>;
- };
-
- /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
- vcc5v0_host: vcc5v0-host-regulator {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc5v0_host_en>;
- regulator-name = "vcc5v0_host";
- regulator-always-on;
- vin-supply = <&vcc_sys>;
- };
-
- vcc5v0_typec: vcc5v0-typec-regulator {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc5v0_typec_en>;
- regulator-name = "vcc5v0_typec";
- vin-supply = <&vcc_sys>;
- };
-
- vcc_sys: vcc-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&dc_12v>;
- };
-
- vdd_log: vdd-log {
- compatible = "pwm-regulator";
- pwms = <&pwm2 0 25000 1>;
- pwm-supply = <&vcc_sys>;
- regulator-name = "vdd_log";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1400000>;
- };
-
- mains_charger: dc-charger {
- compatible = "gpio-charger";
- charger-type = "mains";
- gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>;
-// pinctrl-names = "default";
-// pinctrl-0 = <&dc_det_gpio>;
- };
-
- usb_charger: usb-charger {
- status = "okay";
- compatible = "universal-charger";
- extcon = <&fusb0>;
- };
-};
-
-&edp {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&edp_hpd>;
- force-hpd;
-
- ports {
- edp_out: port@1 {
- reg = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- edp_out_panel: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&panel_in_edp>;
- };
- };
- };
-};
-
-&cdn_dp {
- status = "okay";
- extcon = <&fusb0>;
-};
-
-&cpu_l0 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l1 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l2 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_l3 {
- cpu-supply = <&vdd_cpu_l>;
-};
-
-&cpu_b0 {
- cpu-supply = <&vdd_cpu_b>;
-};
-
-&cpu_b1 {
- cpu-supply = <&vdd_cpu_b>;
-};
-
-&cpu_alert0 {
- temperature = <80000>;
-};
-
-&cpu_alert1 {
- temperature = <95000>;
-};
-
-&cpu_crit {
- temperature = <100000>;
-};
-
-&emmc_phy {
- status = "okay";
-};
-
-&hdmi_sound {
- status = "okay";
-};
-
-&hdmi {
- ddc-i2c-bus = <&i2c3>;
- pinctrl-names = "default";
- pinctrl-0 = <&hdmi_cec>;
- status = "disabled";
-};
-
-&gpu {
- mali-supply = <&vdd_gpu>;
- status = "okay";
-};
-
-&i2c0 {
- clock-frequency = <400000>;
- i2c-scl-rising-time-ns = <168>;
- i2c-scl-falling-time-ns = <4>;
- status = "okay";
-
- rk808: pmic@1b {
- compatible = "rockchip,rk808";
- reg = <0x1b>;
- interrupt-parent = <&gpio3>;
- interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
- #clock-cells = <1>;
- clock-output-names = "xin32k", "rk808-clkout2";
- pinctrl-names = "default";
- pinctrl-0 = <&pmic_int_l>;
- rockchip,system-power-controller;
- wakeup-source;
-
- vcc1-supply = <&vcc_sys>;
- vcc2-supply = <&vcc_sys>;
- vcc3-supply = <&vcc_sys>;
- vcc4-supply = <&vcc_sys>;
- vcc6-supply = <&vcc_sys>;
- vcc7-supply = <&vcc_sys>;
- vcc8-supply = <&vcc3v3_sys>;
- vcc9-supply = <&vcc_sys>;
- vcc10-supply = <&vcc_sys>;
- vcc11-supply = <&vcc_sys>;
- vcc12-supply = <&vcc3v3_sys>;
- vddio-supply = <&vcc1v8_pmu>;
-
- regulators {
- vdd_center: DCDC_REG1 {
- regulator-name = "vdd_center";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <750000>;
- regulator-max-microvolt = <1350000>;
- regulator-ramp-delay = <6001>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vdd_cpu_l: DCDC_REG2 {
- regulator-name = "vdd_cpu_l";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <750000>;
- regulator-max-microvolt = <1350000>;
- regulator-ramp-delay = <6001>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_ddr: DCDC_REG3 {
- regulator-name = "vcc_ddr";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-on-in-suspend;
- };
- };
-
- vcc_1v8: DCDC_REG4 {
- regulator-name = "vcc_1v8";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1800000>;
- };
- };
-
- vcc1v8_dvp: LDO_REG1 {
- regulator-name = "vcc1v8_dvp";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc3v0_touch: LDO_REG2 {
- regulator-name = "vcc3v0_touch";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc1v8_pmu: LDO_REG3 {
- regulator-name = "vcc1v8_pmu";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1800000>;
- };
- };
-
- vcc_sdio: LDO_REG4 {
- regulator-name = "vcc_sdio";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <3000000>;
- };
- };
-
- vcca3v0_codec: LDO_REG5 {
- regulator-name = "vcca3v0_codec";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_1v5: LDO_REG6 {
- regulator-name = "vcc_1v5";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1500000>;
- regulator-max-microvolt = <1500000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <1500000>;
- };
- };
-
- vcca1v8_codec: LDO_REG7 {
- regulator-name = "vcca1v8_codec";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc_3v0: LDO_REG8 {
- regulator-name = "vcc_3v0";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-state-mem {
- regulator-on-in-suspend;
- regulator-suspend-microvolt = <3000000>;
- };
- };
-
- vcc3v3_s3: vcc_lan: SWITCH_REG1 {
- regulator-name = "vcc3v3_s3";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vcc3v3_s0: SWITCH_REG2 {
- regulator-name = "vcc3v3_s0";
- regulator-always-on;
- regulator-boot-on;
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
- };
- };
-
- vdd_cpu_b: regulator@40 {
- compatible = "silergy,syr827";
- reg = <0x40>;
- fcs,suspend-voltage-selector = <1>;
- pinctrl-names = "default";
- pinctrl-0 = <&vsel1_gpio>;
- vsel-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
- regulator-compatible = "fan53555-reg";
- regulator-name = "vdd_cpu_b";
- regulator-min-microvolt = <712500>;
- regulator-max-microvolt = <1500000>;
- regulator-ramp-delay = <1000>;
- regulator-always-on;
- regulator-boot-on;
- vin-supply = <&vcc_sys>;
-
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-
- vdd_gpu: regulator@41 {
- compatible = "silergy,syr828";
- reg = <0x41>;
- fcs,suspend-voltage-selector = <1>;
- pinctrl-names = "default";
- pinctrl-0 = <&vsel2_gpio>;
- vsel-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
- regulator-compatible = "fan53555-reg";
- regulator-name = "vdd_gpu";
- regulator-min-microvolt = <712500>;
- regulator-max-microvolt = <1500000>;
- regulator-ramp-delay = <1000>;
- regulator-always-on;
- regulator-boot-on;
- vin-supply = <&vcc_sys>;
-
- regulator-state-mem {
- regulator-off-in-suspend;
- };
- };
-};
-
-&i2c1 {
- i2c-scl-rising-time-ns = <168>;
- i2c-scl-falling-time-ns = <4>;
- status = "okay";
-
- clock-frequency = <100000>;
-
- es8316: es8316@11 {
- #sound-dai-cells = <0>;
- compatible = "everest,es8316";
- reg = <0x11>;
- clocks = <&cru SCLK_I2S_8CH_OUT>;
- clock-names = "mclk";
- };
-};
-
-&i2c3 {
- i2c-scl-rising-time-ns = <450>;
- i2c-scl-falling-time-ns = <15>;
- status = "okay";
-};
-
-
-
-&i2c4 {
- i2c-scl-rising-time-ns = <600>;
- i2c-scl-falling-time-ns = <20>;
- status = "okay";
-
- fusb0: fusb30x@22 {
- compatible = "fcs,fusb302";
- reg = <0x22>;
- pinctrl-names = "default";
- pinctrl-0 = <&fusb0_int>;
- fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
- vbus-supply = <&vcc5v0_typec>;
- status = "okay";
- connector {
- compatible = "usb-c-connector";
- label = "USB-C";
- power-role = "dual";
- try-power-role = "sink";
- source-pdos = <PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
- sink-pdos = <PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
- op-sink-microwatt = <1000000>;
- extcon-cables = <1 2 5 6 9 10 12 44>;
- typec-altmodes = <0xff01 1 0x001c0000 1>;
- };
- };
-
- cw2015@62 {
- status = "okay";
- compatible = "cellwise,cw201x";
- reg = <0x62>;
- cellwise,bat-config-info = <
- 0x17 0x67 0x80 0x73 0x6E 0x6C 0x6B 0x63
- 0x77 0x51 0x5C 0x58 0x50 0x4C 0x48 0x36
- 0x15 0x0C 0x0C 0x19 0x5B 0x7D 0x6F 0x69
- 0x69 0x5B 0x0C 0x29 0x20 0x40 0x52 0x59
- 0x57 0x56 0x54 0x4F 0x3B 0x1F 0x7F 0x17
- 0x06 0x1A 0x30 0x5A 0x85 0x93 0x96 0x2D
- 0x48 0x77 0x9C 0xB3 0x80 0x52 0x94 0xCB
- 0x2F 0x00 0x64 0xA5 0xB5 0x11 0xF0 0x11
- >;
- cellwise,monitor-interval = <5>;
- cellwise,virtual-power = <0>;
- cellwise,design-capacity = <9800>;
- power-supplies = <&mains_charger>, <&fusb0>;
- };
-};
-
-&i2s0 {
- status = "disabled";
-};
-
-&i2s1 {
- rockchip,i2s-broken-burst-len;
- rockchip,playback-channels = <8>;
- rockchip,capture-channels = <8>;
- #sound-dai-cells = <0>;
- pinctrl-names = "default";
- pinctrl-0 = <&i2s_8ch_mclk>, <&i2s1_2ch_bus>;
- status = "okay";
-};
-
-&i2s2 {
- #sound-dai-cells = <0>;
- status = "disabled";
-};
-
-&io_domains {
- status = "okay";
-
- bt656-supply = <&vcc1v8_dvp>;
- audio-supply = <&vcca1v8_codec>;
- sdmmc-supply = <&vcc_sdio>;
- gpio1830-supply = <&vcc_3v0>;
-};
-
-&pcie_phy {
- status = "okay";
-};
-
-&pcie0 {
- ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
- num-lanes = <4>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie_clkreqn_cpm>;
- vpcie3v3-supply = <&vcc3v3_pcie>;
- bus-scan-delay-ms = <1000>;
- status = "okay";
-};
-
-&pmu_io_domains {
- pmu1830-supply = <&vcc_3v0>;
- status = "okay";
-};
-
-&cluster1_opp {
- opp08 {
- opp-hz = /bits/ 64 <2000000000>;
- opp-microvolt = <1300000>;
- };
-};
-
-&pinctrl {
- buttons {
- pwrbtn: pwrbtn {
- rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- lidbtn: lidbtn {
- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- dc-charger {
- dc_det_gpio: dc-det-gpio {
- rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- fusb302x {
- fusb0_int: fusb0-int {
- rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- leds {
- pwrled: pwrled {
- rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- slpled: slpled {
- rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- lcd-panel {
- lcd_panel_reset: lcd-panel-reset {
- rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- pcie {
- pcie_pwr_en: pcie-pwr-en {
- rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- pmic {
- pmic_int_l: pmic-int-l {
- rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
- };
-
- vsel1_gpio: vsel1-gpio {
- rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
- };
-
- vsel2_gpio: vsel2-gpio {
- rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
- };
- };
-
- sdio-pwrseq {
- wifi_enable_h: wifi-enable-h {
- rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- usb-typec {
- vcc5v0_typec_en: vcc5v0_typec_en {
- rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
- usb2 {
- vcc5v0_host_en: vcc5v0-host-en {
- rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- i2s1 {
- i2s_8ch_mclk: i2s-8ch-mclk {
- rockchip,pins = <4 0 RK_FUNC_1 &pcfg_pull_none>;
- };
- };
-
- wireless-bluetooth {
- bt_wake_gpio: bt-wake {
- rockchip,pins =
- <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- bt_host_wake_gpio: bt-host-wake {
- rockchip,pins =
- <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- bt_reset_gpio: bt-reset {
- rockchip,pins =
- <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-};
-
-&pwm0 {
- status = "okay";
-};
-
-&pwm2 {
- status = "okay";
-};
-
-&saradc {
- vref-supply = <&vcca1v8_s3>;
- status = "okay";
-};
-
-&sdmmc {
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
- disable-wp;
- sd-uhs-sdr104;
- max-frequency = <150000000>;
- vqmmc-supply = <&vcc_sdio>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
- status = "okay";
-};
-
-&sdio0 {
- supports-sdio;
- bus-width = <4>;
- disable-wp;
- cap-sd-highspeed;
- cap-sdio-irq;
- keep-power-in-suspend;
- mmc-pwrseq = <&sdio_pwrseq>;
- non-removable;
- num-slots = <1>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
- sd-uhs-sdr104;
- status = "okay";
- defer_pcie = <2000>;
-};
-
-&sdhci {
- bus-width = <8>;
- //mmc-hs400-1_8v;
- mmc-hs200-1_8v;
- //mmc-hs400-enhanced-strobe;
- non-removable;
- status = "okay";
-};
-
-&tcphy0 {
- extcon = <&fusb0>;
- status = "okay";
-};
-
-&tcphy1 {
- status = "okay";
-};
-
-&tsadc {
- /* tshut mode 0:CRU 1:GPIO */
- rockchip,hw-tshut-mode = <1>;
- /* tshut polarity 0:LOW 1:HIGH */
- rockchip,hw-tshut-polarity = <1>;
- status = "okay";
-};
-
-&u2phy0 {
- status = "okay";
-
- u2phy0_otg: otg-port {
- status = "okay";
- };
-
- u2phy0_host: host-port {
- phy-supply = <&vcc5v0_host>;
- status = "okay";
- };
-};
-
-&u2phy1 {
- status = "okay";
-
- u2phy1_otg: otg-port {
- status = "okay";
- };
-
- u2phy1_host: host-port {
- phy-supply = <&vcc5v0_host>;
- status = "okay";
- };
-};
-
-
-&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
- uart-has-rtscts;
- status = "okay";
-
- bluetooth {
- compatible = "brcm,bcm4345c5";
- clocks = <&rk808 1>;
- clock-names = "lpo";
- pinctrl-names = "default";
- pinctrl-0 = <&bt_host_wake_gpio &bt_wake_gpio &bt_reset_gpio>;
- shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
- device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
- host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
- max-speed = <1500000>;
- vbat-supply = <&vcc3v3_sys>;
- vddio-supply = <&vcc_1v8>;
- };
-};
-
-&uart2 {
- status = "okay";
-};
-
-&usb_host0_ehci {
- status = "okay";
-};
-
-&usb_host0_ohci {
- status = "okay";
-};
-
-&usb_host1_ehci {
- status = "okay";
-};
-
-&usb_host1_ohci {
- status = "okay";
-};
-
-&usbdrd3_0 {
- status = "okay";
-};
-
-&usbdrd_dwc3_0 {
- status = "okay";
- dr_mode = "host";
-};
-
-&usbdrd3_1 {
- status = "okay";
-};
-
-&usbdrd_dwc3_1 {
- status = "okay";
- dr_mode = "host";
-};
-
-&vopb {
- status = "okay";
-};
-
-&vopb_mmu {
- status = "okay";
-};
-
-&vopl {
- status = "okay";
-};
-
-&vopl_mmu {
- status = "okay";
-};
-
&spi1 {
- // XXXJDM disable until rkspi issues are sorted out
+ /* XXX disable until rkspi issues are sorted out */
status = "disabled";
- max-freq = <10000000>;
-
- spiflash: spi-flash@0 {
- #address-cells = <0x1>;
- #size-cells = <1>;
- compatible = "jedec,spi-nor";
- reg = <0x0>;
- spi-max-frequency = <10000000>;
- status = "okay";
- m25p,fast-read;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- loader@8000 {
- label = "loader";
- reg = <0x0 0x3F8000>;
- };
-
- env@3f8000 {
- label = "env";
- reg = <0x3F8000 0x8000>;
- };
-
- vendor@7c0000 {
- label = "vendor";
- reg = <0x7C0000 0x40000>;
- };
- };
- };
};
Index: src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.4 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.5
--- src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.4 Tue May 21 22:31:39 2019
+++ src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.5 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2017,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,6 @@
*/
#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts"
-#include "sun8i-h3.dtsi"
/ {
cpus {
Index: src/sys/arch/arm/dts/rk3399-rockpro64.dts
diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.13 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.14
--- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.13 Sat Oct 2 20:41:47 2021
+++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: rk3399-rockpro64.dts,v 1.13 2021/10/02 20:41:47 mrg Exp $ */
+/* $NetBSD: rk3399-rockpro64.dts,v 1.14 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2019,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,24 +30,6 @@
#include "rk3399-crypto.dtsi"
/ {
- pwm-fan {
- compatible = "pwm-fan";
- status = "okay";
- pwms = <&pwm1 0 40000 0>;
- cooling-levels = <0 150 195 240>;
- };
-
- vcc3v3_pcie: vcc3v3-pcie-regulator {
- compatible = "regulator-fixed";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- enable-active-high;
- gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie_pwr_en>;
- regulator-name = "vcc3v3_pcie";
- };
-
backlight: lcd-backlight {
compatible = "pwm-backlight";
pwms = <&pwm0 0 25000 0>;
@@ -156,47 +138,8 @@
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
-
- pcie {
- pcie_pwr_en: pcie-pwr-en {
- rockchip,pins =
- <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
-
- pcie_clkreqn: pci-clkreqn {
- rockchip,pins =
- <2 RK_PD2 RK_FUNC_2 &pcfg_pull_none>;
- };
- };
-};
-
-&pwm1 {
- status = "okay";
-};
-
-&pcie_phy {
- status = "okay";
};
&pcie0 {
- ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
- num-lanes = <4>;
- pinctrl-names = "default";
- pinctrl-0 = <&pcie_clkreqn>;
- vpcie3v3-supply = <&vcc3v3_pcie>;
bus-scan-delay-ms = <1000>;
- status = "okay";
-};
-
-&spi1 {
- status = "okay";
- spiflash {
- compatible = "jedec,spi-nor";
- reg = <0>;
- status = "okay";
- };
-};
-
-&hdmi_sound {
- status = "okay";
};
Index: src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.3 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.4
--- src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.3 Sun Nov 17 17:35:10 2019
+++ src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.3 2019/11/17 17:35:10 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.4 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2017,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,27 +29,6 @@
#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts"
#include "sun50i-a64.dtsi"
-&emac {
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
- status = "okay";
-
- phy-mode = "rgmii";
- phy = <&phy1>;
-
- phy1: ethernet-phy@1 {
- reg = <1>;
- };
-};
-
-&ehci0 {
- status = "okay";
-};
-
-&ohci0 {
- status = "okay";
-};
-
&i2s2 {
status = "okay";
};
Index: src/sys/arch/arm/dts/sun8i-a83t.dtsi
diff -u src/sys/arch/arm/dts/sun8i-a83t.dtsi:1.3 src/sys/arch/arm/dts/sun8i-a83t.dtsi:1.4
--- src/sys/arch/arm/dts/sun8i-a83t.dtsi:1.3 Wed Jan 2 19:34:32 2019
+++ src/sys/arch/arm/dts/sun8i-a83t.dtsi Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: sun8i-a83t.dtsi,v 1.3 2019/01/02 19:34:32 jmcneill Exp $ */
+/* $NetBSD: sun8i-a83t.dtsi,v 1.4 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2017,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,13 +39,4 @@
status = "disabled";
};
};
-
- soc {
- rtp: rtp@1f04000 {
- compatible = "allwinner,sun8i-a83t-ts";
- reg = <0x01f04000 0x400>;
- interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
- #thermal-sensor-cells = <0>;
- };
- };
};
Index: src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.18 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.19
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.18 Fri Jan 3 15:50:13 2020
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.18 2020/01/03 15:50:13 skrll Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.19 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2017-2019 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2017-2019,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,59 +30,6 @@
#include "sun50i-a64.dtsi"
#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pwm/pwm.h>
-
-/ {
- chosen {
- framebuffer@0 {
- allwinner,pipeline = "mixer0-lcd0";
- };
- };
-
- gpio_keys {
- lid_switch {
- /*
- * This is listed as PL12 in 4.20.3 sources, but
- * we have used PH10 all along.
- */
- gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
- };
- };
-
- sound_spdif {
- status = "disabled";
- };
-
- hdmi-connector {
- compatible = "hdmi-connector";
- type = "c";
-
- port {
- hdmi_con_in: endpoint {
- remote-endpoint = <&hdmi_out_con>;
- };
- };
- };
-};
-
-&cpu0 {
- cpu-supply = <®_dcdc2>;
- operating-points = <
- /* kHz uV */
- 1152000 1300000
- 1104000 1260000
- 1008000 1200000
- 816000 1080000
- 648000 1040000
- 408000 1000000
- >;
-};
-
-&spdif_out {
- status = "disabled";
-};
&uart1 {
pinctrl-names = "default";
@@ -97,78 +44,6 @@
};
};
-&codec {
- allwinner,pa-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
- status = "okay";
-};
-
-&de {
- status = "okay";
-};
-
-&mixer0 {
- status = "okay";
-};
-
-&tcon0 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_rgb666_pins>;
-
- status = "okay";
-};
-
-&tcon0_out {
- tcon0_out_anx6345: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&anx6345_in>;
- };
-};
-
-&r_pio {
- r_i2c_pins_a: i2c-a {
- pins = "PL8", "PL9";
- function = "s_i2c";
- };
-};
-
-&r_i2c {
- pinctrl-names = "default";
- pinctrl-0 = <&r_i2c_pins_a>;
- status = "okay";
-
- anx6345: anx6345@38 {
- compatible = "analogix,anx6345";
- reg = <0x38>;
- reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
- panel-supply = <®_dc1sw>;
- dvdd25-supply = <®_dldo2>;
- dvdd12-supply = <®_fldo1>;
-
- port {
- anx6345_in: endpoint {
- remote-endpoint = <&tcon0_out_anx6345>;
- };
- };
- };
-};
-
-®_dldo1 {
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-name = "vcc-hdmi";
-};
-
-&hdmi {
- hvcc-supply = <®_dldo1>;
- status = "okay";
-};
-
-&hdmi_out {
- hdmi_out_con: endpoint {
- remote-endpoint = <&hdmi_con_in>;
- };
-};
-
&i2s2 {
status = "okay";
};
Index: src/sys/arch/arm/dts/sun50i-a64.dtsi
diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.14 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.15
--- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.14 Mon Dec 9 04:40:50 2019
+++ src/sys/arch/arm/dts/sun50i-a64.dtsi Sun Nov 7 17:11:43 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.14 2019/12/09 04:40:50 riastradh Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.15 2021/11/07 17:11:43 jmcneill Exp $ */
/*-
- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
+ * Copyright (c) 2017,2021 Jared McNeill <jmcne...@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,62 +27,6 @@
*/
/ {
- chosen {
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- framebuffer@0 {
- compatible = "allwinner,simple-framebuffer",
- "simple-framebuffer";
- allwinner,pipeline = "mixer1-lcd1-hdmi";
- status = "disabled";
- };
- };
-
- soc {
- rtp: rtp@1c25000 {
- compatible = "allwinner,sun50i-a64-ts";
- reg = <0x01c25000 0x400>;
- interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
- clock-names = "ahb", "ths";
- resets = <&ccu RST_BUS_THS>;
- #thermal-sensor-cells = <0>;
- };
-
- crypto: crypto@1c15000 {
- compatible = "allwinner,sun50i-a64-crypto";
- reg = <0x01c15000 0x1000>;
- interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;
- clock-names = "bus", "mod";
- resets = <&ccu RST_BUS_CE>;
- };
- };
-
- /* PMU interrupt numbers are wrong in mainline dts */
- pmu {
- interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- i2s2: i2s@1c22800 {
- #sound-dai-cells = <0>;
- compatible = "allwinner,sun50i-a64-i2s",
- "allwinner,sun8i-h3-i2s";
- reg = <0x01c22800 0x400>;
- interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
- 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";
@@ -99,7 +43,3 @@
};
};
};
-
-&cpu0 {
- clocks = <&ccu 1>; /* 1=CLK_PLL_CPUX */
-};
Index: src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts
diff -u src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts:1.1 src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts:1.2
--- src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts:1.1 Thu Sep 5 16:15:57 2019
+++ src/sys/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc-spi.dts Sun Nov 7 17:11:43 2021
@@ -1,3 +1,5 @@
+/* $NetBSD: sun7i-a20-olinuxino-lime2-emmc-spi.dts,v 1.2 2021/11/07 17:11:43 jmcneill Exp $ */
+
#include "sun7i-a20-olinuxino-lime2-emmc.dts"
&pio {
@@ -6,7 +8,7 @@
function = "spi0";
};
- spi0_cs0_pc_pin: spi0-cs0-pc-pin {
+ spi0_cs0_pc_pin: spi0-cs0-pc-pin {
pins = "PC23";
function = "spi0";
};
