dt-bindings: arm: rockchip: Add Pine64 PineNote board
Subsystems (2)
PATCH 1/3 dt-bindings: arm: rockchip: Add Pine64 PineNote board
The PineNote is a tablet from Pine64 based on the RK3566 SoC. There are two existing variants of the board. v1.1 was contained in some early samples, and v1.2 was sold as the "PineNote Developer Edition".
---
Documentation/devicetree/bindings/arm/rockchip.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +8 -0
@@ -481,6 +481,14 @@ properties: - const: pine64,pinebook-pro - const: rockchip,rk3399 + - description: Pine64 PineNote + items: + - enum: + - pine64,pinenote-v1.1 + - pine64,pinenote-v1.2 + - const: pine64,pinenote + - const: rockchip,rk3566 + - description: Pine64 Rock64 items: - const: pine64,rock64
Signature · 1 line
2.33.1
PATCH 2/3 arm64: dts: rockchip: rk356x: Add pdm node
rk356x contains a PDM microphone controller which is compatible with the existing rockchip,pdm binding. Add its node.
---
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +21 -0
@@ -651,6 +651,27 @@ &i2s1m0_sdo0 &i2s1m0_sdo1 status = "disabled"; }; + pdm: pdm@fe440000 { + compatible = "rockchip,rk3568-pdm"; + reg = <0x0 0xfe440000 0x0 0x1000>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru MCLK_PDM>, <&cru HCLK_PDM>; + clock-names = "pdm_clk", "pdm_hclk"; + dmas = <&dmac1 9>; + dma-names = "rx"; + resets = <&cru SRST_M_PDM>; + reset-names = "pdm-m"; + pinctrl-0 = <&pdmm0_clk + &pdmm0_clk1 + &pdmm0_sdi0 + &pdmm0_sdi1 + &pdmm0_sdi2 + &pdmm0_sdi3>; + pinctrl-names = "default"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + dmac0: dmac@fe530000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x0 0xfe530000 0x0 0x4000>;
Signature · 1 line
2.33.1
Re: [PATCH 2/3] arm64: dts: rockchip: rk356x: Add pdm node
Hello Samuel,
Quoted 24 lines · Samuel Holland
rk356x contains a PDM microphone controller which is compatible with the existing rockchip,pdm binding. Add its node.
Signed-off-by Samuel Holland <[email protected]>---
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)arch/arm64/boot/dts/rockchip/rk356x.dtsi +7
-0@@ -651,6 +651,27 @@ &i2s1m0_sdo0 &i2s1m0_sdo1 status = "disabled"; }; + pdm: pdm@fe440000 { + compatible = "rockchip,rk3568-pdm"; + reg = <0x0 0xfe440000 0x0 0x1000>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru MCLK_PDM>, <&cru HCLK_PDM>; + clock-names = "pdm_clk", "pdm_hclk"; + dmas = <&dmac1 9>;
arch/arm64/boot/dts/rockchip/rk356x.dtsi &i2s1m0_sdo0 &i2s1m0_sdo1 · line 670
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk356x.dtsi +10
-0+ dma-names = "rx"; + resets = <&cru SRST_M_PDM>; + reset-names = "pdm-m"; + pinctrl-0 = <&pdmm0_clk + &pdmm0_clk1 + &pdmm0_sdi0 + &pdmm0_sdi1 + &pdmm0_sdi2 + &pdmm0_sdi3>; + pinctrl-names = "default";
I think the pinctrl properties should go before the reset properties.
Apart from that this patch looks good to me.
Best regards,
Michael
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk356x.dtsi +4
-0+ #sound-dai-cells = <0>; + status = "disabled"; + }; + dmac0: dmac@fe530000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x0 0xfe530000 0x0 0x4000>;
PATCH 3/3 arm64: dts: rockchip: Add Pine64 PineNote board
In reply to Samuel HollandThe PineNote is a tablet from Pine64 based on the RK3566 SoC, featuring 4G/128G of storage, a 10.3" electrophoretic display (EPD) with two-color frontlight, both EMR and capacitive digitizers, dual-band wireless, quad-channel digital microphones, and stereo speakers.
There are two existing variants of the board. v1.1 was contained in some early samples, and v1.2 was sold as the "PineNote Developer Edition".
---
arch/arm64/boot/dts/rockchip/Makefile | 2 + .../dts/rockchip/rk3566-pinenote-v1.1.dts | 18 + .../dts/rockchip/rk3566-pinenote-v1.2.dts | 18 + .../boot/dts/rockchip/rk3566-pinenote.dtsi | 638 ++++++++++++++++++ 4 files changed, 676 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
arch/arm64/boot/dts/rockchip/Makefile +2 -0
@@ -56,5 +56,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3566-pinenote.dtsi" + +/ { + model = "Pine64 PineNote v1.1"; + compatible = "pine64,pinenote-v1.1", "pine64,pinenote", "rockchip,rk3566"; +}; + +&spk_amp { + VCC-supply = <&dcdc_boost>; +}; + +&pmu_io_domains { + vccio7-supply = <&vcc_1v8>; +};
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3566-pinenote.dtsi" + +/ { + model = "Pine64 PineNote v1.2"; + compatible = "pine64,pinenote-v1.2", "pine64,pinenote", "rockchip,rk3566"; +}; + +&spk_amp { + VCC-supply = <&vcc_bat>; +}; + +&pmu_io_domains { + vccio7-supply = <&vcc_3v3>; +};
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +638 -0
638 lines not on this page · raw message
Signature · 1 line
2.33.1
Re: [PATCH 3/3] arm64: dts: rockchip: Add Pine64 PineNote board
Hi Samuel,
Some comments, have a look if it's useful.
Could you test with:
ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make dtbs_check
dtc -I dtb -O dts rk3566-pinenote-v1.2.dtb
Fix a few notifications.
Johan
Quoted 41 lines · Samuel Holland
The PineNote is a tablet from Pine64 based on the RK3566 SoC, featuring 4G/128G of storage, a 10.3" electrophoretic display (EPD) with two-color frontlight, both EMR and capacitive digitizers, dual-band wireless, quad-channel digital microphones, and stereo speakers.
There are two existing variants of the board. v1.1 was contained in some early samples, and v1.2 was sold as the "PineNote Developer Edition".
Signed-off-by Samuel Holland <[email protected]>---
arch/arm64/boot/dts/rockchip/Makefile | 2 + .../dts/rockchip/rk3566-pinenote-v1.1.dts | 18 + .../dts/rockchip/rk3566-pinenote-v1.2.dts | 18 + .../boot/dts/rockchip/rk3566-pinenote.dtsi | 638 ++++++++++++++++++ 4 files changed, 676 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsiarch/arm64/boot/dts/rockchip/Makefile +2
-0@@ -56,5 +56,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtbarch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts new file +3
-0@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/;
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts line 12
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts new file +9
-0+ +#include "rk3566-pinenote.dtsi" + +/ { + model = "Pine64 PineNote v1.1"; + compatible = "pine64,pinenote-v1.1", "pine64,pinenote", "rockchip,rk3566"; +}; + +&spk_amp {
sort node names
Quoted 15 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts new file +6
-0+ VCC-supply = <&dcdc_boost>; +}; + +&pmu_io_domains { + vccio7-supply = <&vcc_1v8>; +};arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts new file +3
-0@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/;
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts line 12
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts new file +9
-0+ +#include "rk3566-pinenote.dtsi" + +/ { + model = "Pine64 PineNote v1.2"; + compatible = "pine64,pinenote-v1.2", "pine64,pinenote", "rockchip,rk3566"; +}; + +&spk_amp {
sort node names
Quoted 23 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts new file +6
-0+ VCC-supply = <&vcc_bat>; +}; + +&pmu_io_domains { + vccio7-supply = <&vcc_3v3>; +};arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +11
-0@@ -0,0 +1,638 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/gpio-keys.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/rockchip.h> + +#include "rk3566.dtsi" + +/ {
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 20
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ aliases { + mmc0 = &sdhci; + }; + + chosen { + stdout-path = "serial2:1500000n8"; + }; + + adc-keys-0 {
There's only one adc-key node. Are you expecting more of them? Maybe use:
adc-keys {
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 26
Quoted 9 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +6
-0+ compatible = "adc-keys"; + io-channels = <&saradc 0>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1750000>; + + button-recovery {
recovery {
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 27
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +1
-0+ label = "Recovery";
label = "recovery";
This shows up in a user space path. People don't like typing camel cases. Stay in line with other boards.
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 33
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +6
-0+ linux,code = <KEY_VENDOR>; + press-threshold-microvolt = <0>; + }; + }; + + spk_amp: audio-amplifier {
sort node names
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +10
-0+ compatible = "simple-audio-amplifier"; + enable-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&spk_amp_enable_h>; + pinctrl-names = "default"; + sound-name-prefix = "Speaker Amp"; + }; + + dmic_codec: dmic-codec { + compatible = "dmic-codec"; + num-channels = <6>;
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 52
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ #sound-dai-cells = <0>; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-0 = <&hall_int_l>; + pinctrl-names = "default"; + + switch-cover {
cover {
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 53
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +1
-0+ label = "Cover";
label = "cover";
This shows up in a user space path. People don't like typing camel cases. Stay in line with other boards.
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 65
Quoted 13 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +12
-0+ gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_LOW>; + linux,input-type = <EV_SW>; + linux,code = <SW_MACHINE_COVER>; + linux,can-disable; + wakeup-event-action = <EV_ACT_DEASSERTED>; + wakeup-source; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_gpio>;
pinctrl-0 = <&led_pin>;
gpio is a reserved node name. ~/.local/lib/python3.7/site-packages/dtschema/schemas/gpio/gpio-consumer.yaml
Quoted 13 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +13
-0+ pinctrl-names = "default"; + + led-0 { + color = <LED_COLOR_ID_WHITE>; + function = LED_FUNCTION_CHARGING; + gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk817 1>; + clock-names = "ext_clock";
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 87
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ pinctrl-0 = <&wifi_enable_h>; + pinctrl-names = "default"; + reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>; + }; + + sound { + compatible = "simple-audio-card"; + #address-cells = <1>; + #size-cells = <0>;
Move thing that start with "#" down the list as possible.
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 100
Quoted 13 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +13
-0+ simple-audio-card,name = "PineNote"; + simple-audio-card,aux-devs = <&spk_amp>; + simple-audio-card,widgets = "Headphone", "Headphones", + "Speaker", "Internal Speakers"; + simple-audio-card,routing = "Headphones", "HPOL", + "Headphones", "HPOR", + "Internal Speakers", "Speaker Amp OUTL", + "Internal Speakers", "Speaker Amp OUTR", + "Speaker Amp INL", "HPOL", + "Speaker Amp INR", "HPOR"; + simple-audio-card,pin-switches = "Internal Speakers"; + + simple-audio-card,dai-link@0 {
<stdout>: Warning (unit_address_vs_reg):
/sound/simple-audio-card,dai-link@0: node has a unit name, but no reg property
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +5
-0+ format = "i2s"; + mclk-fs = <256>; + frame-master = <&link0_cpu>; + bitclock-master = <&link0_cpu>; +
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 115
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +10
-0+ link0_cpu: cpu { + sound-dai = <&i2s1_8ch>; + }; + + link0_codec: codec { + sound-dai = <&rk817>; + }; + }; + + simple-audio-card,dai-link@1 {
<stdout>: Warning (unit_address_vs_reg):
/sound/simple-audio-card,dai-link@1: node has a unit name, but no reg property
Quoted 326 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +326
-0+ format = "pdm"; + frame-master = <&link1_cpu>; + bitclock-master = <&link1_cpu>; + + link1_cpu: cpu { + sound-dai = <&pdm>; + }; + + link1_codec: codec { + sound-dai = <&dmic_codec>; + }; + }; + }; + + vbat_4g: vbat-4g { + compatible = "regulator-fixed"; + regulator-name = "vbat_4g"; + regulator-min-microvolt = <3800000>; + regulator-max-microvolt = <3800000>; + /* powered by vcc_bat, enabled by vbat_4g_en */ + vin-supply = <&vbat_4g_en>; + }; + + vcc_1v8: vcc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v8"; + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + /* powered by vcc_sys, enabled by vcc_1v8_en */ + vin-supply = <&vcc_1v8_en>; + }; + + vcc_bat: vcc-bat { + compatible = "regulator-fixed"; + regulator-name = "vcc_bat"; + regulator-always-on; + regulator-min-microvolt = <3800000>; + regulator-max-microvolt = <3800000>; + }; + + vcc_hall_3v3: vcc-hall-3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc_hall_3v3"; + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_sys>; + }; + + vcc_sys: vcc-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-always-on; + regulator-min-microvolt = <3800000>; + regulator-max-microvolt = <3800000>; + vin-supply = <&vcc_bat>; + }; + + vcc_wl: vcc-wl { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&vcc_wl_gpio>; + pinctrl-names = "default"; + regulator-name = "vcc_wl"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_bat>; + }; + + vdda_0v9: vdda-0v9 { + compatible = "regulator-fixed"; + regulator-name = "vdda_0v9"; + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + /* powered by vcc_sys, enabled by vcc_1v8_en */ + vin-supply = <&vcc_1v8_en>; + }; +}; + +&cpu0 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu1 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu2 { + cpu-supply = <&vdd_cpu>; +}; + +&cpu3 { + cpu-supply = <&vdd_cpu>; +}; + +&i2c0 { + status = "okay"; + + vdd_cpu: regulator@1c { + compatible = "tcs,tcs4525"; + reg = <0x1c>; + fcs,suspend-voltage-selector = <0>; + regulator-name = "vdd_cpu"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1390000>; + regulator-ramp-delay = <2300>; + regulator-always-on; + vin-supply = <&vcc_sys>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + rk817: pmic@20 { + compatible = "rockchip,rk817"; + reg = <0x20>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>; + assigned-clocks = <&cru I2S1_MCLKOUT_TX>; + assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>; + clocks = <&cru I2S1_MCLKOUT_TX>; + clock-names = "mclk"; + #clock-cells = <1>; + pinctrl-0 = <&i2s1m0_mclk>, <&pmic_int_l>, <&pmic_sleep>; + pinctrl-names = "default"; + rockchip,system-power-controller; + #sound-dai-cells = <0>; + wakeup-source; + + vcc1-supply = <&vcc_sys>; + vcc2-supply = <&vcc_sys>; + vcc3-supply = <&vcc_sys>; + vcc4-supply = <&vcc_sys>; + vcc5-supply = <&vcc_sys>; + vcc6-supply = <&vcc_sys>; + vcc7-supply = <&vcc_sys>; + vcc8-supply = <&vcc_sys>; + vcc9-supply = <&dcdc_boost>; + + regulators { + vdd_logic: DCDC_REG1 { + regulator-name = "vdd_logic"; + regulator-always-on; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1350000>; + regulator-init-microvolt = <900000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <0x2>; + + regulator-state-mem { + regulator-off-in-suspend; + regulator-suspend-microvolt = <900000>; + }; + }; + + vdd_gpu_npu: DCDC_REG2 { + regulator-name = "vdd_gpu_npu"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1350000>; + regulator-init-microvolt = <900000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <0x2>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-initial-mode = <0x2>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_3v3: DCDC_REG4 { + regulator-name = "vcc_3v3"; + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-initial-mode = <0x2>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcca_1v8_pmu: LDO_REG1 { + regulator-name = "vcca_1v8_pmu"; + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + /* unused */ + vdda_0v9_ldo: LDO_REG2 { + regulator-name = "vdda_0v9_ldo"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdda_0v9_pmu: LDO_REG3 { + regulator-name = "vdda_0v9_pmu"; + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vccio_acodec: LDO_REG4 { + regulator-name = "vccio_acodec"; + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + /* unused */ + vccio_sd: LDO_REG5 { + regulator-name = "vccio_sd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_3v3_pmu: LDO_REG6 { + regulator-name = "vcc_3v3_pmu"; + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_1v8_en: LDO_REG7 { + regulator-name = "vcc_1v8_en"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vbat_4g_en: LDO_REG8 { + regulator-name = "vbat_4g_en"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + sleep_sta_ctl: LDO_REG9 { + regulator-name = "sleep_sta_ctl"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + dcdc_boost: BOOST { + regulator-name = "boost"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + otg_switch: OTG_SWITCH { + regulator-name = "otg_switch"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + }; + }; +}; + +&i2c1 { + status = "okay"; + + digitizer@9 { + compatible = "wacom,w9013", "hid-over-i2c"; + reg = <0x09>; + hid-descr-addr = <0x1>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PB6 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 = <&pen_fwe>, <&pen_irq_l>, <&pen_rst_l>; + pinctrl-names = "default"; + vdd-supply = <&vcc_3v3_pmu>; + }; +}; +
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 450
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+&i2c3 { + pinctrl-0 = <&i2c3m1_xfer>; + status = "okay"; + + led-controller@36 { + compatible = "ti,lm3630a"; + reg = <0x36>; + #address-cells = <1>; + #size-cells = <0>;
Move thing that start with "#" down the list as possible.
Quoted 51 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +51
-0+ enable-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&backlight_hwen_h>; + pinctrl-names = "default"; + + led@0 { + reg = <0>; + label = "backlight_cool"; + default-brightness = <0>; + }; + + led@1 { + reg = <1>; + label = "backlight_warm"; + default-brightness = <0>; + }; + }; +}; + +&i2s1_8ch { + pinctrl-0 = <&i2s1m0_lrcktx>, <&i2s1m0_sclktx>, <&i2s1m0_sdi0>, <&i2s1m0_sdo0>; + rockchip,trcm-sync-tx-only; + status = "okay"; +}; + +&pdm { + pinctrl-0 = <&pdmm0_clk1>, <&pdmm0_sdi1>, <&pdmm0_sdi2>; + /* microphones are on channels 1 and 2 */ + rockchip,path-map = <1>, <2>, <0>, <3>; + status = "okay"; +}; + +&pinctrl { + audio-amplifier { + spk_amp_enable_h: spk-amp-enable-h { + rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + backlight { + backlight_hwen_h: backlight-hwen-h { + rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + bt { + bt_enable_h: bt-enable-h { + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_host_wake_l: bt-host-wake-l { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up>;
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 510
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ }; + + bt_wake_h: bt-wake-h { + rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + led { + led_gpio: led-gpio {
led_pin: led-pin {gpio is a reserved node name. ~/.local/lib/python3.7/site-packages/dtschema/schemas/gpio/gpio-consumer.yaml
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 515
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +5
-0+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + hall {
Maybe use:
key {Keep node name above and in pinctrl aligned.
Quoted 28 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +28
-0+ hall_int_l: hall-int-l { + rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pen { + pen_fwe: pen-fwe { + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + pen_irq_l: pen-irq-l { + rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pen_rst_l: pen-rst-l { + rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pmic_sleep: pmic-sleep { + rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>; + }; + };
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 552
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + vcc-wl { + vcc_wl_gpio: vcc-wl-gpio {
vcc_wl_pin: vcc-wl-pin {gpio is a reserved node name. ~/.local/lib/python3.7/site-packages/dtschema/schemas/gpio/gpio-consumer.yaml
Quoted 35 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +35
-0+ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + wifi { + wifi_host_wake_l: wifi-host-wake-l { + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; + +&pmu_io_domains { + pmuio1-supply = <&vcc_3v3_pmu>; + pmuio2-supply = <&vcc_3v3_pmu>; + vccio1-supply = <&vccio_acodec>; + vccio2-supply = <&vcc_1v8>; + vccio3-supply = <&vcc_3v3>; + vccio4-supply = <&vcca_1v8_pmu>; + vccio5-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_3v3>; + status = "okay"; +}; + +&saradc { + vref-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdhci { + bus-width = <8>; + mmc-hs200-1_8v; + non-removable; + pinctrl-0 = <&emmc_bus8>, <&emmc_clk>, <&emmc_cmd>, <&emmc_datastrobe>, <&emmc_rstnout>; + pinctrl-names = "default"; + vmmc-supply = <&vcc_3v3>;
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 596
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ vqmmc-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdmmc1 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + disable-wp;
From mmc-controller.yaml:
disable-wp:
$ref: /schemas/types.yaml#/definitions/flag
description:
When set, no physical write-protect line is present. This property should only be specified when the controller has a dedicated write-protect detection logic. If a GPIO is always used for the write-protect detection logic, it is sufficient to not specify the wp-gpios property in the absence of a write-protect line. Not used in combination with eMMC or SDIO.
Quoted 42 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +42
-0+ keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-0 = <&sdmmc1_bus4>, <&sdmmc1_clk>, <&sdmmc1_cmd>; + pinctrl-names = "default"; + sd-uhs-sdr104; + vmmc-supply = <&vcc_wl>; + vqmmc-supply = <&vcca_1v8_pmu>; + status = "okay"; +}; + +&tsadc { + /* tshut mode 0:CRU 1:GPIO */ + rockchip,hw-tshut-mode = <1>; + /* tshut polarity 0:LOW 1:HIGH */ + rockchip,hw-tshut-polarity = <0>; + status = "okay"; +}; + +&uart1 { + pinctrl-0 = <&uart1m0_ctsn>, <&uart1m0_rtsn>, <&uart1m0_xfer>; + pinctrl-names = "default"; + uart-has-rtscts; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk817 1>; + clock-names = "lpo"; + device-wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; + host-wake-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&bt_enable_h>, <&bt_host_wake_l>, <&bt_wake_h>; + pinctrl-names = "default"; + vbat-supply = <&vcc_wl>; + vddio-supply = <&vcca_1v8_pmu>; + }; +}; + +&uart2 { + status = "okay"; +};
Re: [PATCH 3/3] arm64: dts: rockchip: Add Pine64 PineNote board
Quoted 8 lines · Johan Jonker
Hi Samuel,
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 13
Quoted 4 lines · Samuel Holland
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +3
-0+/ { + aliases { + mmc0 = &sdhci;
sdmmc1 ??
MMC aliases should be sort on reg address, based on availability and without number gap.
Quoted 2 lines
Quoted 2 lines
(quoted diff) +2
-0+ }; +
[..]
Quoted 41 lines
Quoted 7 lines
+&sdhci {
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +6
-0+ bus-width = <8>; + mmc-hs200-1_8v; + non-removable; + pinctrl-0 = <&emmc_bus8>, <&emmc_clk>, <&emmc_cmd>, <&emmc_datastrobe>, <&emmc_rstnout>; + pinctrl-names = "default"; + vmmc-supply = <&vcc_3v3>;arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi line 596
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +9
-0+ vqmmc-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdmmc1 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + disable-wp;From
mmc-controller.yaml:disable-wp:
$ref: /schemas/types.yaml#/definitions/flag
description:
When set, no physical write-protect line is present. This property should only be specified when the controller has a dedicated write-protect detection logic. If a GPIO is always used for the write-protect detection logic, it is sufficient to not specify the wp-gpios property in the absence of a write-protect line. Not used in combination with eMMC or SDIO.Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi new file +11
-0+ keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-0 = <&sdmmc1_bus4>, <&sdmmc1_clk>, <&sdmmc1_cmd>; + pinctrl-names = "default"; + sd-uhs-sdr104; + vmmc-supply = <&vcc_wl>; + vqmmc-supply = <&vcca_1v8_pmu>; + status = "okay"; +}; +
Quoted 10 lines · Samuel Holland
The PineNote is a tablet from Pine64 based on the RK3566 SoC. There are two existing variants of the board. v1.1 was contained in some early samples, and v1.2 was sold as the "PineNote Developer Edition".
Signed-off-by Samuel Holland <[email protected]>---
Documentation/devicetree/bindings/arm/rockchip.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Quoted 3 lines · Samuel Holland
The PineNote is a tablet from Pine64 based on the RK3566 SoC. There are two existing variants of the board. v1.1 was contained in some early samples, and v1.2 was sold as the "PineNote Developer Edition".
Applied, thanks!
[1/3] dt-bindings: arm: rockchip: Add Pine64 PineNote board
commit: a7c9013216f399791ca354cc2e0f4a444837fe39
[2/3] arm64: dts: rockchip: rk356x: Add pdm node
commit: 79c5f0e52d29a688a951fc818394b529e7e77e3e-> change ordering for pinctrl properties, as suggested by Michael
[3/3] arm64: dts: rockchip: Add Pine64 PineNote board
commit: d449121e5e8addcee654250cec298c887ecafb32
-> folded in Johan's review comments
Though mmc0 can stay at sdhci. I don't think we _need_ aliases for all, but fixing mmc0 for the internal emmc makes a lot of sense.
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>