kernel: add padconf kernel call

On the AM335X, writes to the padconf registers must be done in privileged
mode. To allow userspace drivers to dynamically change the padconf at
runtime, a kernel call has been added.

Change-Id: I4b25d2879399b1785a360912faa0e90b5c258533

diff --git a/commands/service/parse.c b/commands/service/parse.c
index f7f7bebdbdb5729e73f4252466eb670e578c3760..a84db8012dd738cee7d01a6a8a29b7a895623e5d 100644 (file)
--- a/commands/service/parse.c
+++ b/commands/service/parse.c
@@ -828,6 +828,7 @@ struct
        { "STIME",              SYS_STIME },
        { "VMCTL",              SYS_VMCTL },
        { "MEMSET",             SYS_MEMSET },
+       { "PADCONF",            SYS_PADCONF },
        { NULL,         0 }
 };
 

diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
index 1e3882a9db14b19499e43f9608349d3904c2a560..567ebd6e08d093f21744d7af49692ed741acb32f 100644 (file)
--- a/distrib/sets/lists/minix/md.evbarm
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -103,8 +103,6 @@
 ./usr/lib/libgpio_pic.a                        minix-sys
 ./usr/lib/libi2cdriver.a               minix-sys
 ./usr/lib/libi2cdriver_pic.a           minix-sys
-./usr/lib/libpadconf.a                 minix-sys
-./usr/lib/libpadconf_pic.a             minix-sys
 ./usr/man/man1/eepromread.1            minix-sys
 ./usr/mdec                             minix-sys
 ./usr/sbin/bmp085                      minix-sys

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ceeef86a079fab9a2c9dfb36f341e33825158165..66ef638674e06f7222a9ce892a888f83cf998e68 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -3,7 +3,7 @@ PROG=   gpio
 SRCS=  gpio.c
 
 DPADD+=        ${LIBBLOCKDRIVER} ${LIBSYS}
-LDADD+=        -lvtreefs -lsys -lgpio -lpadconf -lclkconf
+LDADD+=        -lvtreefs -lsys -lgpio -lclkconf
 
 #
 # This is a system driver.

diff --git a/drivers/gpio/gpio.c b/drivers/gpio/gpio.c
index 4163e58320988c12095c9849162b62cb8b76620f..31dc689a5e663c1ef016a7357bc10e69e8837f3f 100644 (file)
--- a/drivers/gpio/gpio.c
+++ b/drivers/gpio/gpio.c
@@ -169,18 +169,14 @@ init_hook(void)
        add_gpio_inode("USR1", 150, GPIO_MODE_OUTPUT);
        add_gpio_inode("Button", 4, GPIO_MODE_INPUT);
 
-       /* configure the padconf */
-       padconf_init();
-
        /* configure GPIO_144 to be exported */
