ssbi: Cleanup ssbi dependency from gpio_keypad
SSBI declarations were in the gpio_keypad files
resulting in needing to add gpio_keypad to use
ssbi for pmic functions.
Change-Id: Ic62a499a3cbd5fab9b8235e469b93103d207b20e
diff --git a/dev/keys/gpio_keypad.c b/dev/keys/gpio_keypad.c
index 0883c6a..f7a8673 100644
--- a/dev/keys/gpio_keypad.c
+++ b/dev/keys/gpio_keypad.c
@@ -38,6 +38,7 @@
#include <dev/keys.h>
#include <dev/gpio.h>
#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <kernel/event.h>
#include <kernel/timer.h>
#include <reg.h>
@@ -138,19 +139,6 @@
goto done;
}
-#if 0
- /* No keys are pressed, reenable interrupt */
- for (out = 0; out < kpinfo->noutputs; out++) {
- if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE)
- gpio_set(kpinfo->output_gpios[out], polarity);
- else
- gpio_config(kpinfo->output_gpios[out], polarity ? GPIO_OUTPUT : 0);
- }
- for (in = 0; in < kpinfo->ninputs; in++)
- enable_irq(gpio_to_irq(kpinfo->input_gpios[in]));
- return INT_RESCHEDULE;
-#endif
-
done:
return INT_RESCHEDULE;
}
@@ -194,221 +182,6 @@
event_wait(&keypad->full_scan);
}
-int i2c_ssbi_poll_for_device_ready(void)
-{
- unsigned long timeout = SSBI_TIMEOUT_US;
-
- while (!(readl(MSM_SSBI_BASE + SSBI2_STATUS) & SSBI_STATUS_READY)) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device ready function:Timeout, status %x\n", readl(MSM_SSBI_BASE + SSBI2_STATUS));
- return 1;
- }
- }
-
- return 0;
-}
-
-int i2c_ssbi_poll_for_read_completed(void)
-{
- unsigned long timeout = SSBI_TIMEOUT_US;
-
- while (!(readl(MSM_SSBI_BASE + SSBI2_STATUS) & SSBI_STATUS_RD_READY)) {
- if (--timeout == 0) {
- dprintf(INFO, "In read completed function:Timeout, status %x\n", readl(MSM_SSBI_BASE + SSBI2_STATUS));
- return 1;
- }
- }
-
- return 0;
-}
-
-int i2c_ssbi_read_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- int ret = 0;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned long read_cmd = SSBI_CMD_READ(addr);
- unsigned long mode2 = readl(MSM_SSBI_BASE + SSBI2_MODE2);
-
- //buf = alloc(len * sizeof(8));
- if (mode2 & SSBI_MODE2_SSBI2_MODE)
- writel(SSBI_MODE2_REG_ADDR_15_8(mode2, addr),
- MSM_SSBI_BASE + SSBI2_MODE2);
-
- while (len) {
- ret = i2c_ssbi_poll_for_device_ready();
- if (ret) {
- dprintf (CRITICAL, "Error: device not ready\n");
- return ret;
- }
-
- writel(read_cmd, MSM_SSBI_BASE + SSBI2_CMD);
-
- ret = i2c_ssbi_poll_for_read_completed();
- if (ret) {
- dprintf (CRITICAL, "Error: read not completed\n");
- return ret;
- }
-
- *buf++ = readl(MSM_SSBI_BASE + SSBI2_RD) & SSBI_RD_REG_DATA_MASK;
- len--;
- }
- return 0;
-}
-
-int i2c_ssbi_write_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- int ret = 0;
- unsigned long timeout = SSBI_TIMEOUT_US;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned long mode2 = readl(MSM_SSBI_BASE + SSBI2_MODE2);
-
- if (mode2 & SSBI_MODE2_SSBI2_MODE)
- writel(SSBI_MODE2_REG_ADDR_15_8(mode2, addr),
- MSM_SSBI_BASE + SSBI2_MODE2);
-
- while (len) {
- ret = i2c_ssbi_poll_for_device_ready();
- if (ret) {
- dprintf (CRITICAL, "Error: device not ready\n");
- return ret;
- }
-
- writel(SSBI_CMD_WRITE(addr, *buf++), MSM_SSBI_BASE + SSBI2_CMD);
-
- while (readl(MSM_SSBI_BASE + SSBI2_STATUS) & SSBI_STATUS_MCHN_BUSY) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device ready function:Timeout, status %x\n", readl(MSM_SSBI_BASE + SSBI2_STATUS));
- return 1;
- }
- }
- len--;
- }
- return 0;
-}
-
-int pa1_ssbi2_read_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- unsigned val = 0x0;
- unsigned temp = 0x0000;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned long timeout = SSBI_TIMEOUT_US;
-
- while(len)
- {
- val |= ((addr << PA1_SSBI2_REG_ADDR_SHIFT) |
- (PA1_SSBI2_CMD_READ << PA1_SSBI2_CMD_RDWRN_SHIFT));
- writel(val, PA1_SSBI2_CMD);
- while(!((temp = readl(PA1_SSBI2_RD_STATUS)) & (1 << PA1_SSBI2_TRANS_DONE_SHIFT))) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device ready function:Timeout\n");
- return 1;
- }
- }
- len--;
- *buf++ = (temp & (PA1_SSBI2_REG_DATA_MASK << PA1_SSBI2_REG_DATA_SHIFT));
- }
- return 0;
-}
-
-int pa1_ssbi2_write_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- unsigned val;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned temp = 0x00;
- unsigned char written_data1 = 0x00;
- unsigned long timeout = SSBI_TIMEOUT_US;
- //unsigned char written_data2 = 0x00;
-
- while(len)
- {
- temp = 0x00;
- written_data1 = 0x00;
- val = (addr << PA1_SSBI2_REG_ADDR_SHIFT) |
- (PA1_SSBI2_CMD_WRITE << PA1_SSBI2_CMD_RDWRN_SHIFT) |
- (*buf & 0xFF);
- writel(val, PA1_SSBI2_CMD);
- while(!((temp = readl(PA1_SSBI2_RD_STATUS)) & (1 << PA1_SSBI2_TRANS_DONE_SHIFT))) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device write function:Timeout\n");
- return 1;
- }
- }
- len--;
- buf++;
- }
- return 0;
-}
-
-int pa2_ssbi2_read_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- unsigned val = 0x0;
- unsigned temp = 0x0000;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned long timeout = SSBI_TIMEOUT_US;
-
- while(len)
- {
- val |= ((addr << PA2_SSBI2_REG_ADDR_SHIFT) |
- (PA2_SSBI2_CMD_READ << PA2_SSBI2_CMD_RDWRN_SHIFT));
- writel(val, PA2_SSBI2_CMD);
- while(!((temp = readl(PA2_SSBI2_RD_STATUS)) & (1 << PA2_SSBI2_TRANS_DONE_SHIFT))) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device ready function:Timeout\n");
- return 1;
- }
- }
- len--;
- *buf++ = (temp & (PA2_SSBI2_REG_DATA_MASK << PA2_SSBI2_REG_DATA_SHIFT));
- }
- return 0;
-}
-
-int pa2_ssbi2_write_bytes(unsigned char *buffer, unsigned short length,
- unsigned short slave_addr)
-{
- unsigned val;
- unsigned char *buf = buffer;
- unsigned short len = length;
- unsigned short addr = slave_addr;
- unsigned temp = 0x00;
- unsigned char written_data1 = 0x00;
- unsigned long timeout = SSBI_TIMEOUT_US;
-
- while(len)
- {
- temp = 0x00;
- written_data1 = 0x00;
- val = (addr << PA2_SSBI2_REG_ADDR_SHIFT) |
- (PA2_SSBI2_CMD_WRITE << PA2_SSBI2_CMD_RDWRN_SHIFT) |
- (*buf & 0xFF);
- writel(val, PA2_SSBI2_CMD);
- while(!((temp = readl(PA2_SSBI2_RD_STATUS)) & (1 << PA2_SSBI2_TRANS_DONE_SHIFT))) {
- if (--timeout == 0) {
- dprintf(INFO, "In Device write function:Timeout\n");
- return 1;
- }
- }
- len--;
- buf++;
- }
- return 0;
-}
-
int pm8058_gpio_config(int gpio, struct pm8058_gpio *param)
{
int rc;