ARM: dts: rockchip: rework rv1126 battery-ipc common devices

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I246830a302453c6c5f5ae3920ddc3a9ce02c4144
This commit is contained in:
Ziyuan Xu
2020-09-28 20:51:53 +08:00
committed by Tao Huang
parent c715edfe85
commit 61fd70fe38
2 changed files with 168 additions and 41 deletions

View File

@@ -5,7 +5,7 @@
/dts-v1/;
#include "rv1126.dtsi"
#include "rv1126-ipc.dtsi"
#include "rv1126-bat-ipc.dtsi"
#include "rv1126-thunder-boot-emmc.dtsi"
#include <dt-bindings/input/input.h>
@@ -13,10 +13,6 @@
model = "Rockchip RV1126 BAT IPC V10 Board";
compatible = "rockchip,rv1126-bat-ipc-v10", "rockchip,rv1126";
chosen {
bootargs = "loglevel=0 initcall_nr_threads=-1 initcall_debug=0 printk.devkmsg=on root=/dev/rd0 console=ttyFIQ0 snd_aloop.index=7 driver_async_probe=dwmmc_rockchip";
};
adc-keys {
compatible = "adc-keys";
io-channels = <&saradc 0>;
@@ -61,9 +57,6 @@
};
};
/delete-node/ vdd-npu;
/delete-node/ vdd-vepu;
vcc1v2_dvdd: vcc1v8_dovdd: vcc2v8_avdd: vcc-camera {
compatible = "regulator-fixed";
regulator-name = "vcc_camera";
@@ -80,15 +73,6 @@
regulator-max-microvolt = <1800000>;
};
vcc_3v3: vcc-3v3 {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vccio_flash: vccio-flash {
compatible = "regulator-fixed";
regulator-name = "vccio_flash";
@@ -109,19 +93,6 @@
1800000 0>;
};
vdd_arm: vdd-arm {
compatible = "pwm-regulator";
pwms = <&pwm0 0 5000 1>;
regulator-name = "vdd_arm";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <1000000>;
regulator-init-microvolt = <824000>;
regulator-always-on;
regulator-boot-on;
regulator-settling-time-up-us = <250>;
pwm-supply = <&vcc_3v3>;
};
vdd_npu_vepu: vdd-npu-vepu {
compatible = "pwm-regulator";
pwms = <&pwm1 0 5000 1>;
@@ -331,13 +302,17 @@
vccio7-supply = <&vcc_3v3>;
};
&pwm1 {
status = "okay";
pinctrl-names = "active";
pinctrl-0 = <&pwm1m0_pins_pull_down>;
};
&rkisp_thunderboot {
reg = <0x10000000 (72 * 0x00100000)>;
};
&rkisp_vir0 {
status = "okay";
ports {
port@0 {
reg = <0>;
@@ -352,17 +327,8 @@
};
};
&rkispp {
status = "okay";
};
&rkispp_mmu {
status = "okay";
};
&rkvenc {
venc-supply = <&vdd_npu_vepu>;
status = "okay";
};
&rkvenc_mmu {

View File

@@ -0,0 +1,161 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2020 Rockchip Electronics Co., Ltd.
*/
/ {
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff570000 loglevel=0 initcall_nr_threads=-1 initcall_debug=0 printk.devkmsg=on root=/dev/rd0 console=ttyFIQ0 snd_aloop.index=7 driver_async_probe=dwmmc_rockchip";
};
vcc_3v3: vcc-3v3 {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vdd_arm: vdd-arm {
compatible = "pwm-regulator";
pwms = <&pwm0 0 5000 1>;
regulator-name = "vdd_arm";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <1000000>;
regulator-init-microvolt = <824000>;
regulator-always-on;
regulator-boot-on;
regulator-settling-time-up-us = <250>;
pwm-supply = <&vcc_3v3>;
};
};
&cpu0 {
cpu-supply = <&vdd_arm>;
};
&cpu_tsadc {
status = "okay";
};
&display_subsystem {
status = "okay";
};
&fiq_debugger {
status = "okay";
};
&mpp_srv {
status = "okay";
};
&nandc {
/delete-property/ pinctrl-names;
/delete-property/ pinctrl-0;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
nand@0 {
reg = <0>;
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <16>;
nand-ecc-step-size = <1024>;
};
};
&npu {
status = "okay";
};
&npu_tsadc {
status = "okay";
};
&optee {
status = "disabled";
};
&otp {
status = "okay";
};
&pwm0 {
status = "okay";
pinctrl-names = "active";
pinctrl-0 = <&pwm0m0_pins_pull_down>;
};
&ramoops {
status = "okay";
};
&rk_rga {
status = "okay";
};
&rkisp {
status = "okay";
};
&rkisp_vir0 {
status = "okay";
};
&rkisp_mmu {
status = "disabled";
};
&rkispp {
rockchip,restart-monitor-en;
status = "okay";
};
&rkispp_vir0 {
status = "okay";
};
&rkispp_mmu {
status = "okay";
};
&rkvenc {
status = "okay";
};
&rkvenc_mmu {
status = "okay";
};
&rng {
status = "okay";
};
&sfc {
/delete-property/ pinctrl-names;
/delete-property/ pinctrl-0;
status = "disabled";
};
&u2phy0 {
status = "okay";
u2phy_otg: otg-port {
status = "okay";
};
};
&usbdrd {
status = "okay";
};
&usbdrd_dwc3 {
status = "okay";
extcon = <&u2phy0>;
};
&vop {
status = "okay";
};