* [PATCH 0/3] Add minimal support for dra62x j5-eco
@ 2015-12-03 23:11 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
Here are minimal changes to add support for dra62x also known as
jacinto 5 or j5-eco. We can leverage the dm814x support being fixed in
mainline kernel also for dra62x. Compared to dm814x, dra62x has a
bit different clocks and devices.
To boot j5-eco evm, you need the the patches below on v4.4-rc3 with
the following additional patches posted earlier.
Basic clock driver for dm814x:
http://marc.info/?l=linux-omap&m=144910652029316&w=2
Fixes for dm814x:
http://marc.info/?l=linux-omap&m=144901336001085&w=2
And also make sure you have the initcall level change patch that
is needed for having omap clock drivers as regular Linux device
drivers:
http://marc.info/?l=linux-omap&m=144890081111207&w=2
Regards,
Tony
Tony Lindgren (3):
ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
ARM: dts: Add basic support for dra62x j5-eco SoC
ARM: dts: Add minimal dra62x j5-eco evm support
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/dra62x-clocks.dtsi | 49 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/dra62x-j5eco-evm.dts | 28 +++++++++++++++++++
arch/arm/boot/dts/dra62x.dtsi | 23 ++++++++++++++++
arch/arm/mach-omap2/id.c | 4 ++-
5 files changed, 105 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/dts/dra62x-clocks.dtsi
create mode 100644 arch/arm/boot/dts/dra62x-j5eco-evm.dts
create mode 100644 arch/arm/boot/dts/dra62x.dtsi
--
2.6.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
2015-12-03 23:11 ` Tony Lindgren
@ 2015-12-03 23:11 ` Tony Lindgren
-1 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-omap
Cc: Matthijs van Duin, Neil Armstrong, Philipp Rosenberger,
Delio Brignoli, Brian Hutchinson, linux-arm-kernel
We can boot dra62x j5-eco using the dm814x code as the clocks and
devices are mapped in the device tree. The dra62x is also known
as jacinto 5.
We may want to add separate soc_is macros for dra62x if needed,
but this gets us to the point where we can boot dra62x with just
dts changes.
Let's also print out the unknown hawkeye register to make things
a bit easier for new SoC variants.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/id.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 8a2ae82..d85c249 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -488,6 +488,7 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb8f2:
+ case 0xb968:
switch (rev) {
case 0:
/* FALLTHROUGH */
@@ -511,7 +512,8 @@ void __init omap3xxx_check_revision(void)
/* Unknown default to latest silicon rev as default */
omap_revision = OMAP3630_REV_ES1_2;
cpu_rev = "1.2";
- pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n");
+ pr_warn("Warning: unknown chip type: hawkeye %04x, assuming OMAP3630ES1.2\n",
+ hawkeye);
}
sprintf(soc_rev, "ES%s", cpu_rev);
}
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
@ 2015-12-03 23:11 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-arm-kernel
We can boot dra62x j5-eco using the dm814x code as the clocks and
devices are mapped in the device tree. The dra62x is also known
as jacinto 5.
We may want to add separate soc_is macros for dra62x if needed,
but this gets us to the point where we can boot dra62x with just
dts changes.
Let's also print out the unknown hawkeye register to make things
a bit easier for new SoC variants.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/id.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 8a2ae82..d85c249 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -488,6 +488,7 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb8f2:
+ case 0xb968:
switch (rev) {
case 0:
/* FALLTHROUGH */
@@ -511,7 +512,8 @@ void __init omap3xxx_check_revision(void)
/* Unknown default to latest silicon rev as default */
omap_revision = OMAP3630_REV_ES1_2;
cpu_rev = "1.2";
- pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n");
+ pr_warn("Warning: unknown chip type: hawkeye %04x, assuming OMAP3630ES1.2\n",
+ hawkeye);
}
sprintf(soc_rev, "ES%s", cpu_rev);
}
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
2015-12-03 23:11 ` Tony Lindgren
@ 2015-12-04 2:43 ` Matthijs van Duin
-1 siblings, 0 replies; 12+ messages in thread
From: Matthijs van Duin @ 2015-12-04 2:43 UTC (permalink / raw)
To: Tony Lindgren
Cc: Neil Armstrong, Delio Brignoli, Philipp Rosenberger,
linux-omap@vger.kernel.org, Brian Hutchinson,
linux-arm-kernel@lists.infradead.org
On 4 December 2015 at 00:11, Tony Lindgren <tony@atomide.com> wrote:
> We can boot dra62x j5-eco using the dm814x code as the clocks and
> devices are mapped in the device tree. The dra62x is also known
> as jacinto 5.
I'm pretty sure the "eco" in the name isn't optional. As far as I know:
jacinto 5 = dra65x ~ dm814x
jacinto 5 eco = dra62x ~ dm811x
jacinto 5 entry = dra61x/60x ~ am335x
Here ~ means equivalence modulo efuse bits.
My knowledge of TI's automotive processors is limited however, as is
public documentation, so perhaps someone from TI can ack or nak this.
Matthijs
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
@ 2015-12-04 2:43 ` Matthijs van Duin
0 siblings, 0 replies; 12+ messages in thread
From: Matthijs van Duin @ 2015-12-04 2:43 UTC (permalink / raw)
To: linux-arm-kernel
On 4 December 2015 at 00:11, Tony Lindgren <tony@atomide.com> wrote:
> We can boot dra62x j5-eco using the dm814x code as the clocks and
> devices are mapped in the device tree. The dra62x is also known
> as jacinto 5.
I'm pretty sure the "eco" in the name isn't optional. As far as I know:
jacinto 5 = dra65x ~ dm814x
jacinto 5 eco = dra62x ~ dm811x
jacinto 5 entry = dra61x/60x ~ am335x
Here ~ means equivalence modulo efuse bits.
My knowledge of TI's automotive processors is limited however, as is
public documentation, so perhaps someone from TI can ack or nak this.
Matthijs
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
2015-12-04 2:43 ` Matthijs van Duin
@ 2015-12-04 15:46 ` Tony Lindgren
-1 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-04 15:46 UTC (permalink / raw)
To: Matthijs van Duin
Cc: Neil Armstrong, Delio Brignoli, Philipp Rosenberger,
linux-omap@vger.kernel.org, Brian Hutchinson,
linux-arm-kernel@lists.infradead.org
* Matthijs van Duin <matthijsvanduin@gmail.com> [151203 18:44]:
> On 4 December 2015 at 00:11, Tony Lindgren <tony@atomide.com> wrote:
> > We can boot dra62x j5-eco using the dm814x code as the clocks and
> > devices are mapped in the device tree. The dra62x is also known
> > as jacinto 5.
>
> I'm pretty sure the "eco" in the name isn't optional. As far as I know:
> jacinto 5 = dra65x ~ dm814x
> jacinto 5 eco = dra62x ~ dm811x
> jacinto 5 entry = dra61x/60x ~ am335x
>
> Here ~ means equivalence modulo efuse bits.
>
> My knowledge of TI's automotive processors is limited however, as is
> public documentation, so perhaps someone from TI can ack or nak this.
OK I'll update to to use "jacinto 5 eco" specifically to avoid more
confusion.
Thanks,
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
@ 2015-12-04 15:46 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-04 15:46 UTC (permalink / raw)
To: linux-arm-kernel
* Matthijs van Duin <matthijsvanduin@gmail.com> [151203 18:44]:
> On 4 December 2015 at 00:11, Tony Lindgren <tony@atomide.com> wrote:
> > We can boot dra62x j5-eco using the dm814x code as the clocks and
> > devices are mapped in the device tree. The dra62x is also known
> > as jacinto 5.
>
> I'm pretty sure the "eco" in the name isn't optional. As far as I know:
> jacinto 5 = dra65x ~ dm814x
> jacinto 5 eco = dra62x ~ dm811x
> jacinto 5 entry = dra61x/60x ~ am335x
>
> Here ~ means equivalence modulo efuse bits.
>
> My knowledge of TI's automotive processors is limited however, as is
> public documentation, so perhaps someone from TI can ack or nak this.
OK I'll update to to use "jacinto 5 eco" specifically to avoid more
confusion.
Thanks,
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: dts: Add basic support for dra62x j5-eco SoC
2015-12-03 23:11 ` Tony Lindgren
@ 2015-12-03 23:11 ` Tony Lindgren
-1 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-omap
Cc: Matthijs van Duin, Neil Armstrong, Philipp Rosenberger,
Delio Brignoli, Brian Hutchinson, linux-arm-kernel
The dra762x j5-eco is similar to dm814x with a bit different clocks
and devices.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/dra62x-clocks.dtsi | 49 ++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/dra62x.dtsi | 23 +++++++++++++++++
2 files changed, 72 insertions(+)
create mode 100644 arch/arm/boot/dts/dra62x-clocks.dtsi
create mode 100644 arch/arm/boot/dts/dra62x.dtsi
diff --git a/arch/arm/boot/dts/dra62x-clocks.dtsi b/arch/arm/boot/dts/dra62x-clocks.dtsi
new file mode 100644
index 0000000..0e49741
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x-clocks.dtsi
@@ -0,0 +1,49 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "dm814x-clocks.dtsi"
+
+/* Compared to dm814x, dra62x does not have hdic, l3 or dss PLLs */
+&adpll_hdvic_ck {
+ status = "disabled";
+};
+
+&adpll_l3_ck {
+ status = "disabled";
+};
+
+&adpll_dss_ck {
+ status = "disabled";
+};
+
+/* Compared to dm814x, dra62x has interconnect clocks on isp PLL */
+&sysclk4_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+&sysclk5_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+&sysclk6_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+/*
+ * Compared to dm814x, dra62x has different shifts and more mux options.
+ * Please add the extra options for ysclk_14 and 16 if really needed.
+ */
+&timer1_fck {
+ clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
+ &aud_clkin2_ck &devosc_ck &auxosc_ck &tclkin_ck>;
+ ti,bit-shift = <4>;
+};
+
+&timer2_fck {
+ clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
+ &aud_clkin2_ck &devosc_ck &auxosc_ck &tclkin_ck>;
+ ti,bit-shift = <8>;
+};
diff --git a/arch/arm/boot/dts/dra62x.dtsi b/arch/arm/boot/dts/dra62x.dtsi
new file mode 100644
index 0000000..d3cbb4e
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x.dtsi
@@ -0,0 +1,23 @@
+/*
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include "dm814x.dtsi"
+
+/ {
+ compatible = "ti,dra62x";
+};
+
+/* Compared to dm814x, dra62x has different offsets for Ethernet */
+&mac {
+ reg = <0x4a100000 0x800
+ 0x4a101200 0x100>;
+};
+
+&davinci_mdio {
+ reg = <0x4a101000 0x100>;
+};
+
+#include "dra62x-clocks.dtsi"
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/3] ARM: dts: Add basic support for dra62x j5-eco SoC
@ 2015-12-03 23:11 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-arm-kernel
The dra762x j5-eco is similar to dm814x with a bit different clocks
and devices.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/dra62x-clocks.dtsi | 49 ++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/dra62x.dtsi | 23 +++++++++++++++++
2 files changed, 72 insertions(+)
create mode 100644 arch/arm/boot/dts/dra62x-clocks.dtsi
create mode 100644 arch/arm/boot/dts/dra62x.dtsi
diff --git a/arch/arm/boot/dts/dra62x-clocks.dtsi b/arch/arm/boot/dts/dra62x-clocks.dtsi
new file mode 100644
index 0000000..0e49741
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x-clocks.dtsi
@@ -0,0 +1,49 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "dm814x-clocks.dtsi"
+
+/* Compared to dm814x, dra62x does not have hdic, l3 or dss PLLs */
+&adpll_hdvic_ck {
+ status = "disabled";
+};
+
+&adpll_l3_ck {
+ status = "disabled";
+};
+
+&adpll_dss_ck {
+ status = "disabled";
+};
+
+/* Compared to dm814x, dra62x has interconnect clocks on isp PLL */
+&sysclk4_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+&sysclk5_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+&sysclk6_ck {
+ clocks = <&adpll_isp_ck 1>;
+};
+
+/*
+ * Compared to dm814x, dra62x has different shifts and more mux options.
+ * Please add the extra options for ysclk_14 and 16 if really needed.
+ */
+&timer1_fck {
+ clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
+ &aud_clkin2_ck &devosc_ck &auxosc_ck &tclkin_ck>;
+ ti,bit-shift = <4>;
+};
+
+&timer2_fck {
+ clocks = <&sysclk18_ck &aud_clkin0_ck &aud_clkin1_ck
+ &aud_clkin2_ck &devosc_ck &auxosc_ck &tclkin_ck>;
+ ti,bit-shift = <8>;
+};
diff --git a/arch/arm/boot/dts/dra62x.dtsi b/arch/arm/boot/dts/dra62x.dtsi
new file mode 100644
index 0000000..d3cbb4e
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x.dtsi
@@ -0,0 +1,23 @@
+/*
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include "dm814x.dtsi"
+
+/ {
+ compatible = "ti,dra62x";
+};
+
+/* Compared to dm814x, dra62x has different offsets for Ethernet */
+&mac {
+ reg = <0x4a100000 0x800
+ 0x4a101200 0x100>;
+};
+
+&davinci_mdio {
+ reg = <0x4a101000 0x100>;
+};
+
+#include "dra62x-clocks.dtsi"
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] ARM: dts: Add minimal dra62x j5-eco evm support
2015-12-03 23:11 ` Tony Lindgren
@ 2015-12-03 23:11 ` Tony Lindgren
-1 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-omap
Cc: Matthijs van Duin, Neil Armstrong, Philipp Rosenberger,
Delio Brignoli, Brian Hutchinson, linux-arm-kernel
This allows us to boot dra62x j5-eco evm with NFSroot.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/dra62x-j5eco-evm.dts | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/dra62x-j5eco-evm.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 30bbc37..aa237cf14 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -452,7 +452,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
dtb-$(CONFIG_SOC_TI81XX) += \
dm8148-evm.dtb \
dm8148-t410.dtb \
- dm8168-evm.dtb
+ dm8168-evm.dtb \
+ dra62x-j5eco-evm.dtb
dtb-$(CONFIG_SOC_AM33XX) += \
am335x-baltos-ir5221.dtb \
am335x-base0033.dtb \
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
new file mode 100644
index 0000000..49a05d2
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -0,0 +1,28 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "dra62x.dtsi"
+
+/ {
+ model = "DRA62x J5 Eco EVM";
+ compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148";
+
+ memory {
+ device_type = "memory";
+ reg = <0x80000000 0x40000000>; /* 1 GB */
+ };
+};
+
+&cpsw_emac0 {
+ phy_id = <&davinci_mdio>, <0>;
+ phy-mode = "rgmii";
+};
+
+&cpsw_emac1 {
+ phy_id = <&davinci_mdio>, <1>;
+ phy-mode = "rgmii";
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] ARM: dts: Add minimal dra62x j5-eco evm support
@ 2015-12-03 23:11 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2015-12-03 23:11 UTC (permalink / raw)
To: linux-arm-kernel
This allows us to boot dra62x j5-eco evm with NFSroot.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/dra62x-j5eco-evm.dts | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/dra62x-j5eco-evm.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 30bbc37..aa237cf14 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -452,7 +452,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
dtb-$(CONFIG_SOC_TI81XX) += \
dm8148-evm.dtb \
dm8148-t410.dtb \
- dm8168-evm.dtb
+ dm8168-evm.dtb \
+ dra62x-j5eco-evm.dtb
dtb-$(CONFIG_SOC_AM33XX) += \
am335x-baltos-ir5221.dtb \
am335x-base0033.dtb \
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
new file mode 100644
index 0000000..49a05d2
--- /dev/null
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -0,0 +1,28 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "dra62x.dtsi"
+
+/ {
+ model = "DRA62x J5 Eco EVM";
+ compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148";
+
+ memory {
+ device_type = "memory";
+ reg = <0x80000000 0x40000000>; /* 1 GB */
+ };
+};
+
+&cpsw_emac0 {
+ phy_id = <&davinci_mdio>, <0>;
+ phy-mode = "rgmii";
+};
+
+&cpsw_emac1 {
+ phy_id = <&davinci_mdio>, <1>;
+ phy-mode = "rgmii";
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 12+ messages in thread