* [PATCH 7/7] ARM: dts: NSP: Add bgmac entries
@ 2016-07-08 15:56 Jon Mason
2016-07-08 16:14 ` Scott Branden
2016-07-11 16:50 ` Florian Fainelli
0 siblings, 2 replies; 4+ messages in thread
From: Jon Mason @ 2016-07-08 15:56 UTC (permalink / raw)
To: linux-arm-kernel
Add device tree entries for the ethernet devices present on the
Broadcom Northstar Plus SoCs
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm958625k.dts | 8 ++++++++
2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index def9e78..f6d5abe 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -192,6 +192,24 @@
status = "disabled";
};
+ amac0: ethernet at 22000 {
+ compatible = "brcm,nsp-amac";
+ reg = <0x022000 0x1000>,
+ <0x110000 0x1000>;
+ reg-names = "amac_base", "idm_base";
+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ amac1: ethernet at 23000 {
+ compatible = "brcm,nsp-amac";
+ reg = <0x023000 0x1000>,
+ <0x111000 0x1000>;
+ reg-names = "amac_base", "idm_base";
+ interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
nand: nand at 26000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x026000 0x600>,
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index e298450..f41a13b 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -56,6 +56,14 @@
status = "okay";
};
+&amac0 {
+ status = "okay";
+};
+
+&amac1 {
+ status = "okay";
+};
+
&pcie0 {
status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 7/7] ARM: dts: NSP: Add bgmac entries
2016-07-08 15:56 [PATCH 7/7] ARM: dts: NSP: Add bgmac entries Jon Mason
@ 2016-07-08 16:14 ` Scott Branden
2016-07-11 16:50 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Scott Branden @ 2016-07-08 16:14 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jon,
In Subject line, you mean add amac entries.
On 16-07-08 08:56 AM, Jon Mason wrote:
> Add device tree entries for the ethernet devices present on the
> Broadcom Northstar Plus SoCs
>
> Signed-off-by: Jon Mason <jon.mason@broadcom.com>
> ---
> arch/arm/boot/dts/bcm-nsp.dtsi | 18 ++++++++++++++++++
> arch/arm/boot/dts/bcm958625k.dts | 8 ++++++++
> 2 files changed, 26 insertions(+)
>
> diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
> index def9e78..f6d5abe 100644
> --- a/arch/arm/boot/dts/bcm-nsp.dtsi
> +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
> @@ -192,6 +192,24 @@
> status = "disabled";
> };
>
> + amac0: ethernet at 22000 {
> + compatible = "brcm,nsp-amac";
> + reg = <0x022000 0x1000>,
> + <0x110000 0x1000>;
> + reg-names = "amac_base", "idm_base";
> + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> + amac1: ethernet at 23000 {
> + compatible = "brcm,nsp-amac";
> + reg = <0x023000 0x1000>,
> + <0x111000 0x1000>;
> + reg-names = "amac_base", "idm_base";
> + interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> nand: nand at 26000 {
> compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
> reg = <0x026000 0x600>,
> diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
> index e298450..f41a13b 100644
> --- a/arch/arm/boot/dts/bcm958625k.dts
> +++ b/arch/arm/boot/dts/bcm958625k.dts
> @@ -56,6 +56,14 @@
> status = "okay";
> };
>
> +&amac0 {
> + status = "okay";
> +};
> +
> +&amac1 {
> + status = "okay";
> +};
> +
> &pcie0 {
> status = "okay";
> };
>
Regards,
Scott
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 7/7] ARM: dts: NSP: Add bgmac entries
2016-07-08 15:56 [PATCH 7/7] ARM: dts: NSP: Add bgmac entries Jon Mason
2016-07-08 16:14 ` Scott Branden
@ 2016-07-11 16:50 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2016-07-11 16:50 UTC (permalink / raw)
To: linux-arm-kernel
On 07/08/2016 08:56 AM, Jon Mason wrote:
> Add device tree entries for the ethernet devices present on the
> Broadcom Northstar Plus SoCs
>
> Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Applied to devicetree/next, with s/bgmac/AMAC/ in the subject, thanks!
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 0/7] net: ethernet: bgmac: Add platform device support
@ 2016-06-30 22:59 Jon Mason
2016-06-30 22:59 ` [PATCH 7/7] ARM: dts: NSP: Add bgmac entries Jon Mason
0 siblings, 1 reply; 4+ messages in thread
From: Jon Mason @ 2016-06-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Well, no compilained too loudly at the RFC version of this patch series
(see https://lkml.org/lkml/2016/6/28/863). So, I'm officially sending
this out for inclusion. All comments from the RFC were addressed in
this version.
This patch series adds support for other, non-bcma iProc SoC's to the
bgmac driver. This series only adds NSP support, but we are interested
in adding support for the Cygnus and NS2 families (with more possible
down the road).
To support non-bcma enabled SoCs, we need to add the standard device
tree "platform device" support. Unfortunately, this driver is very
tighly coupled with the bcma bus and much unwinding is needed. I tried
to break this up into a number of patches to make it more obvious what
was being done to add platform device support. I was able to verify
that the bcma code still works using a 53012K board (NS SoC), and that
the platform code works using a 58625K board (NSP SoC).
Thanks,
Jon
Jon Mason (7):
net: ethernet: bgmac: change bgmac_* prints to dev_* prints
net: ethernet: bgmac: add dma_dev pointer
net: ethernet: bgmac: move BCMA MDIO Phy code into a separate file
net: ethernet: bgmac: convert to feature flags
net: ethernet: bgmac: Add platform device support
dt-bindings: net: bgmac: add bindings documentation for bgmac
ARM: dts: NSP: Add bgmac entries
.../devicetree/bindings/net/brcm,bgmac-nsp.txt | 24 +
arch/arm/boot/dts/bcm-nsp.dtsi | 18 +
arch/arm/boot/dts/bcm958625k.dts | 8 +
drivers/net/ethernet/broadcom/Kconfig | 23 +-
drivers/net/ethernet/broadcom/Makefile | 2 +
drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 266 +++++++++
drivers/net/ethernet/broadcom/bgmac-bcma.c | 315 ++++++++++
drivers/net/ethernet/broadcom/bgmac-platform.c | 210 +++++++
drivers/net/ethernet/broadcom/bgmac.c | 658 +++++----------------
drivers/net/ethernet/broadcom/bgmac.h | 112 +++-
10 files changed, 1120 insertions(+), 516 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
create mode 100644 drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
create mode 100644 drivers/net/ethernet/broadcom/bgmac-bcma.c
create mode 100644 drivers/net/ethernet/broadcom/bgmac-platform.c
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 7/7] ARM: dts: NSP: Add bgmac entries
2016-06-30 22:59 [PATCH 0/7] net: ethernet: bgmac: Add platform device support Jon Mason
@ 2016-06-30 22:59 ` Jon Mason
0 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2016-06-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Add device tree entries for the ethernet devices present on the
Broadcom Northstar Plus SoCs
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm958625k.dts | 8 ++++++++
2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index def9e78..8f4343b 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -192,6 +192,24 @@
status = "disabled";
};
+ gmac0: ethernet at 22000 {
+ compatible = "brcm,bgmac-nsp";
+ reg = <0x022000 0x1000>,
+ <0x110000 0x1000>;
+ reg-names = "gmac_base", "idm_base";
+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ gmac1: ethernet at 23000 {
+ compatible = "brcm,bgmac-nsp";
+ reg = <0x023000 0x1000>,
+ <0x111000 0x1000>;
+ reg-names = "gmac_base", "idm_base";
+ interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
nand: nand at 26000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x026000 0x600>,
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index e298450..d16ab53 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -56,6 +56,14 @@
status = "okay";
};
+&gmac0 {
+ status = "okay";
+};
+
+&gmac1 {
+ status = "okay";
+};
+
&pcie0 {
status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-11 16:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-08 15:56 [PATCH 7/7] ARM: dts: NSP: Add bgmac entries Jon Mason
2016-07-08 16:14 ` Scott Branden
2016-07-11 16:50 ` Florian Fainelli
-- strict thread matches above, loose matches on Subject: below --
2016-06-30 22:59 [PATCH 0/7] net: ethernet: bgmac: Add platform device support Jon Mason
2016-06-30 22:59 ` [PATCH 7/7] ARM: dts: NSP: Add bgmac entries Jon Mason
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).