From: Andrew Murray <andrew.murray@arm.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: maz@kernel.org, lorenzo.pieralisi@arm.com, gouwa@khadas.com,
khilman@baylibre.com, nick@khadas.com,
linux-kernel@vger.kernel.org, kishon@ti.com, repk@triplefau.lt,
linux-pci@vger.kernel.org, bhelgaas@google.com,
linux-amlogic@lists.infradead.org, yue.wang@Amlogic.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 5/6] arm64: dts: meson-g12a: Add PCIe node
Date: Mon, 16 Sep 2019 14:42:42 +0100 [thread overview]
Message-ID: <20190916134241.GR9720@e119886-lin.cambridge.arm.com> (raw)
In-Reply-To: <20190916125022.10754-6-narmstrong@baylibre.com>
On Mon, Sep 16, 2019 at 02:50:21PM +0200, Neil Armstrong wrote:
> This adds the Amlogic G12A PCI Express controller node, also
> using the USB3+PCIe Combo PHY.
>
> The PHY mode selection is static, thus the USB3+PCIe Combo PHY
> phandle would need to be removed from the USB control node if the
> shared differential lines are used for PCIe instead of USB3.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
> ---
> .../boot/dts/amlogic/meson-g12-common.dtsi | 33 +++++++++++++++++++
> arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 +++
> 2 files changed, 37 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 852cf9cf121b..7330dc37b7a6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -95,6 +95,39 @@
> #size-cells = <2>;
> ranges;
>
> + pcie: pcie@fc000000 {
> + compatible = "amlogic,g12a-pcie", "snps,dw-pcie";
> + reg = <0x0 0xfc000000 0x0 0x400000
> + 0x0 0xff648000 0x0 0x2000
> + 0x0 0xfc400000 0x0 0x200000>;
> + reg-names = "elbi", "cfg", "config";
> + interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
> + #interrupt-cells = <1>;
> + interrupt-map-mask = <0 0 0 0>;
> + interrupt-map = <0 0 0 0 &gic GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
> + bus-range = <0x0 0xff>;
> + #address-cells = <3>;
> + #size-cells = <2>;
> + device_type = "pci";
> + ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000
> + 0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
> +
> + clocks = <&clkc CLKID_PCIE_PHY
> + &clkc CLKID_PCIE_COMB
> + &clkc CLKID_PCIE_PLL>;
> + clock-names = "general",
> + "pclk",
> + "port";
> + resets = <&reset RESET_PCIE_CTRL_A>,
> + <&reset RESET_PCIE_APB>;
> + reset-names = "port",
> + "apb";
> + num-lanes = <1>;
> + phys = <&usb3_pcie_phy PHY_TYPE_PCIE>;
> + phy-names = "pcie";
> + status = "disabled";
> + };
> +
> ethmac: ethernet@ff3f0000 {
> compatible = "amlogic,meson-axg-dwmac",
> "snps,dwmac-3.70a",
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> index 91492819d0d8..ee9ea3c69433 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> @@ -135,6 +135,10 @@
> power-domains = <&pwrc PWRC_SM1_ETH_ID>;
> };
>
> +&pcie {
> + power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
> +};
> +
> &pwrc {
> compatible = "amlogic,meson-sm1-pwrc";
> };
> --
> 2.22.0
>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2019-09-16 13:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 12:50 [PATCH v2 0/6] arm64: dts: meson-g12: add support for PCIe Neil Armstrong
2019-09-16 12:50 ` [PATCH v2 1/6] dt-bindings: pci: amlogic, meson-pcie: Add G12A bindings Neil Armstrong
2019-09-16 13:46 ` [PATCH v2 1/6] dt-bindings: pci: amlogic,meson-pcie: " Andrew Murray
2019-09-16 12:50 ` [PATCH v2 2/6] PCI: amlogic: Fix probed clock names Neil Armstrong
2019-09-16 12:50 ` [PATCH v2 3/6] PCI: amlogic: meson: Add support for G12A Neil Armstrong
2019-09-16 13:20 ` Andrew Murray
2019-09-16 12:50 ` [PATCH v2 4/6] phy: meson-g12a-usb3-pcie: Add support for PCIe mode Neil Armstrong
2019-09-16 13:23 ` Andrew Murray
2019-09-16 12:50 ` [PATCH v2 5/6] arm64: dts: meson-g12a: Add PCIe node Neil Armstrong
2019-09-16 13:42 ` Andrew Murray [this message]
2019-09-16 12:50 ` [PATCH v2 6/6] arm64: dts: khadas-vim3: add commented support for PCIe Neil Armstrong
2019-09-16 13:45 ` Andrew Murray
2019-09-24 18:59 ` [PATCH v2 0/6] arm64: dts: meson-g12: add " Kevin Hilman
2019-10-15 13:14 ` Lorenzo Pieralisi
2019-10-15 13:38 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190916134241.GR9720@e119886-lin.cambridge.arm.com \
--to=andrew.murray@arm.com \
--cc=bhelgaas@google.com \
--cc=gouwa@khadas.com \
--cc=khilman@baylibre.com \
--cc=kishon@ti.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=maz@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=nick@khadas.com \
--cc=repk@triplefau.lt \
--cc=yue.wang@Amlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).