* [PATCH v2 0/2] arm: am43xx: Register rtc hwmod @ 2016-02-19 4:38 Keerthy 2016-02-19 4:38 ` [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string Keerthy 2016-02-19 4:38 ` [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod Keerthy 0 siblings, 2 replies; 6+ messages in thread From: Keerthy @ 2016-02-19 4:38 UTC (permalink / raw) To: linux-arm-kernel The patch adds rtc hwmod. This is present on gp and sk evm and not on epos evm. Hence adding it selectively using a seprate list. Boot tested on AM437X-GP-EVM and AM437X-SK-EVM and checked for rtc ticking on AM437X-GP-EVM. Keerthy (2): ARM: dts: am43x-epos-evm: Add the am438 compatible string ARM: AM43XX: HWMOD: Add rtc hwmod Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string 2016-02-19 4:38 [PATCH v2 0/2] arm: am43xx: Register rtc hwmod Keerthy @ 2016-02-19 4:38 ` Keerthy 2016-02-19 18:55 ` Tony Lindgren 2016-02-19 4:38 ` [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod Keerthy 1 sibling, 1 reply; 6+ messages in thread From: Keerthy @ 2016-02-19 4:38 UTC (permalink / raw) To: linux-arm-kernel The SoCs on am43x-epos-evm are named am438x. Hence add the compatibility string and remove the am4372 string. Signed-off-by: Keerthy <j-keerthy@ti.com> --- Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index a2bd593..739bc48 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -154,7 +154,7 @@ Boards: compatible = "compulab,am437x-sbc-t43", "compulab,am437x-cm-t43", "ti,am4372", "ti,am43" - AM43x EPOS EVM - compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43" + compatible = "ti,am43x-epos-evm", "ti,am43", "ti,am438x" - AM437x GP EVM compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43" diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index d580e2b..d2408c4 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -18,7 +18,7 @@ / { model = "TI AM43x EPOS EVM"; - compatible = "ti,am43x-epos-evm","ti,am4372","ti,am43"; + compatible = "ti,am43x-epos-evm","ti,am438x","ti,am43"; aliases { display0 = &lcd0; -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string 2016-02-19 4:38 ` [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string Keerthy @ 2016-02-19 18:55 ` Tony Lindgren 0 siblings, 0 replies; 6+ messages in thread From: Tony Lindgren @ 2016-02-19 18:55 UTC (permalink / raw) To: linux-arm-kernel * Keerthy <j-keerthy@ti.com> [160218 20:39]: > The SoCs on am43x-epos-evm are named am438x. > Hence add the compatibility string and remove the am4372 string. Applying into omap-for-v4.6/dt thanks. Tony ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod 2016-02-19 4:38 [PATCH v2 0/2] arm: am43xx: Register rtc hwmod Keerthy 2016-02-19 4:38 ` [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string Keerthy @ 2016-02-19 4:38 ` Keerthy 2016-02-19 7:21 ` Paul Walmsley 1 sibling, 1 reply; 6+ messages in thread From: Keerthy @ 2016-02-19 4:38 UTC (permalink / raw) To: linux-arm-kernel The patch adds rtc hwmod. RTC module The RTC module is physically present on the AM438x SoC used on AM43X-EPOS-EVM, but it is permanently disabled. A secure RTC is used instead on these devices, where needed. . Hence adding it selectively using a seprate list to get RTC Module functional on the other am43x SoCs used on am437x-gp-evm and am437x-sk-evm. Signed-off-by: Keerthy <j-keerthy@ti.com> --- Changes in v2: Inverted the checking logic to accommodate registering for all the SoCs compatible to am4372 and removed the negating am438x logic to register rtc hwmods as suggested by Paul. arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c index e97a894..97fd399 100644 --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c @@ -1020,9 +1020,21 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { NULL, }; +static struct omap_hwmod_ocp_if *am43xx_rtc_hwmod_ocp_ifs[] __initdata = { + &am33xx_l4_wkup__rtc, + NULL, +}; + int __init am43xx_hwmod_init(void) { + int ret; + omap_hwmod_am43xx_reg(); omap_hwmod_init(); - return omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); + ret = omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); + + if (!ret && of_machine_is_compatible("ti,am4372")) + ret = omap_hwmod_register_links(am43xx_rtc_hwmod_ocp_ifs); + + return ret; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod 2016-02-19 4:38 ` [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod Keerthy @ 2016-02-19 7:21 ` Paul Walmsley 2016-02-19 7:59 ` Keerthy 0 siblings, 1 reply; 6+ messages in thread From: Paul Walmsley @ 2016-02-19 7:21 UTC (permalink / raw) To: linux-arm-kernel On Fri, 19 Feb 2016, Keerthy wrote: > The patch adds rtc hwmod. RTC module The RTC module is physically > present on the AM438x SoC used on AM43X-EPOS-EVM, but it is permanently > disabled. A secure RTC is used instead on these devices, where needed. > . Hence adding it selectively using a seprate list to get RTC Module > functional on the other am43x SoCs used on am437x-gp-evm and > am437x-sk-evm. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > --- > > Changes in v2: > > Inverted the checking logic to accommodate registering for all > the SoCs compatible to am4372 and removed the negating am438x logic > to register rtc hwmods as suggested by Paul. > > arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) OK thanks; I've queued the following patch for v4.6 or if I get unlucky, v4.7. - Paul From: Keerthy <j-keerthy@ti.com> Date: Fri, 19 Feb 2016 10:08:55 +0530 Subject: [PATCH] ARM: AM43XX: hwmod: Add rtc hwmod The patch registers the rtc hwmod on AM437x chips. The RTC module is physically present on the AM438x SoC used on AM43X-EPOS-EVM, but it is permanently disabled. A secure RTC is used instead on these devices, where needed. Hence adding it selectively using a separate list to get RTC Module functional on the other am43x SoCs used on am437x-gp-evm and am437x-sk-evm. Signed-off-by: Keerthy <j-keerthy@ti.com> [paul at pwsan.com: cleaned up patch description] Signed-off-by: Paul Walmsley <paul@pwsan.com> --- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c index e97a894b5f88..97fd399202dc 100644 --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c @@ -1020,9 +1020,21 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { NULL, }; +static struct omap_hwmod_ocp_if *am43xx_rtc_hwmod_ocp_ifs[] __initdata = { + &am33xx_l4_wkup__rtc, + NULL, +}; + int __init am43xx_hwmod_init(void) { + int ret; + omap_hwmod_am43xx_reg(); omap_hwmod_init(); - return omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); + ret = omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); + + if (!ret && of_machine_is_compatible("ti,am4372")) + ret = omap_hwmod_register_links(am43xx_rtc_hwmod_ocp_ifs); + + return ret; } -- 2.7.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod 2016-02-19 7:21 ` Paul Walmsley @ 2016-02-19 7:59 ` Keerthy 0 siblings, 0 replies; 6+ messages in thread From: Keerthy @ 2016-02-19 7:59 UTC (permalink / raw) To: linux-arm-kernel On Friday 19 February 2016 12:51 PM, Paul Walmsley wrote: > On Fri, 19 Feb 2016, Keerthy wrote: > >> The patch adds rtc hwmod. RTC module The RTC module is physically >> present on the AM438x SoC used on AM43X-EPOS-EVM, but it is permanently >> disabled. A secure RTC is used instead on these devices, where needed. >> . Hence adding it selectively using a seprate list to get RTC Module >> functional on the other am43x SoCs used on am437x-gp-evm and >> am437x-sk-evm. >> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> --- >> >> Changes in v2: >> >> Inverted the checking logic to accommodate registering for all >> the SoCs compatible to am4372 and removed the negating am438x logic >> to register rtc hwmods as suggested by Paul. >> >> arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) > > OK thanks; I've queued the following patch for v4.6 or if I get unlucky, > v4.7. Thanks Paul! > > - Paul > > From: Keerthy <j-keerthy@ti.com> > Date: Fri, 19 Feb 2016 10:08:55 +0530 > Subject: [PATCH] ARM: AM43XX: hwmod: Add rtc hwmod > > The patch registers the rtc hwmod on AM437x chips. The RTC module is > physically present on the AM438x SoC used on AM43X-EPOS-EVM, but it is > permanently disabled. A secure RTC is used instead on these devices, > where needed. Hence adding it selectively using a separate list to get > RTC Module functional on the other am43x SoCs used on am437x-gp-evm > and am437x-sk-evm. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > [paul at pwsan.com: cleaned up patch description] > Signed-off-by: Paul Walmsley <paul@pwsan.com> > --- > arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c > index e97a894b5f88..97fd399202dc 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c > @@ -1020,9 +1020,21 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { > NULL, > }; > > +static struct omap_hwmod_ocp_if *am43xx_rtc_hwmod_ocp_ifs[] __initdata = { > + &am33xx_l4_wkup__rtc, > + NULL, > +}; > + > int __init am43xx_hwmod_init(void) > { > + int ret; > + > omap_hwmod_am43xx_reg(); > omap_hwmod_init(); > - return omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); > + ret = omap_hwmod_register_links(am43xx_hwmod_ocp_ifs); > + > + if (!ret && of_machine_is_compatible("ti,am4372")) > + ret = omap_hwmod_register_links(am43xx_rtc_hwmod_ocp_ifs); > + > + return ret; > } > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-19 18:55 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-19 4:38 [PATCH v2 0/2] arm: am43xx: Register rtc hwmod Keerthy 2016-02-19 4:38 ` [PATCH v2 1/2] ARM: dts: am43x-epos-evm: Add the am438 compatible string Keerthy 2016-02-19 18:55 ` Tony Lindgren 2016-02-19 4:38 ` [PATCH v2 2/2] ARM: AM43XX: HWMOD: Add rtc hwmod Keerthy 2016-02-19 7:21 ` Paul Walmsley 2016-02-19 7:59 ` Keerthy
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).