projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'kconfig-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3399-khadas-edge.dtsi
diff --git
a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
index
e36837c
..
635afdd
100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
+++ b/
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
@@
-138,6
+138,14
@@
};
};
};
};
+ ir-receiver {
+ compatible = "gpio-ir-receiver";
+ gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
+ linux,rc-map-name = "rc-khadas";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ir_rx>;
+ };
+
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@
-585,6
+593,12
@@
};
};
};
};
+ ir {
+ ir_rx: ir-rx {
+ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
leds {
sys_led_pin: sys-led-pin {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
leds {
sys_led_pin: sys-led-pin {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
@@
-690,6
+704,16
@@
status = "okay";
};
status = "okay";
};
+&spi1 {
+ status = "okay";
+
+ spiflash: flash@0 {
+ compatible = "winbond,w25q128fw", "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <104000000>;
+ };
+};
+
&tcphy0 {
status = "okay";
};
&tcphy0 {
status = "okay";
};