소스 검색

Revert "mcp23018: add return status to init (#18178)" (#18709)

This reverts commit 3fffa51554556edc9ca53bc04ef45abe87d3d3c9.
Joel Challis 2 년 전
부모
커밋
c63e2e378d
2개의 변경된 파일5개의 추가작업 그리고 11개의 파일을 삭제
  1. 4 10
      drivers/gpio/mcp23018.c
  2. 1 1
      drivers/gpio/mcp23018.h

+ 4 - 10
drivers/gpio/mcp23018.c

@@ -18,20 +18,14 @@ enum {
     CMD_GPIOB  = 0x13,
 };
 
-bool mcp23018_init(uint8_t slave_addr) {
+void mcp23018_init(uint8_t addr) {
     static uint8_t s_init = 0;
-    uint8_t        addr   = SLAVE_TO_ADDR(slave_addr);
-    if (0 == s_init) {
+    if (!s_init) {
         i2c_init();
-        wait_ms(100);
+        wait_ms(1000);
 
-        // probe that the expander is actually connected by reading from it
-        uint8_t data = 0;
-        if (I2C_STATUS_SUCCESS == i2c_readReg(addr, 0, &data, sizeof(data), 150)) {
-            s_init = 1;
-        }
+        s_init = 1;
     }
-    return (s_init > 0);
 }
 
 bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {

+ 1 - 1
drivers/gpio/mcp23018.h

@@ -33,7 +33,7 @@ enum {
 /**
  * Init expander and any other dependent drivers
  */
-bool mcp23018_init(uint8_t slave_addr);
+void mcp23018_init(uint8_t slave_addr);
 
 /**
  * Configure input/output to a given port