* [PATCH v5 2/9] riscv: dts: Add display property
2024-11-20 6:18 [PATCH v5 0/9] drm/verisilicon : support DC8200 and inno hdmi keith zhao
@ 2024-11-20 6:18 ` keith zhao
2024-11-20 16:48 ` Conor Dooley
0 siblings, 1 reply; 3+ messages in thread
From: keith zhao @ 2024-11-20 6:18 UTC (permalink / raw)
To: devicetree, dri-devel
Cc: andrzej.hajda, neil.armstrong, rfoss, Laurent.pinchart, jonas,
jernej.skrabec, maarten.lankhorst, mripard, tzimmermann, airlied,
simona, robh, krzk+dt, conor+dt, hjc, heiko, andy.yan,
william.qiu, xingyu.wu, kernel, paul.walmsley, palmer, aou,
p.zabel, changhuang.liang, keith.zhao, jack.zhu, linux-kernel
Add the display DT nodes in Starfive JH7110 soc-specific DT file.
Signed-off-by: keith zhao <keith.zhao@starfivetech.com>
---
.../boot/dts/starfive/jh7110-common.dtsi | 125 ++++++++++++++++++
arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 ++++++
2 files changed, 166 insertions(+)
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
index 9d77713f5361..301b56f2ef0c 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -30,6 +30,25 @@ memory@40000000 {
reg = <0x0 0x40000000 0x1 0x0>;
};
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ /* vout applies for space from this CMA
+ * Without this CMA reservation,
+ * vout may not work properly.
+ */
+ linux,cma {
+ compatible = "shared-dma-pool";
+ reusable;
+ size = <0x0 0x20000000>;
+ alignment = <0x0 0x1000>;
+ alloc-ranges = <0x0 0x70000000 0x0 0x20000000>;
+ linux,cma-default;
+ };
+ };
+
gpio-restart {
compatible = "gpio-restart";
gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>;
@@ -62,12 +81,55 @@ codec {
};
};
};
+
+ hdmi_con: hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi_out_con>;
+ };
+ };
+ };
};
&cpus {
timebase-frequency = <4000000>;
};
+&dc8200 {
+ status = "okay";
+ crtc_out: ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ dc_out0: port@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ dc_out_dpi0: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&hdmi_enc>;
+ };
+
+ };
+
+ dc_out1: port@1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ dc_out_dpi1: endpoint@1 {
+ reg = <1>;
+ //remote-endpoint = <&dsi_enc>;
+ };
+
+ };
+ };
+};
+
&dvp_clk {
clock-frequency = <74250000>;
};
@@ -88,6 +150,31 @@ &gmac1_rmii_refin {
clock-frequency = <50000000>;
};
+&hdmi {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_pins>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ hdmi_in: port@0 {
+ reg = <0>;
+ hdmi_enc: endpoint {
+ remote-endpoint = <&dc_out_dpi0>;
+ };
+ };
+
+ hdmi_out: port@1 {
+ reg = <1>;
+ hdmi_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+ };
+ };
+};
+
&hdmitx0_pixelclk {
clock-frequency = <297000000>;
};
@@ -366,6 +453,40 @@ &syscrg {
};
&sysgpio {
+ hdmi_pins: hdmi-0 {
+ hdmi-cec-pins {
+ pinmux = <GPIOMUX(14, GPOUT_SYS_HDMI_CEC_SDA,
+ GPOEN_SYS_HDMI_CEC_SDA,
+ GPI_SYS_HDMI_CEC_SDA)>;
+ input-enable;
+ bias-pull-up;
+ };
+
+ hdmi-hpd-pins {
+ pinmux = <GPIOMUX(15, GPOUT_HIGH,
+ GPOEN_ENABLE,
+ GPI_SYS_HDMI_HPD)>;
+ input-enable;
+ bias-disable; /* external pull-up */
+ };
+
+ hdmi-scl-pins {
+ pinmux = <GPIOMUX(0, GPOUT_SYS_HDMI_DDC_SCL,
+ GPOEN_SYS_HDMI_DDC_SCL,
+ GPI_SYS_HDMI_DDC_SCL)>;
+ input-enable;
+ bias-pull-up;
+ };
+
+ hdmi-sda-pins {
+ pinmux = <GPIOMUX(1, GPOUT_SYS_HDMI_DDC_SDA,
+ GPOEN_SYS_HDMI_DDC_SDA,
+ GPI_SYS_HDMI_DDC_SDA)>;
+ input-enable;
+ bias-pull-up;
+ };
+ };
+
i2c0_pins: i2c0-0 {
i2c-pins {
pinmux = <GPIOMUX(57, GPOUT_LOW,
@@ -656,3 +777,7 @@ &U74_3 {
&U74_4 {
cpu-supply = <&vdd_cpu>;
};
+
+&voutcrg {
+ status = "okay";
+};
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 0d8339357bad..d48825822017 100644
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -1203,6 +1203,47 @@ camss: isp@19840000 {
status = "disabled";
};
+ dc8200: lcd-controller@29400000 {
+ compatible = "starfive,jh7110-dc8200";
+ reg = <0x0 0x29400000 0x0 0x100>,
+ <0x0 0x29400800 0x0 0x2000>;
+
+ interrupts = <95>;
+ clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_DISP_AXI>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_CORE>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_AXI>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_AHB>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_PIX0>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_PIX1>,
+ <&hdmitx0_pixelclk>,
+ <&voutcrg JH7110_VOUTCLK_DC8200_PIX>;
+ clock-names = "noc_bus", "dc_core", "axi_core", "ahb",
+ "channel0", "channel1", "hdmi_tx", "dc_parent";
+ resets = <&voutcrg JH7110_VOUTRST_DC8200_AXI>,
+ <&voutcrg JH7110_VOUTRST_DC8200_AHB>,
+ <&voutcrg JH7110_VOUTRST_DC8200_CORE>;
+ reset-names = "axi","ahb", "core";
+
+ starfive,syscon = <&vout_syscon>;
+ };
+
+ hdmi: hdmi@29590000 {
+ compatible = "starfive,jh7110-inno-hdmi";
+ reg = <0x0 0x29590000 0x0 0x4000>;
+ interrupts = <99>;
+
+ clocks = <&voutcrg JH7110_VOUTCLK_HDMI_TX_SYS>,
+ <&voutcrg JH7110_VOUTCLK_HDMI_TX_MCLK>,
+ <&voutcrg JH7110_VOUTCLK_HDMI_TX_BCLK>;
+ clock-names = "sysclk", "mclk", "bclk";
+ resets = <&voutcrg JH7110_VOUTRST_HDMI_TX_HDMI>;
+ };
+
+ vout_syscon: syscon@295b0000 {
+ compatible = "starfive,jh7110-vout-syscon", "syscon";
+ reg = <0 0x295b0000 0 0x90>;
+ };
+
voutcrg: clock-controller@295c0000 {
compatible = "starfive,jh7110-voutcrg";
reg = <0x0 0x295c0000 0x0 0x10000>;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v5 2/9] riscv: dts: Add display property
2024-11-20 6:18 ` [PATCH v5 2/9] riscv: dts: Add display property keith zhao
@ 2024-11-20 16:48 ` Conor Dooley
0 siblings, 0 replies; 3+ messages in thread
From: Conor Dooley @ 2024-11-20 16:48 UTC (permalink / raw)
To: keith zhao
Cc: devicetree, dri-devel, andrzej.hajda, neil.armstrong, rfoss,
Laurent.pinchart, jonas, jernej.skrabec, maarten.lankhorst,
mripard, tzimmermann, airlied, simona, robh, krzk+dt, conor+dt,
hjc, heiko, andy.yan, william.qiu, xingyu.wu, kernel,
paul.walmsley, palmer, aou, p.zabel, changhuang.liang, jack.zhu,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2177 bytes --]
On Wed, Nov 20, 2024 at 02:18:41PM +0800, keith zhao wrote:
> Add the display DT nodes in Starfive JH7110 soc-specific DT file.
>
> Signed-off-by: keith zhao <keith.zhao@starfivetech.com>
$subject: "riscv: dts: Add display property"
a) this is jh7110 exclusive, not for all riscv devicetrees
b) you are adding more than a property
> ---
> .../boot/dts/starfive/jh7110-common.dtsi | 125 ++++++++++++++++++
> arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 ++++++
> 2 files changed, 166 insertions(+)
>
> diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
> index 9d77713f5361..301b56f2ef0c 100644
> --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
> +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
> @@ -30,6 +30,25 @@ memory@40000000 {
> reg = <0x0 0x40000000 0x1 0x0>;
> };
>
> + reserved-memory {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> +
> + /* vout applies for space from this CMA
"vout" could be a voltage, please be more specific. Comments should be
wrapped at at least 80 chars. Linux coding style puts /* on a line of
its own.
> + * Without this CMA reservation,
> + * vout may not work properly.
> + */
> + linux,cma {
> + compatible = "shared-dma-pool";
> + reusable;
> + size = <0x0 0x20000000>;
> + alignment = <0x0 0x1000>;
> + alloc-ranges = <0x0 0x70000000 0x0 0x20000000>;
> + linux,cma-default;
> + };
> + };
> +
> gpio-restart {
> compatible = "gpio-restart";
> gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>;
> @@ -62,12 +81,55 @@ codec {
> };
> };
> };
> +
> + hdmi_con: hdmi-con {
> + compatible = "hdmi-connector";
> + type = "a";
> +
> + port {
> + hdmi_con_in: endpoint {
> + remote-endpoint = <&hdmi_out_con>;
> + };
> + };
> + };
> };
>
> &cpus {
> timebase-frequency = <4000000>;
> };
>
> +&dc8200 {
> + status = "okay";
> + crtc_out: ports {
blank line between properties and child nodes please.
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + dc_out0: port@0 {
Cheers,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v5 2/9] riscv: dts: Add display property
@ 2024-11-21 16:11 kernel test robot
0 siblings, 0 replies; 3+ messages in thread
From: kernel test robot @ 2024-11-21 16:11 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp
::::::
:::::: Manual check reason: "dtcheck: binding changes may go via different trees"
::::::
BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
In-Reply-To: <20241120061848.196754-3-keith.zhao@starfivetech.com>
References: <20241120061848.196754-3-keith.zhao@starfivetech.com>
TO: keith zhao <keith.zhao@starfivetech.com>
TO: devicetree@vger.kernel.org
TO: dri-devel@lists.freedesktop.org
CC: andrzej.hajda@intel.com
CC: neil.armstrong@linaro.org
CC: rfoss@kernel.org
CC: Laurent.pinchart@ideasonboard.com
CC: jonas@kwiboo.se
CC: jernej.skrabec@gmail.com
CC: maarten.lankhorst@linux.intel.com
CC: mripard@kernel.org
CC: tzimmermann@suse.de
CC: airlied@gmail.com
CC: simona@ffwll.ch
CC: robh@kernel.org
CC: krzk+dt@kernel.org
CC: conor+dt@kernel.org
CC: hjc@rock-chips.com
CC: heiko@sntech.de
CC: andy.yan@rock-chips.com
CC: william.qiu@starfivetech.com
CC: xingyu.wu@starfivetech.com
CC: kernel@esmil.dk
CC: paul.walmsley@sifive.com
CC: palmer@dabbelt.com
CC: aou@eecs.berkeley.edu
CC: p.zabel@pengutronix.de
CC: changhuang.liang@starfivetech.com
CC: keith.zhao@starfivetech.com
CC: jack.zhu@starfivetech.com
CC: linux-kernel@vger.kernel.org
Hi keith,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on drm-misc/drm-misc-next v6.12 next-20241121]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/keith-zhao/dt-bindings-display-bindings-for-starfive-JH7110-display-pipeline/20241121-145710
base: linus/master
patch link: https://lore.kernel.org/r/20241120061848.196754-3-keith.zhao%40starfivetech.com
patch subject: [PATCH v5 2/9] riscv: dts: Add display property
:::::: branch date: 9 hours ago
:::::: commit date: 9 hours ago
config: riscv-randconfig-052-20241121 (https://download.01.org/0day-ci/archive/20241121/202411212311.TMkrPObX-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 592c0fe55f6d9a811028b5f3507be91458ab2713)
dtschema version: 2024.12.dev1+gcabb5b9
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241121/202411212311.TMkrPObX-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/r/202411212311.TMkrPObX-lkp@intel.com/
dtcheck warnings: (new ones prefixed by >>)
>> arch/riscv/boot/dts/starfive/jh7110-common.dtsi:107.19-117.5: Warning (graph_child_address): /soc/lcd-controller@29400000/ports/port@0: graph node has single child node 'endpoint@0', #address-cells/#size-cells are not necessary
vim +107 arch/riscv/boot/dts/starfive/jh7110-common.dtsi
ac9a37e2d6b637 Jisheng Zhang 2024-04-29 100
231c32e8f23388 keith zhao 2024-11-20 101 &dc8200 {
231c32e8f23388 keith zhao 2024-11-20 102 status = "okay";
231c32e8f23388 keith zhao 2024-11-20 103 crtc_out: ports {
231c32e8f23388 keith zhao 2024-11-20 104 #address-cells = <1>;
231c32e8f23388 keith zhao 2024-11-20 105 #size-cells = <0>;
231c32e8f23388 keith zhao 2024-11-20 106
231c32e8f23388 keith zhao 2024-11-20 @107 dc_out0: port@0 {
231c32e8f23388 keith zhao 2024-11-20 108 reg = <0>;
231c32e8f23388 keith zhao 2024-11-20 109 #address-cells = <1>;
231c32e8f23388 keith zhao 2024-11-20 110 #size-cells = <0>;
231c32e8f23388 keith zhao 2024-11-20 111
231c32e8f23388 keith zhao 2024-11-20 112 dc_out_dpi0: endpoint@0 {
231c32e8f23388 keith zhao 2024-11-20 113 reg = <0>;
231c32e8f23388 keith zhao 2024-11-20 114 remote-endpoint = <&hdmi_enc>;
231c32e8f23388 keith zhao 2024-11-20 115 };
231c32e8f23388 keith zhao 2024-11-20 116
231c32e8f23388 keith zhao 2024-11-20 117 };
231c32e8f23388 keith zhao 2024-11-20 118
231c32e8f23388 keith zhao 2024-11-20 119 dc_out1: port@1 {
231c32e8f23388 keith zhao 2024-11-20 120 reg = <1>;
231c32e8f23388 keith zhao 2024-11-20 121 #address-cells = <1>;
231c32e8f23388 keith zhao 2024-11-20 122 #size-cells = <0>;
231c32e8f23388 keith zhao 2024-11-20 123
231c32e8f23388 keith zhao 2024-11-20 124 dc_out_dpi1: endpoint@1 {
231c32e8f23388 keith zhao 2024-11-20 125 reg = <1>;
231c32e8f23388 keith zhao 2024-11-20 126 //remote-endpoint = <&dsi_enc>;
231c32e8f23388 keith zhao 2024-11-20 127 };
231c32e8f23388 keith zhao 2024-11-20 128
231c32e8f23388 keith zhao 2024-11-20 129 };
231c32e8f23388 keith zhao 2024-11-20 130 };
231c32e8f23388 keith zhao 2024-11-20 131 };
231c32e8f23388 keith zhao 2024-11-20 132
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-21 16:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-21 16:11 [PATCH v5 2/9] riscv: dts: Add display property kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2024-11-20 6:18 [PATCH v5 0/9] drm/verisilicon : support DC8200 and inno hdmi keith zhao
2024-11-20 6:18 ` [PATCH v5 2/9] riscv: dts: Add display property keith zhao
2024-11-20 16:48 ` Conor Dooley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.