 arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 100 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/prcm43xx.h             |   1 +
 2 files changed, 101 insertions(+)

arch/arm/mach-omap2/omap_hwmod_43xx_data.c +100 -0

index 5c2cc8083fdd..fea01aa3ef42 100644
@@ -19,6 +19,8 @@
 #include "omap_hwmod.h"
 #include "omap_hwmod_33xx_43xx_common_data.h"
 #include "prcm43xx.h"
+#include "omap_hwmod_common_data.h"
+
 
 /* IP blocks */
 static struct omap_hwmod am43xx_l4_hs_hwmod = {

@@ -415,6 +417,72 @@ static struct omap_hwmod am43xx_qspi_hwmod = {
 	},
 };
 
+/* dss */
+
+static struct omap_hwmod am43xx_dss_core_hwmod = {
+	.name		= "dss_core",
+	.class		= &omap2_dss_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+			.modulemode   = MODULEMODE_SWCTRL,
+		},
+	},
+};
+
+/* dispc */
+
+struct omap_dss_dispc_dev_attr am43xx_dss_dispc_dev_attr = {
+	.manager_count		= 1,
+	.has_framedonetv_irq	= 0
+};
+
+static struct omap_hwmod_class_sysconfig am43xx_dispc_sysc = {
+	.rev_offs	= 0x0000,
+	.sysc_offs	= 0x0010,
+	.syss_offs	= 0x0014,
+	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
+			   SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+			   SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_MIDLEMODE),
+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+	.sysc_fields	= &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class am43xx_dispc_hwmod_class = {
+	.name	= "dispc",
+	.sysc	= &am43xx_dispc_sysc,
+};
+
+static struct omap_hwmod am43xx_dss_dispc_hwmod = {
+	.name		= "dss_dispc",
+	.class		= &am43xx_dispc_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+	.dev_attr	= &am43xx_dss_dispc_dev_attr,
+};
+
+/* rfbi */
+
+static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
+	.name		= "dss_rfbi",
+	.class		= &omap2_rfbi_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+};
+
 /* Interfaces */
 static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = {
 	.master		= &am33xx_l3_main_hwmod,

@@ -654,6 +722,34 @@ static struct omap_hwmod_ocp_if am43xx_l3_s__qspi = {
 	.user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
+	.master		= &am43xx_dss_core_hwmod,
+	.slave		= &am33xx_l3_main_hwmod,
+	.clk		= "l3_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_core_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_dispc = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_dispc_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_rfbi_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am33xx_l4_wkup__synctimer,
 	&am43xx_l4_ls__timer8,

@@ -748,6 +844,10 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am43xx_l4_ls__ocp2scp1,
 	&am43xx_l3_s__usbotgss0,
 	&am43xx_l3_s__usbotgss1,
+	&am43xx_dss__l3_main,
+	&am43xx_l4_ls__dss,
+	&am43xx_l4_ls__dss_dispc,
+	&am43xx_l4_ls__dss_rfbi,
 	NULL,
 };

arch/arm/mach-omap2/prcm43xx.h +1 -0

index 7785be984edd..ad7b3e9977f8 100644
@@ -142,5 +142,6 @@
 #define AM43XX_CM_PER_USBPHYOCP2SCP0_CLKCTRL_OFFSET	0x05B8
 #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET        0x0268
 #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET	0x05C0
+#define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET		0x0a20
 
 #endif

Signature · 1 line

1.9.1

Tony Lindgren

maintainer

2014-06-17 08:58 UTC #1 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

Quoted 78 lines · Tomi Valkeinen

From: Sathya Prakash M R <[email protected]>

Add DSS hwmod data for AM43xx.

Signed-off-by Sathya Prakash M R <[email protected]>

[tomi.valkeinen at ti.com: added missing dispc flags]

Signed-off-by Tomi Valkeinen <[email protected]>

Acked-by Rajendra Nayak <[email protected]>

---
Changes to v1:

* added missing dispc .sysc_flags and .idlemodes
* reordered entries, as the dss and dispc were a bit mixed together

 arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 100 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/prcm43xx.h             |   1 +
 2 files changed, 101 insertions(+)

arch/arm/mach-omap2/omap_hwmod_43xx_data.c +45 -0

index 5c2cc8083fdd..fea01aa3ef42 100644
@@ -19,6 +19,8 @@
 #include "omap_hwmod.h"
 #include "omap_hwmod_33xx_43xx_common_data.h"
 #include "prcm43xx.h"
+#include "omap_hwmod_common_data.h"
+
 
 /* IP blocks */
 static struct omap_hwmod am43xx_l4_hs_hwmod = {

@@ -415,6 +417,72 @@ static struct omap_hwmod am43xx_qspi_hwmod = {
 	},
 };
 
+/* dss */
+
+static struct omap_hwmod am43xx_dss_core_hwmod = {
+	.name		= "dss_core",
+	.class		= &omap2_dss_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+			.modulemode   = MODULEMODE_SWCTRL,
+		},
+	},
+};
+
+/* dispc */
+
+struct omap_dss_dispc_dev_attr am43xx_dss_dispc_dev_attr = {
+	.manager_count		= 1,
+	.has_framedonetv_irq	= 0
+};
+
+static struct omap_hwmod_class_sysconfig am43xx_dispc_sysc = {
+	.rev_offs	= 0x0000,
+	.sysc_offs	= 0x0010,
+	.syss_offs	= 0x0014,
+	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
+			   SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+			   SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_MIDLEMODE),
+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+	.sysc_fields	= &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class am43xx_dispc_hwmod_class = {
+	.name	= "dispc",
+	.sysc	= &am43xx_dispc_sysc,
+};
+
+static struct omap_hwmod am43xx_dss_dispc_hwmod = {
+	.name		= "dss_dispc",
+	.class		= &am43xx_dispc_hwmod_class,
+	.clkdm_name	= "dss_clkdm",

arch/arm/mach-omap2/omap_hwmod_43xx_data.c static struct omap_hwmod am43xx_qspi_hwmod = { · line 472

Quoted 10 lines

arch/arm/mach-omap2/omap_hwmod_43xx_data.c +10 -0

+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+	.dev_attr	= &am43xx_dss_dispc_dev_attr,
+};
+
+/* rfbi */

I think we're still missing am43x_rfbi_sysc entry though?

Quoted 75 lines

arch/arm/mach-omap2/omap_hwmod_43xx_data.c +44 -0

+static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
+	.name		= "dss_rfbi",
+	.class		= &omap2_rfbi_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+};
+
 /* Interfaces */
 static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = {
 	.master		= &am33xx_l3_main_hwmod,

@@ -654,6 +722,34 @@ static struct omap_hwmod_ocp_if am43xx_l3_s__qspi = {
 	.user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
+	.master		= &am43xx_dss_core_hwmod,
+	.slave		= &am33xx_l3_main_hwmod,
+	.clk		= "l3_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_core_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_dispc = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_dispc_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = {
+	.master		= &am33xx_l4_ls_hwmod,
+	.slave		= &am43xx_dss_rfbi_hwmod,
+	.clk		= "l4ls_gclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am33xx_l4_wkup__synctimer,
 	&am43xx_l4_ls__timer8,

@@ -748,6 +844,10 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am43xx_l4_ls__ocp2scp1,
 	&am43xx_l3_s__usbotgss0,
 	&am43xx_l3_s__usbotgss1,
+	&am43xx_dss__l3_main,
+	&am43xx_l4_ls__dss,
+	&am43xx_l4_ls__dss_dispc,
+	&am43xx_l4_ls__dss_rfbi,
 	NULL,
 };

arch/arm/mach-omap2/prcm43xx.h +1 -0

index 7785be984edd..ad7b3e9977f8 100644
@@ -142,5 +142,6 @@
 #define AM43XX_CM_PER_USBPHYOCP2SCP0_CLKCTRL_OFFSET	0x05B8
 #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET        0x0268
 #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET	0x05C0
+#define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET		0x0a20
 
 #endif

Signature · 1 line

1.9.1

Tomi Valkeinen

author

2014-06-17 09:25 UTC #2 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

Quoted 4 lines · Tony Lindgren

Quoted 1 line
+/* rfbi */
I think we're still missing am43x_rfbi_sysc entry though?

Quoted 11 lines

arch/arm/mach-omap2/omap_hwmod_43xx_data.c static struct omap_hwmod am43xx_qspi_hwmod = { · line 484
Quoted 11 lines
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +11 -0
+static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
+	.name		= "dss_rfbi",
+	.class		= &omap2_rfbi_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+};

That should come from omap2/3 hwmod data, as the above references omap2_rfbi_hwmod_class. The bits there looked correct for AM43xx to me.

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140617/734f2f87/attachment.sig>

Tony Lindgren

maintainer

2014-06-17 09:57 UTC #3 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

Quoted 6 lines · Tomi Valkeinen

Quoted 4 lines · Tony Lindgren
Quoted 1 line
+/* rfbi */
I think we're still missing am43x_rfbi_sysc entry though?

Quoted 14 lines

Quoted 11 lines
arch/arm/mach-omap2/omap_hwmod_43xx_data.c static struct omap_hwmod am43xx_qspi_hwmod = { · line 484
Quoted 11 lines
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +11 -0
+static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
+	.name		= "dss_rfbi",
+	.class		= &omap2_rfbi_hwmod_class,
+	.clkdm_name	= "dss_clkdm",
+	.main_clk	= "disp_clk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+		},
+	},
+};
That should come from omap2/3 hwmod data, as the above references omap2_rfbi_hwmod_class. The bits there looked correct for AM43xx to me.

