leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Veyron backlight fix, another fix for dtbs-check and some additions

Browse Source 
to the rk3288-based VMARC boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAl/NHWkQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgVlcB/wIdj41vGWslMZcShijb+QeW5W6bYus3WkX
 Zvl+RDGccGbjDH6UEKP+XETXR2tgKfXSooiO8YKjEV9L/fnfMZQWQh3rPg8SA39b
 f2N7JTnB7YCasZU4XXeQtqB6TKRubAZixUxEWibY1l1mwb+izPeij73PptjEMgsm
 jkVOjwX4lWhfISbVf2Nl5d6KWfbJgPgqu0yA7kIDlRDOvmsxh8vQyByHaTltoa/+
 slLEGn0B+7kMEdGSdL6TgGQ1jwF1WPGoBokl7CnTsNzBkzQIm2wVnbvzZNY/5oI4
 2HCR8ihpqjDxy84Dx3mmlVCl6uGCG8ipHSpLubg3rvqRhA2w1fes
 =oBVw
 -----END PGP SIGNATURE-----

Merge tag 'v5.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Veyron backlight fix, another fix for dtbs-check and some additions
to the rk3288-based VMARC boards.

* tag 'v5.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add SDIO0 node for VMARC SOM
  ARM: dts: rockchip: Add rtc node for VMARC SOM
  ARM: dts: rockchip: rename wdt nodename to watchdog on rv1108
  ARM: dts: rockchip: Remove 0 point from brightness-levels on rk3288-veyron

Link: https://lore.kernel.org/r/4582475.GXAFRqVoOG@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-12-09 00:04:34 +01:00
commit 4569830224
7 changed files with 81 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3288-veyron-jaq.dts
View File

@ -20,7 +20,7 @@
&backlight {
/* Jaq panel PWM must be >= 3%, so start non-zero brightness at 8 */
brightness-levels = <0 8 255>;
brightness-levels = <8 255>;
num-interpolated-steps = <247>;
};

2
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View File

@ -39,7 +39,7 @@
&backlight {
/* Minnie panel PWM must be >= 1%, so start non-zero brightness at 3 */
brightness-levels = <0 3 255>;
brightness-levels = <3 255>;
num-interpolated-steps = <252>;
};

2
arch/arm/boot/dts/rk3288-veyron-tiger.dts
View File

@ -23,7 +23,7 @@
&backlight {
/* Tiger panel PWM must be >= 1%, so start non-zero brightness at 3 */
brightness-levels = <0 3 255>;
brightness-levels = <3 255>;
num-interpolated-steps = <252>;
};

40
arch/arm/boot/dts/rk3288-vmarc-som.dtsi
View File

@ -231,6 +231,23 @@
};
};
&i2c1 {
clock-frequency = <400000>;
status = "okay";
hym8563: rtc@51 {
compatible = "haoyu,hym8563";
reg = <0x51>;
interrupt-parent = <&gpio5>;
interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
#clock-cells = <0>;
clock-frequency = <32768>;
clock-output-names = "hym8563";
pinctrl-names = "default";
pinctrl-0 = <&hym8563_int>;
};
};
&i2c5 {
status = "okay";
};
@ -241,10 +258,17 @@
gpio1830-supply = <&vcc_18>;
gpio30-supply = <&vcc_io>;
sdcard-supply = <&vccio_sd>;
wifi-supply = <&vcc_wl>;
status = "okay";
};
&pinctrl {
hym8563 {
hym8563_int: hym8563-int {
rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
drive-strength = <8>;
};
@ -260,6 +284,12 @@
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
@ -291,6 +321,16 @@
};
};
&sdio_pwrseq {
/*
* 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 = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>; /* WIFI_REG_ON */
};
&usbphy {
status = "okay";
};

21
arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
View File

@ -15,6 +15,14 @@
#clock-cells = <0>;
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&hym8563>;
clock-names = "ext_clock";
pinctrl-names = "default";
pinctrl-0 = <&wifi_enable_h>;
};
vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
@ -78,6 +86,19 @@
status = "okay";
};
&sdio0 {
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
sd-uhs-sdr104;
status = "okay";
};
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;

2
arch/arm/boot/dts/rv1108.dtsi
View File

@ -299,7 +299,7 @@
clock-names = "timer", "pclk";
};
watchdog: wdt@10360000 {
watchdog: watchdog@10360000 {
compatible = "snps,dw-wdt";
reg = <0x10360000 0x100>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

16
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
View File

@ -353,6 +353,12 @@
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
vbus_host {
usb1_en_oc: usb1-en-oc {
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
@ -371,6 +377,16 @@
pmu1830-supply = <&vcc_1v8>;
};
&sdio_pwrseq {
/*
* 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 = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
};
&sdhci {
bus-width = <8>;
mmc-hs400-1_8v;