vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: rk3399-puma: Sync DT from Linux kernel v6.8

Browse Source 
Sync rk3399-puma related device tree from Linux kernel v6.8.

The vdd_log node is already part of rk3399-puma.dtsi, only keep the
regulator-init-microvolt prop in u-boot.dtsi.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Jonas Karlman
2024-05-07 15:56:09 +08:00
committed by Kever Yang
parent 9daeb7cb6d
commit 04158eb451
3 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
+4 -12
View File
@@ -30,18 +30,6 @@
aliases {
spi5 = &spi5;
};
vdd_log: vdd-log {
compatible = "pwm-regulator";
pwms = <&pwm2 0 25000 1>;
regulator-name = "vdd_log";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-init-microvolt = <950000>;
vin-supply = <&vcc5v0_sys>;
};
};
&binman {
@@ -111,3 +99,7 @@
bootph-pre-sram;
bootph-pre-ram;
};
&vdd_log {
regulator-init-microvolt = <950000>;
};
arch/arm/dts/rk3399-puma-haikou.dts
+36 -6
View File
@@ -5,6 +5,7 @@
/dts-v1/;
#include "rk3399-puma.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "Theobroma Systems RK3399-Q7 SoM";
@@ -18,6 +19,38 @@
stdout-path = "serial0:115200n8";
};
gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <&haikou_keys_pin>;
pinctrl-names = "default";
button-batlow-n {
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
label = "BATLOW#";
linux,code = <KEY_BATTERY>;
};
button-slp-btn-n {
gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
label = "SLP_BTN#";
linux,code = <KEY_SLEEP>;
};
button-wake-n {
gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_LOW>;
label = "WAKE#";
linux,code = <KEY_WAKEUP>;
wakeup-source;
};
switch-lid-btn-n {
gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
label = "LID_BTN#";
linux,code = <SW_LID>;
linux,input-type = <EV_SW>;
};
};
leds {
pinctrl-0 = <&module_led_pin>, <&sd_card_led_pin>;
@@ -165,11 +198,8 @@
};
&pinctrl {
pinctrl-names = "default";
pinctrl-0 = <&haikou_pin_hog>;
hog {
haikou_pin_hog: haikou-pin-hog {
buttons {
haikou_keys_pin: haikou-keys-pin {
rockchip,pins =
/* LID_BTN */
<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>,
@@ -177,7 +207,7 @@
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>,
/* SLP_BTN# */
<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
/* BIOS_DISABLE# */
/* WAKE# */
<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
arch/arm/dts/rk3399-puma.dtsi
+16 -1
View File
@@ -9,6 +9,7 @@
/ {
aliases {
ethernet0 = &gmac;
mmc0 = &sdhci;
};
@@ -27,7 +28,7 @@
extcon_usb3: extcon-usb3 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
id-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb3_id>;
};
@@ -119,6 +120,20 @@
drive-impedance-ohm = <33>;
};
&gpio0 {
/*
* The BIOS_DISABLE hog is a feedback pin for the actual status of the
* signal. This usually represents the state of a switch on the baseboard.
* The pin has a 10k pull-up resistor connected, so no pull-up setting is needed.
*/
bios-disable-hog {
gpios = <RK_PB0 GPIO_ACTIVE_HIGH>;
gpio-hog;
input;
line-name = "bios_disable";
};
};
&gmac {
assigned-clocks = <&cru SCLK_RMII_SRC>;
assigned-clock-parents = <&clkin_gmac>;