OK looks good to me then:

Acked-by Tony Lindgren <[email protected]>

Felipe Balbi

2014-06-17 13:16 UTC #4 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

In reply to Tomi Valkeinen

Quoted 8 lines · Tomi Valkeinen

From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>

tested on top of today's linux-next (5f295cdf5c5dbbb0c40f10f2ddae02ff46bbf773) with am437x-sk. Works fine:

Tested-by Felipe Balbi <[email protected]>

Signature · 15 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: minicom.cap
Type: application/vnd.tcpdump.pcap
Size: 30529 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140617/2b6f8009/attachment-0001.cap>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140617/2b6f8009/attachment-0001.sig>

Paul Walmsley

maintainer

2014-06-22 20:47 UTC #5 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

In reply to Tomi Valkeinen

Quoted 8 lines · Tomi Valkeinen

From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>

Thanks, queued with Tony's Acked-by: and Felipe's Tested-by: for 3.17.

- Paul

Paul Walmsley

maintainer

2014-07-22 21:14 UTC #6 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

In reply to Tomi Valkeinen

Quoted 8 lines · Tomi Valkeinen

From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>

This one didn't compile on an AM43xx-only build:

----
arch/arm/mach-omap2/built-in.o:(.data+0x3f2c): undefined reference to omap2_dss_hwmod_class' arch/arm/mach-omap2/built-in.o:(.data+0x405c): undefined reference to omap2_rfbi_hwmod_class'
make: *** [vmlinux] Error 1
test_build: Tue Jul 22 13:48:50 MDT 2014: FAILED on omap2plus_defconfig_am43xx_only hwmod-a-v3.17
----

