tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v6.12-rockchip-dts32-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

Browse Source 
spidev on the elgin-r1 got a real compatible, the rk3128 could enable its
VPU for video decoding and the rk3128 sfc node can use the clock constant
now after the merge-window.

* tag 'v6.12-rockchip-dts32-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Do not describe unexisting DAC device on rv1108-elgin-r1
  ARM: dts: rockchip: Add vpu nodes for RK3128
  ARM: dts: rockchip: use constant for HCLK_SFC on rk3128

Link: https://lore.kernel.org/r/3405397.RL5eaSpR8r@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2024-09-03 10:40:27 +00:00
parent 57e8098a9a 0296f20c72
commit 06b6879f0a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/rockchip/rk3128.dtsi
+25 -1
View File
@@ -254,6 +254,30 @@
};
};
vpu: video-codec@10106000 {
compatible = "rockchip,rk3128-vpu", "rockchip,rk3066-vpu";
reg = <0x10106000 0x800>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "vepu", "vdpu";
clocks = <&cru ACLK_VDPU>, <&cru HCLK_VDPU>,
<&cru ACLK_VEPU>, <&cru HCLK_VEPU>;
clock-names = "aclk_vdpu", "hclk_vdpu",
"aclk_vepu", "hclk_vepu";
iommus = <&vpu_mmu>;
power-domains = <&power RK3128_PD_VIDEO>;
};
vpu_mmu: iommu@10106800 {
compatible = "rockchip,iommu";
reg = <0x10106800 0x100>;
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru ACLK_VEPU>, <&cru HCLK_VDPU>;
clock-names = "aclk", "iface";
power-domains = <&power RK3128_PD_VIDEO>;
#iommu-cells = <0>;
};
vop: vop@1010e000 {
compatible = "rockchip,rk3126-vop";
reg = <0x1010e000 0x300>;
@@ -429,7 +453,7 @@
compatible = "rockchip,sfc";
reg = <0x1020c000 0x8000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru SCLK_SFC>, <&cru 479>;
clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>;
clock-names = "clk_sfc", "hclk_sfc";
status = "disabled";
};
arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts
+2 -2
View File
@@ -168,8 +168,8 @@
pinctrl-0 = <&spim1_clk &spim1_cs0 &spim1_tx &spim1_rx>;
status = "okay";
dh2228fv: dac@0 {
compatible = "rohm,dh2228fv";
display: display@0 {
compatible = "elgin,jg10309-01";
reg = <0>;
spi-max-frequency = <24000000>;
spi-cpha;