diff options
author | Michal Wilczynski <m.wilczynski@samsung.com> | 2024-08-28 10:19:57 +0200 |
---|---|---|
committer | Michal Wilczynski <m.wilczynski@samsung.com> | 2024-08-30 18:07:24 +0200 |
commit | 33c33a5aa1bb56423d363d9362e93a7ab31715f3 (patch) | |
tree | 1677fc5667ec5581fb4c69080579259e4644d048 | |
parent | 0d8501e25a7f8f3cf12f2d1e65d7641a606236a2 (diff) | |
download | linux-riscv-33c33a5aa1bb56423d363d9362e93a7ab31715f3.tar.gz linux-riscv-33c33a5aa1bb56423d363d9362e93a7ab31715f3.tar.bz2 linux-riscv-33c33a5aa1bb56423d363d9362e93a7ab31715f3.zip |
riscv: dts: spacemit: Add hdmi and gpu nodes
In order for the gpu and hdmi to work the device tree nodes need to be
added and enabled. Port them from the vendor kernel [1].
[1] - https://github.com/BPI-SINOVOIP/pi-linux.git
Change-Id: Ib6ec18e7781543446d1d8e3c3d6d1bfaf07eae25
Signed-off-by: Michal Wilczynski <m.wilczynski@samsung.com>
-rw-r--r-- | arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 16 | ||||
-rw-r--r-- | arch/riscv/boot/dts/spacemit/k1.dtsi | 29 |
2 files changed, 44 insertions, 1 deletions
diff --git a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts index d1a54d28bc52..47409cb1e6d5 100644 --- a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +++ b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts @@ -5,6 +5,7 @@ #include "k1.dtsi" #include "k1-x_pinctrl.dtsi" +#include "k1-x-hdmi.dtsi" / { model = "Banana Pi BPI-F3"; @@ -75,6 +76,17 @@ status = "okay"; }; +&dpu_online2_hdmi { + memory-region = <&dpu_resv>; + status = "okay"; +}; + +&hdmi{ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_0>; + status = "okay"; +}; + &i2c2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2_0>; @@ -539,3 +551,7 @@ spacemit,sdh-freq = <375000000>; status = "okay"; }; + +&imggpu { + status = "okay"; +}; diff --git a/arch/riscv/boot/dts/spacemit/k1.dtsi b/arch/riscv/boot/dts/spacemit/k1.dtsi index 30b3cec7da82..17bc7f6fca1c 100644 --- a/arch/riscv/boot/dts/spacemit/k1.dtsi +++ b/arch/riscv/boot/dts/spacemit/k1.dtsi @@ -8,6 +8,7 @@ #include <dt-bindings/clock/spacemit-k1x-clock.h> #include <dt-bindings/dma/k1x-dmac.h> #include <dt-bindings/pmu/k1x_pmu.h> +#include <dt-bindings/display/spacemit-dpu.h> /dts-v1/; / { @@ -380,7 +381,7 @@ }; }; - soc { + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>; #address-cells = <2>; @@ -537,6 +538,17 @@ status = "ok"; }; + hdmi_adma: adma@C0883800 { + compatible = "spacemit,k1x-adma"; + reg = <0x0 0xc0883800 0x0 0x100>, + <0x0 0xc0882050 0x0 0x4>, + <0x0 0xc08d0000 0x0 0x400>; + reg-names = "adma_reg", "ctrl_reg", "buf_addr"; + #dma-cells = <0>; + hdmi-sample; + status = "ok"; + }; + i2c2: i2c@d4012000 { compatible = "spacemit,k1x-i2c"; spacemit,adapter-id = <2>; @@ -970,5 +982,20 @@ status = "disabled"; }; + imggpu: imggpu@cac00000 { + compatible = "img,rgx"; + interrupt-names = "rgxirq"; + interrupt-parent = <&plic>; + interrupts = <75>; + reg = <0x0 0xcac00000 0x0 0x100000>; + reg-names = "rgxregs"; + clocks = <&ccu CLK_GPU>; + clock-names = "gpu_clk"; + resets = <&reset RESET_GPU>; + power-domains = <&power K1X_PMU_GPU_PWR_DOMAIN>; + interconnects = <&dram_range1>; + interconnect-names = "dma-mem"; + status = "ok"; + }; }; }; |