-       padconf_set(CONTROL_PADCONF_UART2_CTS, 0xff,
+       sys_padconf(CONTROL_PADCONF_UART2_CTS, 0xff,
            PADCONF_MUXMODE(4) | PADCONF_PULL_MODE_PD_EN |
            PADCONF_INPUT_ENABLE(1));
-       padconf_set(CONTROL_PADCONF_MMC2_DAT6, 0xff00,
+       sys_padconf(CONTROL_PADCONF_MMC2_DAT6, 0xff00,
            (PADCONF_MUXMODE(4) | PADCONF_PULL_MODE_PD_EN |
                PADCONF_INPUT_ENABLE(1)) << 16);
 
-       padconf_release();
        /* Added for demo purposes */
        add_gpio_inode("BigRedButton", 144, GPIO_MODE_INPUT);
        add_gpio_inode("BigRedButtonLed", 139, GPIO_MODE_OUTPUT);

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 03df14375fd9af3537f4890a9910e7edd294fdf1..e2892804d5611a7a9bb307ee174a394d3b2e38ca 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -6,8 +6,8 @@ PROG=   i2c
 
 SRCS+=   i2c.c
 
-DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${CLKCONF} ${PADCONF}
-LDADD+= -lchardriver -lsys -ltimers -lclkconf -lpadconf
+DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${CLKCONF}
+LDADD+= -lchardriver -lsys -ltimers -lclkconf
 
 MAN=
 

diff --git a/drivers/i2c/arch/earm/omap_i2c.c b/drivers/i2c/arch/earm/omap_i2c.c
index 6925c963a60a4a2a01f76f1e0084ed351b87c4be..300b6d3de258d5398e4a7d4d4fd8768c99d587a2 100644 (file)
--- a/drivers/i2c/arch/earm/omap_i2c.c
+++ b/drivers/i2c/arch/earm/omap_i2c.c
@@ -217,9 +217,7 @@ static uint16_t omap_i2c_poll(uint16_t mask);
 static int omap_i2c_bus_is_free(void);
 static int omap_i2c_soft_reset(void);
 static void omap_i2c_bus_init(void);
-#if 0
 static void omap_i2c_padconf(int i2c_bus_id);
-#endif /* disable until libpadconf is fixed */
 static void omap_i2c_clkconf(int i2c_bus_id);
 static void omap_i2c_intr_enable(void);
 static uint16_t omap_i2c_read_status(void);
@@ -391,15 +389,12 @@ omap_i2c_clkconf(int i2c_bus_id)
        clkconf_release();
 }
 
-#if 0
-/* re-enable this code when libpadconf is working */
 static void
 omap_i2c_padconf(int i2c_bus_id)
 {
+       int r;
        u32_t pinopts;
 
-       padconf_init();
-
        if (omap_i2c_bus->bus_type == AM335X_I2C_BUS) {
 
                /* use the options suggested in starterware driver */
@@ -410,28 +405,55 @@ omap_i2c_padconf(int i2c_bus_id)
                switch (i2c_bus_id) {
                case 0:
                        pinopts |= CONTROL_CONF_MUXMODE(0);
-                       padconf_set(CONTROL_CONF_I2C0_SDA, 0xffffffff,
+
+                       r = sys_padconf(CONTROL_CONF_I2C0_SDA, 0xffffffff,
                            pinopts);
-                       padconf_set(CONTROL_CONF_I2C0_SCL, 0xffffffff,
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+
+                       r = sys_padconf(CONTROL_CONF_I2C0_SCL, 0xffffffff,
                            pinopts);
-                       log_info(&log, "pinopts=%x\n", pinopts);
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+
+                       log_debug(&log, "pinopts=0x%x\n", pinopts);
                        break;
 
                case 1:
                        pinopts |= CONTROL_CONF_MUXMODE(2);
-                       padconf_set(CONTROL_CONF_SPI0_CS0, 0xffffffff,
+
+                       r = sys_padconf(CONTROL_CONF_SPI0_CS0, 0xffffffff,
                            pinopts);
-                       padconf_set(CONTROL_CONF_SPI0_D1, 0xffffffff, pinopts);
-                       log_info(&log, "pinopts=%x\n", pinopts);
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+
+                       r = sys_padconf(CONTROL_CONF_SPI0_D1, 0xffffffff,
+                           pinopts);
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+                       log_debug(&log, "pinopts=0x%x\n", pinopts);
                        break;
 
                case 2:
                        pinopts |= CONTROL_CONF_MUXMODE(3);
-                       padconf_set(CONTROL_CONF_UART1_CTSN,
-                           0xffffffff, pinopts);
-                       padconf_set(CONTROL_CONF_UART1_RTSN,
+
+                       r = sys_padconf(CONTROL_CONF_UART1_CTSN, 0xffffffff,
+                           pinopts);
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+
+                       r = sys_padconf(CONTROL_CONF_UART1_RTSN,
                            0xffffffff, pinopts);
-                       log_info(&log, "pinopts=%x\n", pinopts);
+                       if (r != OK) {
+                               log_warn(&log, "padconf failed (r=%d)\n", r);
+                       }
+
+                       log_debug(&log, "pinopts=0x%x\n", pinopts);
                        break;
 
                default:
@@ -441,10 +463,7 @@ omap_i2c_padconf(int i2c_bus_id)
        }
 
        /* nothing to do for the DM37XX */
-
-       padconf_release();
 }
-#endif
 
 static int
 omap_i2c_soft_reset(void)
@@ -787,6 +806,9 @@ omap_interface_setup(int (**process) (minix_i2c_ioctl_exec_t * ioctl_exec),
        /* select the bus to operate on */
        omap_i2c_bus = &omap_i2c_buses[i2c_bus_id];
 
+       /* Configure Pins */
+       omap_i2c_padconf(i2c_bus_id);
+
        /*
         * Map I2C Registers
         */
@@ -811,12 +833,6 @@ omap_interface_setup(int (**process) (minix_i2c_ioctl_exec_t * ioctl_exec),
        /* Enable Clocks */
        omap_i2c_clkconf(i2c_bus_id);
 
-#if 0
-/* disable until libpadconf is fixed */
-       /* Configure Pins */
-       omap_i2c_padconf(i2c_bus_id);
-#endif
-
        /* Perform a soft reset of the I2C module to ensure a fresh start */
        r = omap_i2c_soft_reset();
        if (r != OK) {

diff --git a/etc/system.conf b/etc/system.conf
index aea6cb6c42708b03f3f99c430b78b05651a7318c..2c5fb351b4f3e219e0a55c3dbd2bf85bb9501d65 100644 (file)
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -582,6 +582,7 @@ service gpio
        system
                PRIVCTL         #  4
                IRQCTL          # 19
+               PADCONF         # 57
        ;
        irq     
                29      # GPIO module 1
@@ -599,6 +600,7 @@ service i2c
        system
                PRIVCTL         #  4
                IRQCTL          # 19
+               PADCONF         # 57
        ;
        irq
                # DM37XX (BeagleBoard-xM)

diff --git a/include/minix/com.h b/include/minix/com.h
index 293a1a333448daf8fea914a18ecbef9fad99b644..3100c2ac563745ba30c9916e611e6bdba4dd0be2 100644 (file)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -359,8 +359,10 @@
 
 #  define SYS_SAFEMEMSET (KERNEL_CALL + 56)    /* sys_safememset() */
 
+#  define SYS_PADCONF (KERNEL_CALL + 57)       /* sys_padconf() */
+
 /* Total */
-#define NR_SYS_CALLS   57      /* number of kernel calls */
+#define NR_SYS_CALLS   58      /* number of kernel calls */
 
 #define SYS_CALL_MASK_SIZE BITMAP_CHUNKS(NR_SYS_CALLS)
 
@@ -684,6 +686,11 @@
 #define SCHEDCTL_PRIORITY      m9_s4   /* current scheduling priority */
 #define SCHEDCTL_CPU           m9_l5   /* where to place this process */
 
+/* Field names for SYS_PADCONF */
+#define PADCONF_PADCONF                m2_i1   /* pad to configure */
+#define PADCONF_MASK           m2_i2   /* mask to apply */
+#define PADCONF_VALUE          m2_i3   /* value to write */
+
 /*===========================================================================*
  *                Messages for the Reincarnation Server                     *
  *===========================================================================*/

diff --git a/include/minix/padconf.h b/include/minix/padconf.h
index e832fbee4a93c6cc6e9202b64532c35bc3182c19..ba09a1c997eacc5f3b0b119ece1a5f46387b10c4 100644 (file)
--- a/include/minix/padconf.h
+++ b/include/minix/padconf.h
@@ -1,10 +1,18 @@
-#ifndef __PADCONF_H__
-#define __PADCONF_H__
+#ifndef __MINIX_PADCONF_H
+#define __MINIX_PADCONF_H
 
+/* Define the start address of the padconf registers and the size of the block.
+ * The base must be page aligned, so we round down and the kernel adds the
+ * offset. The size must be a multiple of ARM_PAGE_SIZE, so we round up to 4KB.
+ */
 #ifdef AM335X
 #define PADCONF_REGISTERS_BASE 0x44E10000
+#define PADCONF_REGISTERS_OFFSET 0x0000
+#define PADCONF_REGISTERS_SIZE 0x1000 /* OFFSET + highest reg, rounded up */
 #elif DM37XX
-#define PADCONF_REGISTERS_BASE 0x48002030
+#define PADCONF_REGISTERS_BASE 0x48002000
+#define PADCONF_REGISTERS_OFFSET 0x0030
+#define PADCONF_REGISTERS_SIZE 0x1000 /* OFFSET + highest reg, rounded up */
 #endif
 
 #define PADCONF_MUXMODE(X)  (X & 0x7)  /* mode 1 til 7 [2:0] */
@@ -314,8 +322,4 @@
 #define CONTROL_CONF_PUDEN (1<<3)
 #define CONTROL_CONF_MUXMODE(X) (X&0x7)
 
-int padconf_init(void);
-int padconf_set(u32_t padconf, u32_t mask, u32_t value);
-int padconf_release(void);
-
-#endif /* __PADCONF_H__ */
+#endif /* __MINIX_PADCONF_H */

diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 86379009137f34a4fe7553d82fc71ed926c43db9..0d1a922da328e6a33cfc04b560f5495472f8f789 100644 (file)
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -215,6 +215,9 @@ int sys_out(int port, u32_t value, int type);
 #define sys_inl(p,v)   sys_in((p), (v), _DIO_LONG)
 int sys_in(int port, u32_t *value, int type);
 
+/* arm pinmux */
+int sys_padconf(u32_t padconf, u32_t mask, u32_t value);
+
 /* pci.c */
 void pci_init(void);
 int pci_first_dev(int *devindp, u16_t *vidp, u16_t *didp);

diff --git a/kernel/arch/earm/arch_system.c b/kernel/arch/earm/arch_system.c
index 5fc345126dda70a0f9cfab36996e8370efa7a8eb..1bb48a9d646d91af03cd3c3ca6ba3886467eea7d 100644 (file)
--- a/kernel/arch/earm/arch_system.c
+++ b/kernel/arch/earm/arch_system.c
@@ -128,8 +128,8 @@ void arch_init(void)
         value = OMAP_PMUSERENR_EN;
         asm volatile ("MCR p15, 0, %0, c9, c14, 0\t\n": : "r" (value));
 
-       /* configure i2c pinmux */
-       omap3_padconf_init();
+       /* map memory for padconf */
+       arch_padconf_init();
 
        /* map memory for rtc */
        omap3_rtc_init();

diff --git a/kernel/arch/earm/omap_padconf.c b/kernel/arch/earm/omap_padconf.c
index cb87e866f7822ea73f8c71a33c65a52f92722093..cb67cac954b1e4e792c2fa94d87fb21b11f81e75 100644 (file)
--- a/kernel/arch/earm/omap_padconf.c
+++ b/kernel/arch/earm/omap_padconf.c
@@ -1,14 +1,11 @@
-/* temporary padconf work-around
- *
- * pinmux must be configured in privileged mode on the Cortex-A8. This code
- * does a simple static configuration of a few pins. It's only here until
- * a proper padconf server that does kernel calls can be developed.
- */
+/* Implements sys_padconf() for the AM335X and DM37XX. */
 
 #include "kernel/kernel.h"
+#include "arch_proto.h"
 #include <sys/types.h>
 #include <machine/cpu.h>
 #include <minix/mmio.h>
+#include <minix/padconf.h>
 #include <assert.h>
 #include <io.h>
 #include <stdlib.h>
@@ -16,47 +13,39 @@
 
 #include "omap_padconf.h"
 
-u32_t base = PADCONF_REGISTERS_BASE;
+struct omap_padconf
+{
+       vir_bytes base;
+       vir_bytes offset;
+       vir_bytes size;
+};
+
+static struct omap_padconf omap_padconf = {
+       .base = PADCONF_REGISTERS_BASE,
+       .offset = PADCONF_REGISTERS_OFFSET,
+       .size = PADCONF_REGISTERS_SIZE
+};
 
-static int kernel_padconf_set(u32_t padconf, u32_t mask, u32_t value);
+static kern_phys_map padconf_phys_map;
 
-static int
-kernel_padconf_set(u32_t padconf, u32_t mask, u32_t value)
+int
+arch_padconf_set(u32_t padconf, u32_t mask, u32_t value)
 {
-       assert(padconf <= CONTROL_CONF_USB1_DRVVBUS);
-       set32(base + padconf, mask, value);
+       /* check that the value will be inside the padconf memory range */
+       if (padconf >= (PADCONF_REGISTERS_SIZE - PADCONF_REGISTERS_OFFSET)) {
+               return EINVAL;  /* outside of valid range */
+       }
+
+       set32(padconf + omap_padconf.base + omap_padconf.offset, mask, value);
+
        return OK;
 }
 
 void
-omap3_padconf_init(void)
+arch_padconf_init(void)
 {
+       kern_phys_map_ptr(omap_padconf.base, omap_padconf.size,
+           &padconf_phys_map, &omap_padconf.base);
 
-#ifdef AM335X
-
-       u32_t pinopts, value;
-
-       /* Common options for BeagleBone I2C Pins */
-       pinopts = CONTROL_CONF_SLEWCTRL | CONTROL_CONF_RXACTIVE |
-           CONTROL_CONF_PUTYPESEL;
-
-       /* I2C0 */
-       value = pinopts | CONTROL_CONF_MUXMODE(0);
-       kernel_padconf_set(CONTROL_CONF_I2C0_SDA, 0xffffffff, value);
-       kernel_padconf_set(CONTROL_CONF_I2C0_SCL, 0xffffffff, value);
-
-       /* I2C1 */
-       value = pinopts | CONTROL_CONF_MUXMODE(2);
-       kernel_padconf_set(CONTROL_CONF_SPI0_CS0, 0xffffffff, value);
-       kernel_padconf_set(CONTROL_CONF_SPI0_D1, 0xffffffff, value);
-
-       /* I2C2 */
-       value = pinopts | CONTROL_CONF_MUXMODE(3);
-       kernel_padconf_set(CONTROL_CONF_UART1_CTSN, 0xffffffff, value);
-       kernel_padconf_set(CONTROL_CONF_UART1_RTSN, 0xffffffff, value);
-
-#endif
-
-       /* nothing to do for DM37XX */
        return;
 }

diff --git a/kernel/arch/earm/omap_padconf.h b/kernel/arch/earm/omap_padconf.h
index 0d04971dfd6554de823efc4d76416ca36af8cda3..db1081ea3697e9f1e97ab15032cf37b180a2480b 100644 (file)
--- a/kernel/arch/earm/omap_padconf.h
+++ b/kernel/arch/earm/omap_padconf.h
@@ -1,11 +1,10 @@
 #ifndef _OMAP_PADCONF_H
 #define _OMAP_PADCONF_H
 
-#include "omap_padconf_registers.h"
-
 #ifndef __ASSEMBLY__
 
-void omap3_padconf_init(void);
+void arch_padconf_init(void);
+int arch_padconf_set(u32_t padconf, u32_t mask, u32_t value);
 
 #endif /* __ASSEMBLY__ */
 

diff --git a/kernel/arch/earm/omap_padconf_registers.h b/kernel/arch/earm/omap_padconf_registers.h
deleted file mode 100644 (file)
index 2045de0..0000000
--- a/kernel/arch/earm/omap_padconf_registers.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef __OMAP_PADCONF_REGISTERS_H
-#define __OMAP_PADCONF_REGISTERS_H
-
-#ifdef AM335X
-#define PADCONF_REGISTERS_BASE 0x44E10000
-#elif DM37XX
-#define PADCONF_REGISTERS_BASE 0x48002030
-#endif
-
-#define PADCONF_MUXMODE(X)  (X & 0x7)  /* mode 1 til 7 [2:0] */
-#define PADCONF_PULL_MODE(X)  ((X & 0x3) << 3) /* 2 bits[4:3] */
-#define PADCONF_PULL_MODE_PD_DIS PADCONF_PULL_MODE(0)  /* pull down disabled */
-#define PADCONF_PULL_MODE_PD_EN PADCONF_PULL_MODE(1)   /* pull down enabled */
-#define PADCONF_PULL_MODE_PU_DIS PADCONF_PULL_MODE(2)  /* pull up disabled */
-#define PADCONF_PULL_MODE_PU_EN PADCONF_PULL_MODE(3)   /* pull up enabled */
-#define PADCONF_INPUT_ENABLE(X)  ((X & 0x1) << 8)      /* 1 bits[8] */
-#define PADCONF_OFF_MODE(X)  ((X & 0xFE) << 9) /* 5 bits[13:9] */
-
-/* padconf pin definitions */
-#define CONTROL_PADCONF_SDRC_D0 (0x00000000)
-#define CONTROL_PADCONF_SDRC_D2 (0x00000004)
-#define CONTROL_PADCONF_SDRC_D4 (0x00000008)
-#define CONTROL_PADCONF_SDRC_D6 (0x0000000C)
-#define CONTROL_PADCONF_SDRC_D8 (0x00000010)
-#define CONTROL_PADCONF_SDRC_D10 (0x00000014)
-#define CONTROL_PADCONF_SDRC_D12 (0x00000018)
-#define CONTROL_PADCONF_SDRC_D14 (0x0000001C)
-#define CONTROL_PADCONF_SDRC_D16 (0x00000020)
-#define CONTROL_PADCONF_SDRC_D18 (0x00000024)
-#define CONTROL_PADCONF_SDRC_D20 (0x00000028)
-#define CONTROL_PADCONF_SDRC_D22 (0x0000002C)
-#define CONTROL_PADCONF_SDRC_D24 (0x00000030)
-#define CONTROL_PADCONF_SDRC_D26 (0x00000034)
-#define CONTROL_PADCONF_SDRC_D28 (0x00000038)
-#define CONTROL_PADCONF_SDRC_D30 (0x0000003C)
-#define CONTROL_PADCONF_SDRC_CLK (0x00000040)
-#define CONTROL_PADCONF_SDRC_DQS1 (0x00000044)
-#define CONTROL_PADCONF_SDRC_DQS3 (0x00000048)
-#define CONTROL_PADCONF_GPMC_A2 (0x0000004C)
-#define CONTROL_PADCONF_GPMC_A4 (0x00000050)
-#define CONTROL_PADCONF_GPMC_A6 (0x00000054)
-#define CONTROL_PADCONF_GPMC_A8 (0x00000058)
-#define CONTROL_PADCONF_GPMC_A10 (0x0000005C)
-#define CONTROL_PADCONF_GPMC_D1 (0x00000060)
-#define CONTROL_PADCONF_GPMC_D3 (0x00000064)
-#define CONTROL_PADCONF_GPMC_D5 (0x00000068)
-#define CONTROL_PADCONF_GPMC_D7 (0x0000006C)
-#define CONTROL_PADCONF_GPMC_D9 (0x00000070)
-#define CONTROL_PADCONF_GPMC_D11 (0x00000074)
-#define CONTROL_PADCONF_GPMC_D13 (0x00000078)
-#define CONTROL_PADCONF_GPMC_D15 (0x0000007C)
-#define CONTROL_PADCONF_GPMC_NCS1 (0x00000080)
-#define CONTROL_PADCONF_GPMC_NCS3 (0x00000084)
-#define CONTROL_PADCONF_GPMC_NCS5 (0x00000088)
-#define CONTROL_PADCONF_GPMC_NCS7 (0x0000008C)
-#define CONTROL_PADCONF_GPMC_NADV_ALE (0x00000090)
-#define CONTROL_PADCONF_GPMC_NWE (0x00000094)
-#define CONTROL_PADCONF_GPMC_NBE1 (0x00000098)
-#define CONTROL_PADCONF_GPMC_WAIT0 (0x0000009C)
-#define CONTROL_PADCONF_GPMC_WAIT2 (0x000000A0)
-#define CONTROL_PADCONF_DSS_PCLK (0x000000A4)
-#define CONTROL_PADCONF_DSS_VSYNC (0x000000A8)
-#define CONTROL_PADCONF_DSS_DATA0 (0x000000AC)
-#define CONTROL_PADCONF_DSS_DATA2 (0x000000B0)
-#define CONTROL_PADCONF_DSS_DATA4 (0x000000B4)
-#define CONTROL_PADCONF_DSS_DATA6 (0x000000B8)
-#define CONTROL_PADCONF_DSS_DATA8 (0x000000BC)
-#define CONTROL_PADCONF_DSS_DATA10 (0x000000C0)
-#define CONTROL_PADCONF_DSS_DATA12 (0x000000C4)
-#define CONTROL_PADCONF_DSS_DATA14 (0x000000C8)
-#define CONTROL_PADCONF_DSS_DATA16 (0x000000CC)
-#define CONTROL_PADCONF_DSS_DATA18 (0x000000D0)
-#define CONTROL_PADCONF_DSS_DATA20 (0x000000D4)
-#define CONTROL_PADCONF_DSS_DATA22 (0x000000D8)
-#define CONTROL_PADCONF_CAM_HS (0x000000DC)
-#define CONTROL_PADCONF_CAM_XCLKA (0x000000E0)
-#define CONTROL_PADCONF_CAM_FLD (0x000000E4)
-#define CONTROL_PADCONF_CAM_D1 (0x000000E8)
-#define CONTROL_PADCONF_CAM_D3 (0x000000EC)
-#define CONTROL_PADCONF_CAM_D5 (0x000000F0)
-#define CONTROL_PADCONF_CAM_D7 (0x000000F4)
-#define CONTROL_PADCONF_CAM_D9 (0x000000F8)
-#define CONTROL_PADCONF_CAM_D11 (0x000000FC)
-#define CONTROL_PADCONF_CAM_WEN (0x00000100)
-#define CONTROL_PADCONF_CSI2_DX0 (0x00000104)
-#define CONTROL_PADCONF_CSI2_DX1 (0x00000108)
-#define CONTROL_PADCONF_MCBSP2_FSX (0x0000010C)
-#define CONTROL_PADCONF_MCBSP2_DR (0x00000110)
-#define CONTROL_PADCONF_MMC1_CLK (0x00000114)
-#define CONTROL_PADCONF_MMC1_DAT0 (0x00000118)
-#define CONTROL_PADCONF_MMC1_DAT2 (0x0000011C)
-#define CONTROL_PADCONF_MMC2_CLK (0x00000128)
-#define CONTROL_PADCONF_MMC2_DAT0 (0x0000012C)
-#define CONTROL_PADCONF_MMC2_DAT2 (0x00000130)
-#define CONTROL_PADCONF_MMC2_DAT4 (0x00000134)
-#define CONTROL_PADCONF_MMC2_DAT6 (0x00000138)
-#define CONTROL_PADCONF_MCBSP3_DX (0x0000013C)
-#define CONTROL_PADCONF_MCBSP3_CLKX (0x00000140)
-#define CONTROL_PADCONF_UART2_CTS (0x00000144)
-#define CONTROL_PADCONF_UART2_TX (0x00000148)
-#define CONTROL_PADCONF_UART1_TX (0x0000014C)
-#define CONTROL_PADCONF_UART1_CTS (0x00000150)
-#define CONTROL_PADCONF_MCBSP4_CLKX (0x00000154)
-#define CONTROL_PADCONF_MCBSP4_DX (0x00000158)
-#define CONTROL_PADCONF_MCBSP1_CLKR (0x0000015C)
-#define CONTROL_PADCONF_MCBSP1_DX (0x00000160)
-#define CONTROL_PADCONF_MCBSP_CLKS (0x00000164)
-#define CONTROL_PADCONF_MCBSP1_CLKX (0x00000168)
-#define CONTROL_PADCONF_UART3_RTS_SD (0x0000016C)
-#define CONTROL_PADCONF_UART3_TX_IRTX (0x00000170)
-#define CONTROL_PADCONF_HSUSB0_STP (0x00000174)
-#define CONTROL_PADCONF_HSUSB0_NXT (0x00000178)
-#define CONTROL_PADCONF_HSUSB0_DATA1 (0x0000017C)
-#define CONTROL_PADCONF_HSUSB0_DATA3 (0x00000180)
-#define CONTROL_PADCONF_HSUSB0_DATA5 (0x00000184)
-#define CONTROL_PADCONF_HSUSB0_DATA7 (0x00000188)
-#define CONTROL_PADCONF_I2C1_SDA (0x0000018C)
-#define CONTROL_PADCONF_I2C2_SDA (0x00000190)
-#define CONTROL_PADCONF_I2C3_SDA (0x00000194)
-#define CONTROL_PADCONF_MCSPI1_CLK (0x00000198)
-#define CONTROL_PADCONF_MCSPI1_SOMI (0x0000019C)
-#define CONTROL_PADCONF_MCSPI1_CS1 (0x000001A0)
-#define CONTROL_PADCONF_MCSPI1_CS3 (0x000001A4)
-#define CONTROL_PADCONF_MCSPI2_SIMO (0x000001A8)
-#define CONTROL_PADCONF_MCSPI2_CS0 (0x000001AC)
-#define CONTROL_PADCONF_SYS_NIRQ (0x000001B0)
-#define CONTROL_PADCONF_SAD2D_MCAD0 (0x000001B4)
-#define CONTROL_PADCONF_SAD2D_MCAD2 (0x000001B8)
-#define CONTROL_PADCONF_SAD2D_MCAD4 (0x000001BC)
-#define CONTROL_PADCONF_SAD2D_MCAD6 (0x000001C0)
-#define CONTROL_PADCONF_SAD2D_MCAD8 (0x000001C4)
-#define CONTROL_PADCONF_SAD2D_MCAD10 (0x000001C8)
-#define CONTROL_PADCONF_SAD2D_MCAD12 (0x000001CC)
-#define CONTROL_PADCONF_SAD2D_MCAD14 (0x000001D0)
-#define CONTROL_PADCONF_SAD2D_MCAD16 (0x000001D4)
-#define CONTROL_PADCONF_SAD2D_MCAD18 (0x000001D8)
-#define CONTROL_PADCONF_SAD2D_MCAD20 (0x000001DC)
-#define CONTROL_PADCONF_SAD2D_MCAD22 (0x000001E0)
-#define CONTROL_PADCONF_SAD2D_MCAD24 (0x000001E4)
-#define CONTROL_PADCONF_SAD2D_MCAD26 (0x000001E8)
-#define CONTROL_PADCONF_SAD2D_MCAD28 (0x000001EC)
-#define CONTROL_PADCONF_SAD2D_MCAD30 (0x000001F0)
-#define CONTROL_PADCONF_SAD2D_MCAD32 (0x000001F4)
-#define CONTROL_PADCONF_SAD2D_MCAD34 (0x000001F8)
-#define CONTROL_PADCONF_SAD2D_MCAD36 (0x000001FC)
-#define CONTROL_PADCONF_SAD2D_NRESPWRON (0x00000200)
-#define CONTROL_PADCONF_SAD2D_ARMNIRQ (0x00000204)
-#define CONTROL_PADCONF_SAD2D_SPINT (0x00000208)
-#define CONTROL_PADCONF_SAD2D_DMAREQ0 (0x0000020C)
-#define CONTROL_PADCONF_SAD2D_DMAREQ2 (0x00000210)
-#define CONTROL_PADCONF_SAD2D_NTRST (0x00000214)
-#define CONTROL_PADCONF_SAD2D_TDO (0x00000218)
-#define CONTROL_PADCONF_SAD2D_TCK (0x0000021C)
-#define CONTROL_PADCONF_SAD2D_MSTDBY (0x00000220)
-#define CONTROL_PADCONF_SAD2D_IDLEACK (0x00000224)
-#define CONTROL_PADCONF_SAD2D_SWRITE (0x00000228)
-#define CONTROL_PADCONF_SAD2D_SREAD (0x0000022C)
-#define CONTROL_PADCONF_SAD2D_SBUSFLAG (0x00000230)
-#define CONTROL_PADCONF_SDRC_CKE1 (0x00000234)
-#define CONTROL_PADCONF_SDRC_BA0 (0x00000570)
-#define CONTROL_PADCONF_SDRC_A0 (0x00000574)
-#define CONTROL_PADCONF_SDRC_A2 (0x00000578)
-#define CONTROL_PADCONF_SDRC_A4 (0x0000057C)
-#define CONTROL_PADCONF_SDRC_A6 (0x00000580)
-#define CONTROL_PADCONF_SDRC_A8 (0x00000584)
-#define CONTROL_PADCONF_SDRC_A10 (0x00000588)
-#define CONTROL_PADCONF_SDRC_A12 (0x0000058C)
-#define CONTROL_PADCONF_SDRC_A14 (0x00000590)
-#define CONTROL_PADCONF_SDRC_NCS1 (0x00000594)
-#define CONTROL_PADCONF_SDRC_NRAS (0x00000598)
-#define CONTROL_PADCONF_SDRC_NWE (0x0000059C)
-#define CONTROL_PADCONF_SDRC_DM1 (0x000005A0)
-#define CONTROL_PADCONF_SDRC_DM3 (0x000005A4)
-#define CONTROL_PADCONF_ETK_CLK (0x000005A8)
-#define CONTROL_PADCONF_ETK_D0 (0x000005AC)
-#define CONTROL_PADCONF_ETK_D2 (0x000005B0)
-#define CONTROL_PADCONF_ETK_D4 (0x000005B4)
-#define CONTROL_PADCONF_ETK_D6 (0x000005B8)
-#define CONTROL_PADCONF_ETK_D8 (0x000005BC)
-#define CONTROL_PADCONF_ETK_D10 (0x000005C0)
-#define CONTROL_PADCONF_ETK_D12 (0x000005C4)
-#define CONTROL_PADCONF_ETK_D14 (0x000005C8)
-
-/* conf pin descriptions (am335x) */
-#define CONTROL_CONF_GPMC_AD0 (0x00000800)
-#define CONTROL_CONF_GPMC_AD1 (0x00000804)
-#define CONTROL_CONF_GPMC_AD2 (0x00000808)
-#define CONTROL_CONF_GPMC_AD3 (0x0000080C)
-#define CONTROL_CONF_GPMC_AD4 (0x00000810)
-#define CONTROL_CONF_GPMC_AD5 (0x00000814)
-#define CONTROL_CONF_GPMC_AD6 (0x00000818)
-#define CONTROL_CONF_GPMC_AD7 (0x0000081C)
-#define CONTROL_CONF_GPMC_AD8 (0x00000820)
-#define CONTROL_CONF_GPMC_AD9 (0x00000824)
-#define CONTROL_CONF_GPMC_AD10 (0x00000828)
-#define CONTROL_CONF_GPMC_AD11 (0x0000082C)
-#define CONTROL_CONF_GPMC_AD12 (0x00000830)
-#define CONTROL_CONF_GPMC_AD13 (0x00000834)
-#define CONTROL_CONF_GPMC_AD14 (0x00000838)
-#define CONTROL_CONF_GPMC_AD15 (0x0000083C)
-#define CONTROL_CONF_GPMC_A0 (0x00000840)
-#define CONTROL_CONF_GPMC_A1 (0x00000844)
-#define CONTROL_CONF_GPMC_A2 (0x00000848)
-#define CONTROL_CONF_GPMC_A3 (0x0000084C)
-#define CONTROL_CONF_GPMC_A4 (0x00000850)
-#define CONTROL_CONF_GPMC_A5 (0x00000854)
-#define CONTROL_CONF_GPMC_A6 (0x00000858)
-#define CONTROL_CONF_GPMC_A7 (0x0000085C)
-#define CONTROL_CONF_GPMC_A8 (0x00000860)
-#define CONTROL_CONF_GPMC_A9 (0x00000864)
-#define CONTROL_CONF_GPMC_A10 (0x00000868)
-#define CONTROL_CONF_GPMC_A11 (0x0000086C)
-#define CONTROL_CONF_GPMC_WAIT0 (0x00000870)
-#define CONTROL_CONF_GPMC_WPN (0x00000874)
-#define CONTROL_CONF_GPMC_BEN1 (0x00000878)
-#define CONTROL_CONF_GPMC_CSN0 (0x0000087C)
-#define CONTROL_CONF_GPMC_CSN1 (0x00000880)
-#define CONTROL_CONF_GPMC_CSN2 (0x00000884)
-#define CONTROL_CONF_GPMC_CSN3 (0x00000888)
-#define CONTROL_CONF_GPMC_CLK (0x0000088C)
-#define CONTROL_CONF_GPMC_ADVN_ALE (0x00000890)
-#define CONTROL_CONF_GPMC_OEN_REN (0x00000894)
-#define CONTROL_CONF_GPMC_WEN (0x00000898)
-#define CONTROL_CONF_GPMC_BEN0_CLE (0x0000089C)
-#define CONTROL_CONF_LCD_DATA0 (0x000008A0)
-#define CONTROL_CONF_LCD_DATA1 (0x000008A4)
-#define CONTROL_CONF_LCD_DATA2 (0x000008A8)
-#define CONTROL_CONF_LCD_DATA3 (0x000008AC)
-#define CONTROL_CONF_LCD_DATA4 (0x000008B0)
-#define CONTROL_CONF_LCD_DATA5 (0x000008B4)
-#define CONTROL_CONF_LCD_DATA6 (0x000008B8)
-#define CONTROL_CONF_LCD_DATA7 (0x000008BC)
-#define CONTROL_CONF_LCD_DATA8 (0x000008C0)
-#define CONTROL_CONF_LCD_DATA9 (0x000008C4)
-#define CONTROL_CONF_LCD_DATA10 (0x000008C8)
-#define CONTROL_CONF_LCD_DATA11 (0x000008CC)
-#define CONTROL_CONF_LCD_DATA12 (0x000008D0)
-#define CONTROL_CONF_LCD_DATA13 (0x000008D4)
-#define CONTROL_CONF_LCD_DATA14 (0x000008D8)
-#define CONTROL_CONF_LCD_DATA15 (0x000008DC)
-#define CONTROL_CONF_LCD_VSYNC (0x000008E0)
-#define CONTROL_CONF_LCD_HSYNC (0x000008E4)
-#define CONTROL_CONF_LCD_PCLK (0x000008E8)
-#define CONTROL_CONF_LCD_AC_BIAS_EN (0x000008EC)
-#define CONTROL_CONF_MMC0_DAT3 (0x000008F0)
-#define CONTROL_CONF_MMC0_DAT2 (0x000008F4)
-#define CONTROL_CONF_MMC0_DAT1 (0x000008F8)
-#define CONTROL_CONF_MMC0_DAT0 (0x000008FC)
-#define CONTROL_CONF_MMC0_CLK (0x00000900)
-#define CONTROL_CONF_MMC0_CMD (0x00000904)
-#define CONTROL_CONF_MII1_COL (0x00000908)
-#define CONTROL_CONF_MII1_CRS (0x0000090C)
-#define CONTROL_CONF_MII1_RX_ER (0x00000910)
-#define CONTROL_CONF_MII1_TX_EN (0x00000914)
-#define CONTROL_CONF_MII1_RX_DV (0x00000918)
-#define CONTROL_CONF_MII1_TXD3 (0x0000091C)
-#define CONTROL_CONF_MII1_TXD2 (0x00000920)
-#define CONTROL_CONF_MII1_TXD1 (0x00000924)
-#define CONTROL_CONF_MII1_TXD0 (0x00000928)
-#define CONTROL_CONF_MII1_TX_CLK (0x0000092C)
-#define CONTROL_CONF_MII1_RX_CLK (0x00000930)
-#define CONTROL_CONF_MII1_RXD3 (0x00000934)
-#define CONTROL_CONF_MII1_RXD2 (0x00000938)
-#define CONTROL_CONF_MII1_RXD1 (0x0000093C)
-#define CONTROL_CONF_MII1_RXD0 (0x00000940)
-#define CONTROL_CONF_RMII1_REF_CLK (0x00000944)
-#define CONTROL_CONF_MDIO (0x00000948)
-#define CONTROL_CONF_MDC (0x0000094C)
-#define CONTROL_CONF_SPI0_SCLK (0x00000950)
-#define CONTROL_CONF_SPI0_D0 (0x00000954)
-#define CONTROL_CONF_SPI0_D1 (0x00000958)
-#define CONTROL_CONF_SPI0_CS0 (0x0000095C)
-#define CONTROL_CONF_SPI0_CS1 (0x00000960)
-#define CONTROL_CONF_ECAP0_IN_PWM0_OUT (0x00000964)
-#define CONTROL_CONF_UART0_CTSN (0x00000968)
-#define CONTROL_CONF_UART0_RTSN (0x0000096C)
-#define CONTROL_CONF_UART0_RXD (0x00000970)
-#define CONTROL_CONF_UART0_TXD (0x00000974)
-#define CONTROL_CONF_UART1_CTSN (0x00000978)
-#define CONTROL_CONF_UART1_RTSN (0x0000097C)
-#define CONTROL_CONF_UART1_RXD (0x00000980)
-#define CONTROL_CONF_UART1_TXD (0x00000984)
-#define CONTROL_CONF_I2C0_SDA (0x00000988)
-#define CONTROL_CONF_I2C0_SCL (0x0000098C)
-#define CONTROL_CONF_MCASP0_ACLKX (0x00000990)
-#define CONTROL_CONF_MCASP0_FSX (0x00000994)
-#define CONTROL_CONF_MCASP0_AXR0 (0x00000998)
-#define CONTROL_CONF_MCASP0_AHCLKR (0x0000099C)
-#define CONTROL_CONF_MCASP0_ACLKR (0x000009A0)
-#define CONTROL_CONF_MCASP0_FSR (0x000009A4)
-#define CONTROL_CONF_MCASP0_AXR1 (0x000009A8)
-#define CONTROL_CONF_MCASP0_AHCLKX (0x000009AC)
-#define CONTROL_CONF_XDMA_EVENT_INTR0 (0x000009B0)
-#define CONTROL_CONF_XDMA_EVENT_INTR1 (0x000009B4)
-#define CONTROL_CONF_WARMRSTN (0x000009B8)
-#define CONTROL_CONF_NNMI (0x000009C0)
-#define CONTROL_CONF_TMS (0x000009D0)
-#define CONTROL_CONF_TDI (0x000009D4)
-#define CONTROL_CONF_TDO (0x000009D8)
-#define CONTROL_CONF_TCK (0x000009DC)
-#define CONTROL_CONF_TRSTN (0x000009E0)
-#define CONTROL_CONF_EMU0 (0x000009E4)
-#define CONTROL_CONF_EMU1 (0x000009E8)
-#define CONTROL_CONF_RTC_PWRONRSTN (0x000009F8)
-#define CONTROL_CONF_PMIC_POWER_EN (0x000009FC)
-#define CONTROL_CONF_EXT_WAKEUP (0x00000A00)
-#define CONTROL_CONF_RTC_KALDO_ENN (0x00000A04)
-#define CONTROL_CONF_USB0_DRVVBUS (0x00000A1C)
-#define CONTROL_CONF_USB1_DRVVBUS (0x00000A34)
-
-#define CONTROL_CONF_SLEWCTRL (1<<6)
-#define CONTROL_CONF_RXACTIVE (1<<5)
-#define CONTROL_CONF_PUTYPESEL (1<<4)
-#define CONTROL_CONF_PUDEN (1<<3)
-#define CONTROL_CONF_MUXMODE(X) (X&0x7)
-
-#endif /* __PADCONF_H__ */

diff --git a/kernel/config.h b/kernel/config.h
index 55c24a09f44a79ea07850b873a98e23fa8a53c3f..56cfb7463c9368a240ff861fa1afb307591fa82f 100644 (file)
--- a/kernel/config.h
+++ b/kernel/config.h
@@ -43,6 +43,10 @@
 #define USE_MEMSET        1    /* write char to a given memory area */
 #define USE_RUNCTL         1   /* control stop flags of a process */
 
+#if defined(__arm__)
+#define USE_PADCONF        1   /* configure pinmux */
+#endif /* __arm__ */
+
 /* This section contains defines for valuable system resources that are used
  * by device drivers. The number of elements of the vectors is determined by 
  * the maximum needed by any given driver. The number of interrupt hooks may

diff --git a/kernel/system.c b/kernel/system.c
index 423b353b17982d0eb93b43c345385c8e359aa704..3f2705ded7b1c5c50455e4768363d831485d2529 100644 (file)
--- a/kernel/system.c
+++ b/kernel/system.c
@@ -248,6 +248,11 @@ void system_init(void)
   map(SYS_CPROF, do_cprofile);         /* get/reset call profiling data */
   map(SYS_PROFBUF, do_profbuf);        /* announce locations to kernel */
 
+  /* arm-specific. */
+#if defined(__arm__)
+  map(SYS_PADCONF, do_padconf);                /* configure pinmux */
+#endif
+
   /* i386-specific. */
 #if defined(__i386__)
   map(SYS_READBIOS, do_readbios);      /* read from BIOS locations */

diff --git a/kernel/system.h b/kernel/system.h
index 9f493ab6ff1a968043a39887c3ebbad251f8fb0d..d7bd99b6b584a449916aa0f989a14b8a0261a2d7 100644 (file)
--- a/kernel/system.h
+++ b/kernel/system.h
@@ -208,5 +208,10 @@ int do_statectl(struct proc * caller, message *m_ptr);
 #define do_statectl NULL
 #endif
 
+int do_padconf(struct proc * caller, message *m_ptr);
+#if ! USE_PADCONF
+#define do_padconf NULL
+#endif
+
 #endif /* SYSTEM_H */
 

diff --git a/kernel/system/Makefile.inc b/kernel/system/Makefile.inc
index e90b476402b13f8a067f77adc1b62c169f7faab9..627e28cab8748eb9c745d9ca104f7af960e4ddc2 100644 (file)
--- a/kernel/system/Makefile.inc
+++ b/kernel/system/Makefile.inc
@@ -40,6 +40,11 @@ SRCS+=       \
        do_schedctl.c \
        do_statectl.c
 
+.if ${MACHINE_ARCH} == "earm"
+SRCS+= \
+       do_padconf.c
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=  \
        do_devio.c \

diff --git a/kernel/system/do_padconf.c b/kernel/system/do_padconf.c
new file mode 100644 (file)
index 0000000..544fa49
--- /dev/null
+++ b/kernel/system/do_padconf.c
@@ -0,0 +1,20 @@
+#include "kernel/system.h"
+#include <minix/endpoint.h>
+
+#if USE_PADCONF
+
+/* get arch specific arch_padconf_set() */
+#if defined(AM335X) || defined(DM37XX)
+#include "omap_padconf.h"
+#endif
+
+/*===========================================================================*
+ *                                do_padconf                                 *
+ *===========================================================================*/
+int do_padconf(struct proc *caller_ptr, message *m_ptr)
+{
+       return arch_padconf_set(m_ptr->PADCONF_PADCONF, m_ptr->PADCONF_MASK,
+           m_ptr->PADCONF_VALUE);
+}
+
+#endif /* USE_PADCONF */

diff --git a/lib/Makefile b/lib/Makefile
index d002f065be0d5496618913280b4c5a638329d617..acf1819ce42c53266f2d9fd2f3efc5ad2862d0ac 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -54,7 +54,7 @@ SUBDIR += libvassert libhgfs libvboxfs libvirtio
 .endif
 
 .if (${MACHINE_ARCH} == "earm")
-SUBDIR += libclkconf libgpio libi2cdriver libpadconf
+SUBDIR += libclkconf libgpio libi2cdriver
 .endif
 
 .if (${MKRUMP} != "no")

diff --git a/lib/libpadconf/Makefile b/lib/libpadconf/Makefile
deleted file mode 100644 (file)
index 1b9d5cb..0000000
--- a/lib/libpadconf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for libpadconf
-
-CPPFLAGS+= -D_SYSTEM
-
-LIB=   padconf
-
-SRCS=  \
-       padconf.c 
-
-WARNS?=        5
-
-.include <bsd.lib.mk>

diff --git a/lib/libpadconf/padconf.c b/lib/libpadconf/padconf.c
deleted file mode 100644 (file)
index ab01312..0000000
--- a/lib/libpadconf/padconf.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* kernel headers */
-#include <minix/syslib.h>
-#include <minix/drvlib.h>
-#include <minix/log.h>
-#include <minix/padconf.h>
-#include <minix/mmio.h>
-
-/* system headers */
-#include <sys/mman.h>
-#include <sys/types.h>
-
-/* usr headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-/* local headers */
-
-/* used for logging */
-static struct log log = {
-       .name = "omap_padconf",
-       .log_level = LEVEL_INFO,
-       .log_func = default_log
-};
-
-static u32_t base = 0;
-static u32_t use_count = 0;
-
-int
-padconf_init()
-{
-       struct minix_mem_range mr;
-
-       use_count++;
-
-       if (base != 0) {
-               /* when used in a library we can't guaranty we only call this
-                * method once */
-               log_trace(&log, "Called %d times\n", use_count);
-               return OK;
-       }
-
-       mr.mr_base = PADCONF_REGISTERS_BASE;
-       mr.mr_limit = PADCONF_REGISTERS_BASE + 0x1000;
-
-       if (sys_privctl(SELF, SYS_PRIV_ADD_MEM, &mr) != 0) {
-               log_warn(&log, "Unable to request permission to map memory\n");
-               return EPERM;
-       }
-
-       base =
-           (uint32_t) vm_map_phys(SELF, (void *) PADCONF_REGISTERS_BASE,
-           0x1000);
-
-       if (base == (uint32_t) MAP_FAILED) {
-               log_warn(&log, "Unable to map GPIO memory\n");
-               return EPERM;
-       }
-       return OK;
-}
-
-int
-padconf_set(u32_t padconf, u32_t mask, u32_t value)
-{
-       assert(padconf <= CONTROL_CONF_USB1_DRVVBUS);
-       set32(base + padconf, mask, value);
-       return OK;
-}
-
-int
-padconf_release()
-{
-       assert(use_count > 0);
-       use_count--;
-
-       if (use_count == 0) {
-               vm_unmap_phys(SELF, (void *) base, 0x1000);
-       }
-       base = 0;
-       return OK;
-}

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index ba949cbda3657e7c20dd1ce026b5ff2d2ce2d7f2..9b2ec3d369b4b2456b880b5d98b11ef18730bbea 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -49,6 +49,7 @@ SRCS+=  \
        sys_kill.c \
        sys_mcontext.c \
        sys_memset.c \
+       sys_padconf.c \
        sys_physcopy.c \
        sys_privctl.c \
        sys_profbuf.c \

diff --git a/lib/libsys/sys_padconf.c b/lib/libsys/sys_padconf.c
new file mode 100644 (file)
index 0000000..fbf8795
--- /dev/null
+++ b/lib/libsys/sys_padconf.c
@@ -0,0 +1,14 @@
+#include <stdint.h>
+
+#include "syslib.h"
+
+int sys_padconf(u32_t padconf, u32_t mask, u32_t value)
+{
+        message m;
+
+       m.PADCONF_PADCONF = padconf;
+       m.PADCONF_MASK = mask;
+       m.PADCONF_VALUE = value;
+
+        return(_kernel_call(SYS_PADCONF, &m));
+}