| Message ID | 1678181001-2327-2-git-send-email-parth.gajjar@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: zynqmp: Update MALI 400 interrupt and clock names | expand |
On 3/7/23 10:23, Parth Gajjar wrote: > Motivation for the commit is to utilize the upstream community > device tree so that the either modified ARM Mali 400 driver > or upstream lima driver can be used. > > Signed-off-by: Parth Gajjar <parth.gajjar@amd.com> > Signed-off-by: Vishal Sagar <vishal.sagar@amd.com> > --- > arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi > index ff2f34ce380c..ac8ed4a434d0 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi > @@ -133,7 +133,7 @@ > }; > > &gpu { > - clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>; > + clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>; > }; > > &lpd_dma_chan1 { > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 96cba469ab5d..6a210cb9bce9 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -448,12 +448,12 @@ > > gpu: gpu@fd4b0000 { > status = "disabled"; > - compatible = "arm,mali-400", "arm,mali-utgard"; > + compatible = "xlnx,zynqmp-mali", "arm,mali-400"; > reg = <0x0 0xfd4b0000 0x0 0x10000>; > interrupt-parent = <&gic>; > interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>; > - interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1"; > - clock-names = "gpu", "gpu_pp0", "gpu_pp1"; > + interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1"; > + clock-names = "bus", "core"; > power-domains = <&zynqmp_firmware PD_GPU>; > }; > This patch can't be applied because gpu is not in upstream kernel. Please based it on the latest tree and resend. Also this should be 2/2 not 1/2. Thanks, Michal
On 3/13/23 5:49 AM, Michal Simek wrote: > > > On 3/7/23 10:23, Parth Gajjar wrote: >> Motivation for the commit is to utilize the upstream community >> device tree so that the either modified ARM Mali 400 driver >> or upstream lima driver can be used. >> >> Signed-off-by: Parth Gajjar <parth.gajjar@amd.com> >> Signed-off-by: Vishal Sagar <vishal.sagar@amd.com> >> --- >> arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- >> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 +++--- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >> index ff2f34ce380c..ac8ed4a434d0 100644 >> --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >> @@ -133,7 +133,7 @@ >> }; >> &gpu { >> - clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>; >> + clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>; >> }; >> &lpd_dma_chan1 { >> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> index 96cba469ab5d..6a210cb9bce9 100644 >> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> @@ -448,12 +448,12 @@ >> gpu: gpu@fd4b0000 { >> status = "disabled"; >> - compatible = "arm,mali-400", "arm,mali-utgard"; >> + compatible = "xlnx,zynqmp-mali", "arm,mali-400"; >> reg = <0x0 0xfd4b0000 0x0 0x10000>; >> interrupt-parent = <&gic>; >> interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>; >> - interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1"; >> - clock-names = "gpu", "gpu_pp0", "gpu_pp1"; >> + interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1"; >> + clock-names = "bus", "core"; >> power-domains = <&zynqmp_firmware PD_GPU>; >> }; > > This patch can't be applied because gpu is not in upstream kernel. Please based it on the latest tree and resend. lima support isn't in the upstream kernel? It should be. --Mark > Also this should be 2/2 not 1/2. > > Thanks, > Michal
On 3/13/23 17:09, Mark Hatle wrote: > > > On 3/13/23 5:49 AM, Michal Simek wrote: >> >> >> On 3/7/23 10:23, Parth Gajjar wrote: >>> Motivation for the commit is to utilize the upstream community >>> device tree so that the either modified ARM Mali 400 driver >>> or upstream lima driver can be used. >>> >>> Signed-off-by: Parth Gajjar <parth.gajjar@amd.com> >>> Signed-off-by: Vishal Sagar <vishal.sagar@amd.com> >>> --- >>> arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- >>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 +++--- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >>> b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >>> index ff2f34ce380c..ac8ed4a434d0 100644 >>> --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi >>> @@ -133,7 +133,7 @@ >>> }; >>> &gpu { >>> - clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk >>> GPU_PP1_REF>; >>> + clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>; >>> }; >>> &lpd_dma_chan1 { >>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> index 96cba469ab5d..6a210cb9bce9 100644 >>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> @@ -448,12 +448,12 @@ >>> gpu: gpu@fd4b0000 { >>> status = "disabled"; >>> - compatible = "arm,mali-400", "arm,mali-utgard"; >>> + compatible = "xlnx,zynqmp-mali", "arm,mali-400"; >>> reg = <0x0 0xfd4b0000 0x0 0x10000>; >>> interrupt-parent = <&gic>; >>> interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 >>> 4>, <0 132 4>; >>> - interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", >>> "IRQPP1", "IRQPPMMU1"; >>> - clock-names = "gpu", "gpu_pp0", "gpu_pp1"; >>> + interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1"; >>> + clock-names = "bus", "core"; >>> power-domains = <&zynqmp_firmware PD_GPU>; >>> }; >> >> This patch can't be applied because gpu is not in upstream kernel. Please >> based it on the latest tree and resend. > > lima support isn't in the upstream kernel? It should be. DT node which describes gpu is not in upstream kernel. Driver should be there. M
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi index ff2f34ce380c..ac8ed4a434d0 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi @@ -133,7 +133,7 @@ }; &gpu { - clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>; + clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>; }; &lpd_dma_chan1 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 96cba469ab5d..6a210cb9bce9 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -448,12 +448,12 @@ gpu: gpu@fd4b0000 { status = "disabled"; - compatible = "arm,mali-400", "arm,mali-utgard"; + compatible = "xlnx,zynqmp-mali", "arm,mali-400"; reg = <0x0 0xfd4b0000 0x0 0x10000>; interrupt-parent = <&gic>; interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>; - interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1"; - clock-names = "gpu", "gpu_pp0", "gpu_pp1"; + interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1"; + clock-names = "bus", "core"; power-domains = <&zynqmp_firmware PD_GPU>; };