Changeset b933ec2 in mainline

Timestamp:

2012-10-17T20:21:53Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6454ad47

Parents:

5de9ff9 (diff), d216142 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge changes drom lp:helenos-bbone

File:

• kernel/genarch/include/drivers/am335x_ctrlmod/am335x_iomux.h (moved) (moved from kernel/genarch/include/drivers/am335x_ctrlmod/am335x_ctrlmod_iomux.h ) (2 diffs)

kernel/genarch/include/drivers/am335x_ctrlmod/am335x_iomux.h

@@ -34 +34 @@
  */
 
-#ifndef KERN_AM335X_CTRLMOD_IOMUX_H_
-#define KERN_AM335X_CTRLMOD_IOMUX_H_
+#ifndef KERN_AM335X_IOMUX_H_
+#define KERN_AM335X_IOMUX_H_
 
 #include <typedefs.h>
 
 /* Pad Control Register for each configurable pin p. 876 */
-#define AM335X_CTRLMOD_SLEWRATE_SLOW_FLAG  (1 << 6)
-#define AM335X_CTRLMOD_RX_ENABLE_FLAG  (1 << 5)
-#define AM335X_CTRLMOD_PULLUP_FLAG  (1 << 4)
-#define AM335X_CTRLMOD_PULLUPDOWN_ENABLE_FLAG  (1 << 3)
-#define AM335X_CTRLMOD_MUXMODE0  0
-#define AM335X_CTRLMOD_MUXMODE1  1
-#define AM335X_CTRLMOD_MUXMODE2  2
-#define AM335X_CTRLMOD_MUXMODE3  3
-#define AM335X_CTRLMOD_MUXMODE4  4
-#define AM335X_CTRLMOD_MUXMODE5  5
-#define AM335X_CTRLMOD_MUXMODE6  6
-#define AM335X_CTRLMOD_MUXMODE7  7
+#define AM335X_IOMUX_SLEWRATE_SLOW_FLAG  (1 << 6)
+#define AM335X_IOMUX_RX_ENABLE_FLAG  (1 << 5)
+#define AM335X_IOMUX_PULLUP_FLAG  (1 << 4)
+#define AM335X_IOMUX_PULLUPDOWN_ENABLE_FLAG  (1 << 3)
+#define AM335X_IOMUX_MODE0  0
+#define AM335X_IOMUX_MODE1  1
+#define AM335X_IOMUX_MODE2  2
+#define AM335X_IOMUX_MODE3  3
+#define AM335X_IOMUX_MODE4  4
+#define AM335X_IOMUX_MODE5  5
+#define AM335X_IOMUX_MODE6  6
+#define AM335X_IOMUX_MODE7  7
 
 /* AM335X CONTROL_MODULE configurable I/O pin. Table 9-10 at p. 886 */
-#define AM335X_CTRLMOD_CONF_BASE_ADDRESS 0x44E10800
+#define AM335X_IOMUX_CONF_BASE_ADDRESS 0x44E10800
 
 typedef struct {
@@ -265 +265 @@
         ioport32_t vsense;
         ioport32_t testout;
-} am335x_ctrlmod_conf_regs_t;
-
-#endif /* KERN_AM335X_CTRLMOD_IOMUX_H_ */
+} am335x_iomux_conf_regs_t;
+#endif /* KERN_AM335X_IOMUX_H_ */