On Mon, Jul 9, 2018 at 2:35 PM, Sean Paul <seanpaul@xxxxxxxxxxxx> wrote: > On Mon, Jul 09, 2018 at 12:07:11PM -0600, Rob Herring wrote: >> On Mon, Jul 9, 2018 at 11:40 AM Sean Paul <seanpaul@xxxxxxxxxxxx> wrote: >> > >> > Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> >> > --- >> > arch/arm64/boot/dts/qcom/sdm845.dtsi | 194 +++++++++++++++++++++++++++ >> > 1 file changed, 194 insertions(+) >> > >> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> > index cdaabeb3c995..339afed856de 100644 >> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> > @@ -5,6 +5,8 @@ >> > * Copyright (c) 2018, The Linux Foundation. All rights reserved. >> > */ >> > >> > +#include <dt-bindings/clock/qcom,dispcc-sdm845.h> >> > +#include <dt-bindings/clock/qcom,gcc-sdm845.h> >> > #include <dt-bindings/interrupt-controller/arm-gic.h> >> > >> > / { >> > @@ -221,6 +223,198 @@ >> > #interrupt-cells = <2>; >> > }; >> > >> > + mdss: mdss@ae00000 { >> > + compatible = "qcom,dpu-mdss"; >> > + reg = <0xae00000 0x1000>; >> > + reg-names = "mdss_phys"; >> > + >> > + power-domains = <&dispcc 0>; >> > + >> > + clocks = <&gcc GCC_DISP_AHB_CLK>, >> > + <&gcc GCC_DISP_AXI_CLK>, >> > + <&dispcc DISP_CC_MDSS_MDP_CLK>; >> > + clock-names = "iface", "bus", "core"; >> > + clock-frequency = <0 0 300000000>; >> > + >> > + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; >> > + interrupt-controller; >> > + #interrupt-cells = <1>; >> > + >> > + /* iommus = <&apps_iommu 0>; */ >> > + >> > + #address-cells = <1>; >> > + #size-cells = <1>; >> > + ranges; >> > + >> > + mdss_mdp: mdp@ae01000 { >> > + compatible = "qcom,dpu"; >> > > Hi Rob, > Thanks for the quick turnaround! In addition to below, I'll also beef up the > commit message, since I forgot to add any description of the change. > > >> Needs an SoC specific compatible. Did this binding get reviewed? >> > > No, it's part of this set ([PATCH 19/21] dt-bindings: msm/disp: Add bindings for > Snapdragon 845 DPU). note that for display controller and DSI we've been able to reliably read the version of the block from hardware. BR, -R > >> > + reg = <0x0ae01000 0x8f000>, >> > + <0x0aeb0000 0x2008>; >> > + reg-names = "mdp_phys", "vbif_phys"; >> > + >> > + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, >> > + <&dispcc DISP_CC_MDSS_AXI_CLK>, >> > + <&dispcc DISP_CC_MDSS_MDP_CLK>, >> > + <&dispcc DISP_CC_MDSS_VSYNC_CLK>; >> > + clock-names = "iface", "bus", "core", "vsync"; >> > + clock-frequency = <0 0 300000000 19200000>; >> >> That's abusing clock-frequency which is generally 1 value. Use >> assigned-clock-rates instead. >> > > Thanks, will change. > >> > + >> > + interrupt-parent = <&mdss>; >> > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; >> > + >> > + ports { >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + >> > + port@0 { >> > + reg = <0>; >> > + dpu_intf1_out: endpoint { >> > + remote-endpoint = <&dsi0_in>; >> > + }; >> > + }; >> > + >> > + port@1 { >> > + reg = <1>; >> > + dpu_intf2_out: endpoint { >> > + remote-endpoint = <&dsi1_in>; >> > + }; >> > + }; >> > + }; >> > + }; >> > + >> > + dsi0: dsi@ae94000 { >> > + compatible = "qcom,mdss-dsi-ctrl"; >> >> Needs an SoC specific compatible. >> > > Ok, will add. > >> > + reg = <0xae94000 0x400>; >> > + reg-names = "dsi_ctrl"; >> > + >> > + interrupt-parent = <&mdss>; >> > + interrupts = <4 0>; >> > + >> > + clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>, >> > + <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>, >> > + <&dispcc DISP_CC_MDSS_PCLK0_CLK>, >> > + <&dispcc DISP_CC_MDSS_ESC0_CLK>, >> > + <&dispcc DISP_CC_MDSS_AHB_CLK>, >> > + <&dispcc DISP_CC_MDSS_AXI_CLK>; >> > + clock-names = "byte_clk", >> > + "byte_intf_clk", >> > + "pixel_clk", >> > + "core_clk", >> > + "iface_clk", >> > + "bus_clk"; >> >> Should have found this in binding review, but the "_clk" part is redundant. >> > > This binding is already in mainline (Documentation/devicetree/bindings/display/msm/dsi.txt), > which is why _clk is here, but not above. > > Sean >> > + >> > + phys = <&dsi0_phy>; >> > + phy-names = "dsi-phy"; >> > + >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + >> > + ports { >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + >> > + port@0 { >> > + reg = <0>; >> > + dsi0_in: endpoint { >> > + remote-endpoint = <&dpu_intf1_out>; >> > + }; >> > + }; >> > + >> > + port@1 { >> > + reg = <1>; >> > + dsi0_out: endpoint { >> > + }; >> > + }; >> > + }; >> > + }; >> > + >> > + dsi0_phy: dsi-phy@ae94400 { >> > + compatible = "qcom,dsi-phy-10nm"; >> > + reg = <0xae94400 0x200>, >> > + <0xae94a00 0x1e0>, >> > + <0xae94600 0x280>; >> > + reg-names = "dsi_phy", >> > + "dsi_pll", >> > + "dsi_phy_lane"; >> > + >> > + #clock-cells = <1>; >> > + #phy-cells = <0>; >> > + >> > + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>; >> > + clock-names = "iface_clk"; >> > + }; >> > + >> > + dsi1: dsi@ae96000 { >> > + compatible = "qcom,mdss-dsi-ctrl"; >> > + reg = <0xae96000 0x400>; >> > + reg-names = "dsi_ctrl"; >> > + >> > + interrupt-parent = <&mdss>; >> > + interrupts = <5 0>; >> > + >> > + clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK>, >> > + <&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>, >> > + <&dispcc DISP_CC_MDSS_PCLK1_CLK>, >> > + <&dispcc DISP_CC_MDSS_ESC1_CLK>, >> > + <&dispcc DISP_CC_MDSS_AHB_CLK>, >> > + <&dispcc DISP_CC_MDSS_AXI_CLK>; >> > + clock-names = "byte_clk", >> > + "byte_intf_clk", >> > + "pixel_clk", >> > + "core_clk", >> > + "iface_clk", >> > + "bus_clk"; >> > + >> > + phys = <&dsi1_phy>; >> > + phy-names = "dsi-phy"; >> > + >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + >> > + ports { >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + >> > + port@0 { >> > + reg = <0>; >> > + dsi1_in: endpoint { >> > + remote-endpoint = <&dpu_intf2_out>; >> > + }; >> > + }; >> > + >> > + port@1 { >> > + reg = <1>; >> > + dsi1_out: endpoint { >> > + }; >> > + }; >> > + }; >> > + }; >> > + >> > + dsi1_phy: dsi-phy@ae96400 { >> > + compatible = "qcom,dsi-phy-10nm"; >> > + reg = <0xae96400 0x200>, >> > + <0xae96a00 0x10e>, >> > + <0xae96600 0x280>; >> > + reg-names = "dsi_phy", >> > + "dsi_pll", >> > + "dsi_phy_lane"; >> > + >> > + #clock-cells = <1>; >> > + #phy-cells = <0>; >> > + >> > + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>; >> > + clock-names = "iface_clk"; >> > + }; >> > + }; >> > + >> > + dispcc: qcom,dispcc@af00000 { >> > + compatible = "qcom,sdm845-dispcc"; >> > + reg = <0xaf00000 0x10000>; >> > + #clock-cells = <1>; >> > + #reset-cells = <1>; >> > + #power-domain-cells = <1>; >> > + }; >> > + >> > spmi_bus: spmi@c440000 { >> > compatible = "qcom,spmi-pmic-arb"; >> > reg = <0xc440000 0x1100>, >> > -- >> > Sean Paul, Software Engineer, Google / Chromium OS >> > > > -- > Sean Paul, Software Engineer, Google / Chromium OS -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html