i2c: disable pinmux initialisation

Signed-off-by: Bill Nguyen <bill.nguyen@student.unsw.edu.au>
au-ts · Sep 29, 2024 · 4ed7a11 · 4ed7a11
1 parent e417e8d
commit 4ed7a11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/drivers/i2c/meson/i2c.c b/drivers/i2c/meson/i2c.c
@@ -22,9 +22,7 @@
 #define IRQ_CH 1
 #define IRQ_TIMEOUT_CH 2
 
-#ifndef ENABLE_OVERRIDE_I2C_PINMUX_INIT_FROM_COMPILER
-# define DISABLE_I2C_PINMUX_INIT
-#endif
+#define DISABLE_I2C_PINMUX_INIT
 
 // #define DEBUG_DRIVER
 

diff --git a/examples/i2c/board/odroidc4/i2c.system b/examples/i2c/board/odroidc4/i2c.system
@@ -42,7 +42,7 @@
 
         <map mr="i2c_bus" vaddr="0x3_000_000" perms="rw" setvar_vaddr="i2c_regs" cached="false" />
 
-        <map mr="gpio" vaddr="0x3_100_000" perms="rw" setvar_vaddr="gpio_regs" cached="false" />
+        <!-- <map mr="gpio" vaddr="0x3_100_000" perms="rw" setvar_vaddr="gpio_regs" cached="false" /> -->
         <map mr="clk" vaddr="0x3_200_000" perms="rw" setvar_vaddr="clk_regs" cached="false" />
 
         <map mr="client_ds3231_data_region" vaddr="0x10_000_000" perms="rw" />

diff --git a/examples/i2c/i2c.mk b/examples/i2c/i2c.mk
@@ -56,11 +56,6 @@ CFLAGS += -I$(BOARD_DIR)/include \
 	-MD \
 	-MP
 
-# The I2C example should still be isolated so leave the pinmux initialisation as is.
-# Then it is up to the user if they want the pinmux driver or the i2c driver to do the
-# circuitry setup.
-CFLAGS+=-DENABLE_OVERRIDE_I2C_PINMUX_INIT_FROM_COMPILER
-
 COMMONFILES=libsddf_util_debug.a
 
 CLIENT_PN532_OBJS :=  pn532.o client_pn532.o