From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 2/6] arm, am335x: add some missing registers and defines for lcd and epwm support
Date: Mon, 19 Aug 2013 16:38:57 +0200 [thread overview]
Message-ID: <1376923141-18002-3-git-send-email-hs@denx.de> (raw)
In-Reply-To: <1376923141-18002-1-git-send-email-hs@denx.de>
- add missing register defines in struct cm_perpl
epwmss0clkctrl
epwmss2clkctrl
lcdcclkstctrl
- add missing register defines in struct cm_dpll
clklcdcpixelclk
- add struct pwmss_regs
- add struct pwmss_ecap_regs
- add LCD Controller base LCD_CNTL_BASE
- add PWM0 controller base PWMSS0_BASE
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
---
- changes for v4:
add comment from Tom Rini:
- rename "reserved" into "resv1" in struct pwmss_ecap_regs
- use <space> not <tab> after "#define"
add this patch to patchserie "arm, am335x: add support for siemens boards"
-> patch marked as v4
---
arch/arm/include/asm/arch-am33xx/cpu.h | 35 +++++++++++++++++++++-
arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 7 +++++
2 Dateien ge?ndert, 41 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-)
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index f77ac1e..1835c89 100644
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -193,7 +193,8 @@ struct cm_perpll {
unsigned int dcan1clkctrl; /* offset 0xC4 */
unsigned int resv6[2];
unsigned int emiffwclkctrl; /* offset 0xD0 */
- unsigned int resv7[2];
+ unsigned int epwmss0clkctrl; /* offset 0xD4 */
+ unsigned int epwmss2clkctrl; /* offset 0xD8 */
unsigned int l3instrclkctrl; /* offset 0xDC */
unsigned int l3clkctrl; /* Offset 0xE0 */
unsigned int resv8[4];
@@ -204,6 +205,7 @@ struct cm_perpll {
unsigned int l4hsclkctrl; /* offset 0x120 */
unsigned int resv10[8];
unsigned int cpswclkstctrl; /* offset 0x144 */
+ unsigned int lcdcclkstctrl; /* offset 0x148 */
};
#else
/* Encapsulating core pll registers */
@@ -366,6 +368,8 @@ struct cm_perpll {
struct cm_dpll {
unsigned int resv1[2];
unsigned int clktimer2clk; /* offset 0x08 */
+ unsigned int resv2[10];
+ unsigned int clklcdcpixelclk; /* offset 0x34 */
};
/* Control Module RTC registers */
@@ -505,6 +509,35 @@ struct ctrl_dev {
#define RGMII_INT_DELAY (RGMII1_IDMODE | RGMII2_IDMODE)
#define RMII_CHIPCKL_ENABLE (RMII1_IO_CLK_EN | RMII2_IO_CLK_EN)
+/* PWMSS */
+struct pwmss_regs {
+ unsigned int idver;
+ unsigned int sysconfig;
+ unsigned int clkconfig;
+ unsigned int clkstatus;
+};
+#define ECAP_CLK_EN BIT(0)
+#define ECAP_CLK_STOP_REQ BIT(1)
+
+struct pwmss_ecap_regs {
+ unsigned int tsctr;
+ unsigned int ctrphs;
+ unsigned int cap1;
+ unsigned int cap2;
+ unsigned int cap3;
+ unsigned int cap4;
+ unsigned int resv1[4];
+ unsigned short ecctl1;
+ unsigned short ecctl2;
+};
+
+/* Capture Control register 2 */
+#define ECTRL2_SYNCOSEL_MASK (0x03 << 6)
+#define ECTRL2_MDSL_ECAP BIT(9)
+#define ECTRL2_CTRSTP_FREERUN BIT(4)
+#define ECTRL2_PLSL_LOW BIT(10)
+#define ECTRL2_SYNC_EN BIT(5)
+
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL_STRICT_NAMES */
diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h
index 8973fd8..e4231c8 100644
--- a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h
@@ -58,4 +58,11 @@
#define USB0_OTG_BASE 0x47401000
#define USB1_OTG_BASE 0x47401800
+/* LCD Controller */
+#define LCD_CNTL_BASE 0x4830E000
+
+/* PWMSS */
+#define PWMSS0_BASE 0x48300000
+#define AM33XX_ECAP0_BASE 0x48300100
+
#endif /* __AM33XX_HARDWARE_AM33XX_H */
--
1.7.11.7
next prev parent reply other threads:[~2013-08-19 14:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-19 14:38 [U-Boot] [PATCH v4 0/6] arm, am335x: add support for siemens boards Heiko Schocher
2013-08-19 14:38 ` [U-Boot] [PATCH v4 1/6] arm, am33xx: add defines for gmii_sel_register bits Heiko Schocher
2013-08-19 15:34 ` Tom Rini
2013-08-19 14:38 ` Heiko Schocher [this message]
2013-08-19 14:38 ` [U-Boot] [PATCH v4 3/6] arm, spl: add watchdog library to SPL Heiko Schocher
2013-08-19 14:38 ` [U-Boot] [PATCH v4 4/6] arm, am335x: add watchdog support Heiko Schocher
2013-08-19 14:39 ` [U-Boot] [PATCH v4 5/6] video: add formike lcd panel init Heiko Schocher
2013-08-19 17:54 ` Anatolij Gustschin
2013-08-19 14:39 ` [U-Boot] [PATCH v4 6/6] arm, am335x: add support for 3 siemens boards Heiko Schocher
2013-08-19 15:35 ` [U-Boot] [PATCH v4 0/6] arm, am335x: add support for " Tom Rini
2013-08-19 17:58 ` Anatolij Gustschin
2013-08-19 18:05 ` Tom Rini
2013-08-28 16:01 ` [U-Boot] [PATCH] siemens-am33x-common.h: Always build CONFIG_OMAP_GPIO support Tom Rini
2013-08-28 18:25 ` [U-Boot] [PATCH v4 0/6] arm, am335x: add support for siemens boards Tom Rini
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=1376923141-18002-3-git-send-email-hs@denx.de \
--to=hs@denx.de \
--cc=u-boot@lists.denx.de \
/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