Have queued the following patch instead.

- Paul

From: Sathya Prakash M R <[email protected]>
Date: Sat, 5 Jul 2014 17:44:57 -0600
Subject: [PATCH] ARM: AM43xx: hwmod: add DSS hwmod data

Add DSS hwmod data for AM43xx.

Signed-off-by Sathya Prakash M R <[email protected]>

[tomi.valkeinen at ti.com: added missing dispc flags]

Signed-off-by Tomi Valkeinen <[email protected]>

Acked-by Rajendra Nayak <[email protected]>

Acked-by Tony Lindgren <[email protected]>

Tested-by Felipe Balbi <[email protected]> # on linux-next 5f295cdf5c5d

[paul at pwsan.com: fixed build break on AM43xx-only config]

Signed-off-by Paul Walmsley <[email protected]>

---
 arch/arm/mach-omap2/Makefile                       |   1 +
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |  40 ---------
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c         | 100 +++++++++++++++++++++
 .../mach-omap2/omap_hwmod_common_ipblock_data.c    |  55 ++++++++++++
 arch/arm/mach-omap2/prcm43xx.h                     |   1 +
 5 files changed, 157 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c

arch/arm/mach-omap2/Makefile +1 -0

index 8421f38cf445..75c73f253604 100644
@@ -200,6 +200,7 @@ obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o
 obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o
 
 # hwmod data
+obj-y					+= omap_hwmod_common_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_interconnect_data.o

arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +0 ~~-40~~

