Support for the onboard LEDs of the 2 96boards (ficus, rock960),
hdmi output for rockpro64, vpu node on rk3399 and adding the always on 32kHz clock on rk3399-Gru to get a more complete clock tree. -----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlwQxHMQHGhlaWtvQHNu dGVjaC5kZQAKCRDzpnnJnNEdgTbOCACON4DSK2x1MpKOOcUMniqPW6Q7KP3o5MJ6 vTgBHdnjTK4LQLrq/B0LBwe4czJSj0uKxdf4bPddZgZSvM1bSdjQ7YHoZNRB5UTx pO4qiiGdLw4CAAMEhaOivN51KBxri+qyUNq/Pyh5lhhyrqjPswDzyA4ou22SaXzY 2BqT8tzHDUmCzXM+0mD+81VMCQax5rezjDFeod6MRT5oSqa4xht7fd4M2Wc5Vqkr B0YfdWvH9ey06vF8bLm2828yA6Gr3uCEHbkVD15PNBGixN0aRSSH6BEThFih+PHq nMkN51wZepnkW3q8wIU6O46UERWE7ySmyZD8ph45IuPtEBXy+aOG =s5pB -----END PGP SIGNATURE----- Merge tag 'v4.21-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Support for the onboard LEDs of the 2 96boards (ficus, rock960), hdmi output for rockpro64, vpu node on rk3399 and adding the always on 32kHz clock on rk3399-Gru to get a more complete clock tree. * tag 'v4.21-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add on-board LED support on rk3399-rock960 arm64: dts: rockchip: Add on-board LED support on rk3399-ficus arm64: dts: rockchip: enable hdmi output on rk3399-rockpro64 arm64: dts: rockchip: add VPU device node for RK3399 arm64: dts: rockchip: Add 32k clk on rk3399-gru Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
Коммит
5cc60b0497
|
|
@ -23,6 +23,52 @@
|
|||
clock-output-names = "clkin_gmac";
|
||||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>,
|
||||
<&user_led4>, <&wlan_led>, <&bt_led>;
|
||||
|
||||
user_led1 {
|
||||
label = "red:user1";
|
||||
gpios = <&gpio4 25 0>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
|
||||
user_led2 {
|
||||
label = "red:user2";
|
||||
gpios = <&gpio4 26 0>;
|
||||
linux,default-trigger = "mmc0";
|
||||
};
|
||||
|
||||
user_led3 {
|
||||
label = "red:user3";
|
||||
gpios = <&gpio4 30 0>;
|
||||
linux,default-trigger = "mmc1";
|
||||
};
|
||||
|
||||
user_led4 {
|
||||
label = "red:user4";
|
||||
gpios = <&gpio1 0 0>;
|
||||
panic-indicator;
|
||||
linux,default-trigger = "none";
|
||||
};
|
||||
|
||||
wlan_active_led {
|
||||
label = "red:wlan";
|
||||
gpios = <&gpio1 1 0>;
|
||||
linux,default-trigger = "phy0tx";
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
bt_active_led {
|
||||
label = "red:bt";
|
||||
gpios = <&gpio1 4 0>;
|
||||
linux,default-trigger = "hci0-power";
|
||||
default-state = "off";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&gmac {
|
||||
|
|
@ -66,6 +112,38 @@
|
|||
<4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
user_led1: user_led1 {
|
||||
rockchip,pins =
|
||||
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led2: user_led2 {
|
||||
rockchip,pins =
|
||||
<4 26 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led3: user_led3 {
|
||||
rockchip,pins =
|
||||
<4 30 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led4: user_led4 {
|
||||
rockchip,pins =
|
||||
<1 0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
wlan_led: wlan_led {
|
||||
rockchip,pins =
|
||||
<1 1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
bt_led: bt_led {
|
||||
rockchip,pins =
|
||||
<1 4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
|
|
|
|||
|
|
@ -262,6 +262,13 @@
|
|||
pp5000_usb_a_vbus: pp5000 {
|
||||
};
|
||||
|
||||
ap_rtc_clk: ap-rtc-clk {
|
||||
compatible = "fixed-clock";
|
||||
clock-frequency = <32768>;
|
||||
clock-output-names = "xin32k";
|
||||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
gpio_keys: gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
pinctrl-names = "default";
|
||||
|
|
|
|||
|
|
@ -13,6 +13,53 @@
|
|||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>,
|
||||
<&user_led4>, <&wlan_led>, <&bt_led>;
|
||||
|
||||
user_led1 {
|
||||
label = "green:user1";
|
||||
gpios = <&gpio4 RK_PC2 0>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
|
||||
user_led2 {
|
||||
label = "green:user2";
|
||||
gpios = <&gpio4 RK_PC6 0>;
|
||||
linux,default-trigger = "mmc0";
|
||||
};
|
||||
|
||||
user_led3 {
|
||||
label = "green:user3";
|
||||
gpios = <&gpio4 RK_PD0 0>;
|
||||
linux,default-trigger = "mmc1";
|
||||
};
|
||||
|
||||
user_led4 {
|
||||
label = "green:user4";
|
||||
gpios = <&gpio4 RK_PD4 0>;
|
||||
panic-indicator;
|
||||
linux,default-trigger = "none";
|
||||
};
|
||||
|
||||
wlan_active_led {
|
||||
label = "yellow:wlan";
|
||||
gpios = <&gpio4 RK_PD5 0>;
|
||||
linux,default-trigger = "phy0tx";
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
bt_active_led {
|
||||
label = "blue:bt";
|
||||
gpios = <&gpio4 RK_PD6 0>;
|
||||
linux,default-trigger = "hci0-power";
|
||||
default-state = "off";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
|
|
@ -20,6 +67,38 @@
|
|||
};
|
||||
|
||||
&pinctrl {
|
||||
leds {
|
||||
user_led1: user_led1 {
|
||||
rockchip,pins =
|
||||
<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led2: user_led2 {
|
||||
rockchip,pins =
|
||||
<4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led3: user_led3 {
|
||||
rockchip,pins =
|
||||
<4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
user_led4: user_led4 {
|
||||
rockchip,pins =
|
||||
<4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
wlan_led: wlan_led {
|
||||
rockchip,pins =
|
||||
<4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
bt_led: bt_led {
|
||||
rockchip,pins =
|
||||
<4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
pcie {
|
||||
pcie_drv: pcie-drv {
|
||||
rockchip,pins =
|
||||
|
|
|
|||
|
|
@ -205,6 +205,13 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi {
|
||||
ddc-i2c-bus = <&i2c3>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hdmi_cec>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
clock-frequency = <400000>;
|
||||
i2c-scl-rising-time-ns = <168>;
|
||||
|
|
|
|||
|
|
@ -1242,6 +1242,18 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
vpu: video-codec@ff650000 {
|
||||
compatible = "rockchip,rk3399-vpu";
|
||||
reg = <0x0 0xff650000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>,
|
||||
<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||
interrupt-names = "vepu", "vdpu";
|
||||
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
|
||||
clock-names = "aclk", "hclk";
|
||||
iommus = <&vpu_mmu>;
|
||||
power-domains = <&power RK3399_PD_VCODEC>;
|
||||
};
|
||||
|
||||
vpu_mmu: iommu@ff650800 {
|
||||
compatible = "rockchip,iommu";
|
||||
reg = <0x0 0xff650800 0x0 0x40>;
|
||||
|
|
@ -1250,7 +1262,7 @@
|
|||
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
|
||||
clock-names = "aclk", "iface";
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
power-domains = <&power RK3399_PD_VCODEC>;
|
||||
};
|
||||
|
||||
vdec_mmu: iommu@ff660480 {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче