Skip to contentSkip to conversation

ARM: OMAP4: Remove un-used control module headers and defines.

PATCH New Konstantin Baydarov 2 participants 4 messages Jul 25, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Konstantin Baydarov

author
#0 lore raw

PATCH v4 1/4 ARM: OMAP4: Remove un-used control module headers and defines.

Most of the OMAP4 control module register defines are not used and can be removed. Keep only needed defines and move them to common control module header just like other OMAP versions.

Signed-off-by Santosh Shilimkar <[email protected]>
Signed-off-by Eduardo Valentin <[email protected]>
Signed-off-by Konstantin Baydarov <[email protected]>
---
 arch/arm/mach-omap2/control.h                      |   48 +-
 .../include/mach/ctrl_module_core_44xx.h           |  392 ------
 .../include/mach/ctrl_module_pad_core_44xx.h       | 1409 --------------------
 .../include/mach/ctrl_module_pad_wkup_44xx.h       |  236 ----
 .../include/mach/ctrl_module_wkup_44xx.h           |   92 --
 5 files changed, 43 insertions(+), 2134 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h
 delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
 delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h
 delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h
arch/arm/mach-omap2/control.h +43 -5
index b8cdc85..74af9de 100644
@@ -16,11 +16,6 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
 #define __ARCH_ARM_MACH_OMAP2_CONTROL_H
 
-#include <mach/ctrl_module_core_44xx.h>
-#include <mach/ctrl_module_wkup_44xx.h>
-#include <mach/ctrl_module_pad_core_44xx.h>
-#include <mach/ctrl_module_pad_wkup_44xx.h>
-
 #include <plat/am33xx.h>
 
 #ifndef __ASSEMBLY__

@@ -190,6 +185,46 @@
 #define OMAP3630_CONTROL_FUSE_OPP100_VDD2       (OMAP2_CONTROL_GENERAL + 0x012C)
 #define OMAP3630_CONTROL_CAMERA_PHY_CTRL	(OMAP2_CONTROL_GENERAL + 0x02f0)
 
+/* OMAP4 IDCODE CONTROL */
+#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1		0x0218
+#define OMAP4_CTRL_MODULE_CORE_STATUS				0x02c4
+
+/* OMAP4 DSP_BOOTADDR */
+#define OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR			0x0304
+
+/* CONTROL_I2C_1 */
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1		0x0624
+#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK			(1 << 28)
+#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK			(1 << 24)
+
+/* DSI CONTROL_DSIPHY */
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY		0x0618
+#define OMAP4_DSI2_LANEENABLE_SHIFT				29
+#define OMAP4_DSI2_LANEENABLE_MASK				(0x7 << 29)
+#define OMAP4_DSI1_LANEENABLE_SHIFT				24
+#define OMAP4_DSI1_LANEENABLE_MASK				(0x1f << 24)
+#define OMAP4_DSI1_PIPD_SHIFT					19
+#define OMAP4_DSI1_PIPD_MASK					(0x1f << 19)
+#define OMAP4_DSI2_PIPD_SHIFT					14
+#define OMAP4_DSI2_PIPD_MASK					(0x1f << 14)
+
+/* CONTROL_PBIASLITE */
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PBIASLITE		0x0600
+#define OMAP4_MMC1_PWRDNZ_MASK					(1 << 26)
+#define OMAP4_MMC1_PBIASLITE_VMODE_MASK				(1 << 21)
+#define OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK			(1 << 22)
+#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK			(1 << 23)
+
+/* CONTROL_MMC1 */
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC1			0x0628
+#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_MASK			(1 << 31)
+#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_MASK			(1 << 30)
+#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_MASK			(1 << 29)
+#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_MASK			(1 << 28)
+#define OMAP4_SDMMC1_DR0_SPEEDCTRL_MASK				(1 << 27)
+#define OMAP4_SDMMC1_DR1_SPEEDCTRL_MASK				(1 << 26)
+#define OMAP4_SDMMC1_DR2_SPEEDCTRL_MASK				(1 << 25)
+
 /* OMAP44xx control efuse offsets */
 #define OMAP44XX_CONTROL_FUSE_IVA_OPP50		0x22C
 #define OMAP44XX_CONTROL_FUSE_IVA_OPP100	0x22F

@@ -202,6 +237,9 @@
 #define OMAP44XX_CONTROL_FUSE_CORE_OPP50	0x254
 #define OMAP44XX_CONTROL_FUSE_CORE_OPP100	0x257
 
+/* OMAP44xx control McBSP padconf */
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP	0x061c
+
 /* AM35XX only CONTROL_GENERAL register offsets */
 #define AM35XX_CONTROL_MSUSPENDMUX_6    (OMAP2_CONTROL_GENERAL + 0x0038)
 #define AM35XX_CONTROL_DEVCONF2         (OMAP2_CONTROL_GENERAL + 0x0310)
arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h deleted +0 -392

392 lines not on this page · raw message

arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h deleted +0 -1409

1,409 lines not on this page · raw message

arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h deleted +0 -236

236 lines not on this page · raw message

arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h deleted +0 -92

92 lines not on this page · raw message

Signature · 1 line
1.7.7.6
#1 lore raw

PATCH v4 1/4 ARM: OMAP4: Remove un-used control module headers and defines.

Hi,

Quoted 7 lines · Konstantin Baydarov

Most of the OMAP4 control module register defines are not used and can be removed. Keep only needed defines and move them to common control module header just like other OMAP versions.

Signed-off-by Santosh Shilimkar <[email protected]>
Signed-off-by Eduardo Valentin <[email protected]>
Signed-off-by Konstantin Baydarov <[email protected]>

Wasn't this one authored by Santosh ?? Where's his From: Santosh Shilimkar ???

Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120725/96680b08/attachment.sig>
author
#2 lore raw

PATCH v4 1/4 ARM: OMAP4: Remove un-used control module headers and defines.

Hi, Balbi.

Quoted 7 lines · Felipe Balbi

Hi,

Quoted 4 lines · Konstantin Baydarov

Most of the OMAP4 control module register defines are not used and can be removed. Keep only needed defines and move them to common control module header just like other OMAP versions.

Quoted 5 lines
Quoted 3 lines
Signed-off-by Santosh Shilimkar <[email protected]>
Signed-off-by Eduardo Valentin <[email protected]>
Signed-off-by Konstantin Baydarov <[email protected]>

Wasn't this one authored by Santosh ?? Where's his From: Santosh Shilimkar ???

I hit "edit as new" when I sent patches through thunderbird, I'll fix in the next series.

BR,
Konstantin Baydarov.

Quoted 1 line
#3 lore raw

PATCH v4 1/4 ARM: OMAP4: Remove un-used control module headers and defines.

Hi,

Quoted 10 lines · Konstantin Baydarov

Hi, Balbi.

Quoted 7 lines · Felipe Balbi

Hi,

Quoted 4 lines · Konstantin Baydarov

Most of the OMAP4 control module register defines are not used and can be removed. Keep only needed defines and move them to common control module header just like other OMAP versions.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Signed-off-by Santosh Shilimkar <[email protected]>
Signed-off-by Eduardo Valentin <[email protected]>
Signed-off-by Konstantin Baydarov <[email protected]>

Wasn't this one authored by Santosh ?? Where's his From: Santosh Shilimkar ???

I hit "edit as new" when I sent patches through thunderbird, I'll fix in the next series.

git send-email would help avoiding those ;-)

Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120725/629fcf65/attachment.sig>