index 5da7a42a6d90..c6c6384de867 100644
@@ -37,46 +37,6 @@ struct omap_hwmod_class omap2_uart_class = {
 };
 
 /*
- * 'dss' class
- * display sub-system
- */
-
-static struct omap_hwmod_class_sysconfig omap2_dss_sysc = {
-	.rev_offs	= 0x0000,
-	.sysc_offs	= 0x0010,
-	.syss_offs	= 0x0014,
-	.sysc_flags	= (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
-			   SYSS_HAS_RESET_STATUS),
-	.sysc_fields	= &omap_hwmod_sysc_type1,
-};
-
-struct omap_hwmod_class omap2_dss_hwmod_class = {
-	.name	= "dss",
-	.sysc	= &omap2_dss_sysc,
-	.reset	= omap_dss_reset,
-};
-
-/*
- * 'rfbi' class
- * remote frame buffer interface
- */
-
-static struct omap_hwmod_class_sysconfig omap2_rfbi_sysc = {
-	.rev_offs	= 0x0000,
-	.sysc_offs	= 0x0010,
-	.syss_offs	= 0x0014,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-			   SYSC_HAS_AUTOIDLE),
-	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
-	.sysc_fields	= &omap_hwmod_sysc_type1,
-};
-
-struct omap_hwmod_class omap2_rfbi_hwmod_class = {
-	.name	= "rfbi",
-	.sysc	= &omap2_rfbi_sysc,
-};
-
-/*
  * 'venc' class
  * video encoder
  */

arch/arm/mach-omap2/omap_hwmod_43xx_data.c +100 -0

124 lines not on this page · raw message

arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c new file +55 -0

55 lines not on this page · raw message

arch/arm/mach-omap2/prcm43xx.h +1 -0

index 7785be984edd..ad7b3e9977f8 100644
@@ -142,5 +142,6 @@
 #define AM43XX_CM_PER_USBPHYOCP2SCP0_CLKCTRL_OFFSET	0x05B8
 #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET        0x0268
 #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET	0x05C0
+#define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET		0x0a20
 
 #endif

Signature · 1 line

2.0.1

Felipe Balbi

Applied

2014-07-25 16:53 UTC #7 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

Quoted 13 lines · Paul Walmsley

Quoted 8 lines · Tomi Valkeinen
From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>
This one didn't compile on an AM43xx-only build:

Quoted 8 lines

----
arch/arm/mach-omap2/built-in.o:(.data+0x3f2c): undefined reference to omap2_dss_hwmod_class' arch/arm/mach-omap2/built-in.o:(.data+0x405c): undefined reference to omap2_rfbi_hwmod_class'
make: *** [vmlinux] Error 1
test_build: Tue Jul 22 13:48:50 MDT 2014: FAILED on omap2plus_defconfig_am43xx_only hwmod-a-v3.17
----
Have queued the following patch instead.

queued for v3.17, I assume. Still not available from linux-next though.

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140725/a010bda4/attachment.sig>

Tony Lindgren

maintainer

2014-07-29 11:07 UTC #8 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

Quoted 21 lines · Felipe Balbi

Quoted 20 lines · Paul Walmsley
Quoted 8 lines · Tomi Valkeinen
From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>
This one didn't compile on an AM43xx-only build:
----
arch/arm/mach-omap2/built-in.o:(.data+0x3f2c): undefined reference to omap2_dss_hwmod_class' arch/arm/mach-omap2/built-in.o:(.data+0x405c): undefined reference to omap2_rfbi_hwmod_class'
make: *** [vmlinux] Error 1
test_build: Tue Jul 22 13:48:50 MDT 2014: FAILED on omap2plus_defconfig_am43xx_only hwmod-a-v3.17
----

Quoted 3 lines

Quoted 1 line
Have queued the following patch instead.
queued for v3.17, I assume. Still not available from linux-next though.

Should be in linux-next now.

Tony

Tomi Valkeinen

author

2014-07-30 12:09 UTC #9 lore raw

PATCH v2 1/1 ARM: AM43xx: hwmod: add DSS hwmod data

In reply to Paul Walmsley

Quoted 13 lines · Paul Walmsley

Quoted 8 lines · Tomi Valkeinen
From: Sathya Prakash M R <[email protected]>
Add DSS hwmod data for AM43xx.
Signed-off-by Sathya Prakash M R <[email protected]>
[tomi.valkeinen at ti.com: added missing dispc flags]
Signed-off-by Tomi Valkeinen <[email protected]>
Acked-by Rajendra Nayak <[email protected]>
This one didn't compile on an AM43xx-only build:

Quoted 8 lines

----
arch/arm/mach-omap2/built-in.o:(.data+0x3f2c): undefined reference to omap2_dss_hwmod_class' arch/arm/mach-omap2/built-in.o:(.data+0x405c): undefined reference to omap2_rfbi_hwmod_class'
make: *** [vmlinux] Error 1
test_build: Tue Jul 22 13:48:50 MDT 2014: FAILED on omap2plus_defconfig_am43xx_only hwmod-a-v3.17
----
Have queued the following patch instead.

Thanks. Tested on AM437x GP EVM with today's linux-next. Works fine for me.

Tomi