Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 08:31:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

RGA node for rk322x, wifi node for rk3229-xms6 and some cleanups.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAl7F1U4QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgUC3B/9ISdYLQiMp8p76z1hITI2xjIwB0Vb6+MMv
 j0RjfUNUS7PgkoZY11eF5gMrVuvU82Bzvxnz5h/X+rbjq0cX4uyqp3vCo3M+S8f8
 J32FSD4QbkoxZIvt8n8cD2E1Oj63X2Fg3olwYL1b3JIrihPwT5mmQKx1XDmZafb5
 OobPSyxb8NSKN2X3uu4vhHhpkJHStxQ5d6/ShCI4W6kowWDxB+TJrr5pSuyaGY2u
 bz0wc4PhhESfuBBU3ohBrFg9NSNHFKur+PRl7r2rEyTNekWIb5LVVeZvPg+UaKGC
 nnfz9rXQ6LdnEeTB0mFGy8N5Lj3iXZew7N3n1Y6qcLHHtW+GQeVq
 =GVKq
 -----END PGP SIGNATURE-----

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

RGA node for rk322x, wifi node for rk3229-xms6 and some cleanups.

* tag 'v5.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add rga node for rk322x
  ARM: dts: remove disable-wp from rk3229-xms6 emmc
  ARM: dts: enable WLAN for Mecer Xtreme Mini S6
  ARM: dts: rockchip: remove identical #include from rk3288.dtsi
  ARM: dts: rockchip: rename and label gpio-led subnodes

Link: https://lore.kernel.org/r/3735080.6Cexqc3t0Y@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-05-21 23:16:36 +02:00
commit 9440d8acb5
12 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3036-kylin.dts
View File

@ -16,7 +16,7 @@
leds: gpio-leds {
compatible = "gpio-leds";
work {
work_led: led-0 {
gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
label = "kylin:red:led";
pinctrl-names = "default";

2
arch/arm/boot/dts/rk3066a-mk808.dts
View File

@ -22,7 +22,7 @@
gpio-leds {
compatible = "gpio-leds";
blue {
blue_led: led-0 {
label = "mk808:blue:power";
gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
default-state = "off";

6
arch/arm/boot/dts/rk3188-radxarock.dts
View File

@ -33,19 +33,19 @@
gpio-leds {
compatible = "gpio-leds";
green {
green_led: led-0 {
label = "rock:green:user1";
gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_LOW>;
default-state = "off";
};
blue {
blue_led: led-1 {
label = "rock:blue:user2";
gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
default-state = "off";
};
sleep {
sleep_led: led-2 {
label = "rock:red:power";
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
default-state = "off";

19
arch/arm/boot/dts/rk3229-xms6.dts
View File

@ -33,12 +33,18 @@
power-led {
compatible = "gpio-leds";
blue {
blue_led: led-0 {
gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>,
<&gpio2 29 GPIO_ACTIVE_LOW>;
};
vcc_host: vcc-host-regulator {
compatible = "regulator-fixed";
enable-active-high;
@ -131,7 +137,6 @@
&emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
status = "okay";
};
@ -202,6 +207,16 @@
status = "okay";
};
&sdio {
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
vqmmc-supply = <&vccio_1v8>;
status = "okay";
};
&sdmmc {
cap-mmc-highspeed;
disable-wp;

10
arch/arm/boot/dts/rk322x.dtsi
View File

@ -615,6 +615,16 @@
status = "disabled";
};
rga: rga@20060000 {
compatible = "rockchip,rk3228-rga", "rockchip,rk3288-rga";
reg = <0x20060000 0x1000>;
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
clock-names = "aclk", "hclk", "sclk";
resets = <&cru SRST_RGA>, <&cru SRST_RGA_A>, <&cru SRST_RGA_H>;
reset-names = "core", "axi", "ahb";
};
iep_mmu: iommu@20070800 {
compatible = "rockchip,iommu";
reg = <0x20070800 0x100>;

12
arch/arm/boot/dts/rk3288-firefly-reload.dts
View File

@ -45,20 +45,20 @@
leds {
compatible = "gpio-leds";
power {
power_led: led-0 {
gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
label = "firefly:blue:power";
pinctrl-names = "default";
pinctrl-0 = <&power_led>;
pinctrl-0 = <&power_led_pin>;
panic-indicator;
};
work {
work_led: led-1 {
gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
label = "firefly:blue:user";
linux,default-trigger = "rc-feedback";
pinctrl-names = "default";
pinctrl-0 = <&work_led>;
pinctrl-0 = <&work_led_pin>;
};
};
@ -334,11 +334,11 @@
};
leds {
power_led: power-led {
power_led_pin: power-led-pin {
rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
work_led: work-led {
work_led_pin: work-led-pin {
rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

12
arch/arm/boot/dts/rk3288-firefly.dtsi
View File

@ -62,20 +62,20 @@
leds {
compatible = "gpio-leds";
work {
work_led: led-0 {
gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
label = "firefly:blue:user";
linux,default-trigger = "rc-feedback";
pinctrl-names = "default";
pinctrl-0 = <&work_led>;
pinctrl-0 = <&work_led_pin>;
};
power {
power_led: led-1 {
gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
label = "firefly:green:power";
linux,default-trigger = "default-on";
pinctrl-names = "default";
pinctrl-0 = <&power_led>;
pinctrl-0 = <&power_led_pin>;
};
};
@ -429,11 +429,11 @@
};
leds {
power_led: power-led {
power_led_pin: power-led-pin {
rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
work_led: work-led {
work_led_pin: work-led-pin {
rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm/boot/dts/rk3288-miqi.dts
View File

@ -30,7 +30,7 @@
leds {
compatible = "gpio-leds";
work {
work_led: led-0 {
gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
label = "miqi:green:user";
linux,default-trigger = "timer";

6
arch/arm/boot/dts/rk3288-phycore-som.dtsi
View File

@ -36,9 +36,9 @@
leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&user_led>;
pinctrl-0 = <&user_led_pin>;
user {
user_led: led-0 {
label = "green_led";
gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
@ -372,7 +372,7 @@
};
leds {
user_led: user-led {
user_led_pin: user-led-pin {
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_output_high>;
};
};

4
arch/arm/boot/dts/rk3288-rock2-square.dts
View File

@ -41,13 +41,13 @@
gpio-leds {
compatible = "gpio-leds";
heartbeat {
heartbeat_led: led-0 {
gpios = <&gpio7 RK_PB7 GPIO_ACTIVE_LOW>;
label = "rock2:green:state1";
linux,default-trigger = "heartbeat";
};
mmc {
mmc_led: led-1 {
gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
label = "rock2:blue:state2";
linux,default-trigger = "mmc0";

6
arch/arm/boot/dts/rk3288-tinker.dtsi
View File

@ -46,17 +46,17 @@
gpio-leds {
compatible = "gpio-leds";
act-led {
act_led: led-0 {
gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0";
};
heartbeat-led {
heartbeat_led: led-1 {
gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
pwr-led {
pwr_led: led-2 {
gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
};

1
arch/arm/boot/dts/rk3288.dtsi
View File

@ -7,7 +7,6 @@
#include <dt-bindings/clock/rk3288-cru.h>
#include <dt-bindings/power/rk3288-power.h>
#include <dt-bindings/thermal/thermal.h>
#include <dt-bindings/power/rk3288-power.h>
#include <dt-bindings/soc/rockchip,boot-mode.h>
/ {