modify for wiringPi

BPI-SINOVOIP · Sep 15, 2015 · 7cd59c4 · 7cd59c4
1 parent 35c39fa
commit 7cd59c4
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 2,094 deletions.
diff --git a/linux-sunxi/arch/arm/configs/sun8iw6p1smp_bpi_defconfig b/linux-sunxi/arch/arm/configs/sun8iw6p1smp_bpi_defconfig
@@ -1218,8 +1218,8 @@ CONFIG_ATA_OVER_ETH=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-CONFIG_APDS9802ALS=y
-CONFIG_ISL29003=y
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
 # CONFIG_ISL29020 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_BH1780 is not set
@@ -1798,7 +1798,7 @@ CONFIG_SUNXI_TRANSFORM=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
 
@@ -1855,7 +1855,7 @@ CONFIG_SPI_SUNXI=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 

diff --git a/linux-sunxi/drivers/i2c/busses/i2c-sunxi.h b/linux-sunxi/drivers/i2c/busses/i2c-sunxi.h
@@ -212,9 +212,11 @@ Foscl is clock SCL;standard mode:100KHz or fast mode:400KHz
 
 /* Transfer speed. */
 
+/* bpi, change twi2 to 100K */
+#define SUNXI_TWI_SPEED_100K	(100000)
 #define SUNXI_TWI_SPEED_200K	(200000)
 #define SUNXI_TWI_SPEED_400K	(400000)
-#define SUNXI_TWI_SPEED(ch)	(ch == SUNXI_TP_CHAN ? SUNXI_TWI_SPEED_400K : SUNXI_TWI_SPEED_200K)
+#define SUNXI_TWI_SPEED(ch)	(ch == SUNXI_TP_CHAN ? SUNXI_TWI_SPEED_400K : SUNXI_TWI_SPEED_100K)  
 
 /* The IRQ number. */
 

diff --git a/linux-sunxi/drivers/spi/spi-sunxi.c b/linux-sunxi/drivers/spi/spi-sunxi.c
@@ -1692,9 +1692,9 @@ static int __devinit sunxi_spi_probe(struct platform_device *pdev)
 		goto err7;
 	}
 
-	SPI_INF("allwinners SoC SPI Driver loaded for Bus SPI-%d with %d Slaves at most\n",
+	pr_info("allwinners SoC SPI Driver loaded for Bus SPI-%d with %d Slaves at most\n",
             pdev->id, master->num_chipselect);
-	SPI_INF("[spi-%d]: driver probe succeed, base %p, irq %d!\n", master->bus_num, sspi->base_addr, sspi->irq);
+	pr_info("[spi-%d]: driver probe succeed, base %p, irq %d!\n", master->bus_num, sspi->base_addr, sspi->irq);
 	return 0;
 
 err7:
@@ -1966,7 +1966,7 @@ static int __init sunxi_spi_register_spidev(void)
     }
 	spidev_num = spi_dev_num.val;
 
-    SPI_INF("[spi]: Found %d spi devices in config files\n", spidev_num);
+    pr_info("[spi]: Found %d spi devices in config files\n", spidev_num);
 
     /* alloc spidev board information structure */
     spi_boards = (struct spi_board_info*)kzalloc(sizeof(struct spi_board_info) * spidev_num, GFP_KERNEL);
@@ -1975,7 +1975,7 @@ static int __init sunxi_spi_register_spidev(void)
         return -1;
     }
 
-    SPI_INF("%-16s %-16s %-16s %-8s %-4s %-4s\n", "boards_num", "modalias", "max_spd_hz", "bus_num", "cs", "mode");
+    pr_info("%-16s %-16s %-16s %-8s %-4s %-4s\n", "boards_num", "modalias", "max_spd_hz", "bus_num", "cs", "mode");
 
     for (i=0; i<spidev_num; i++) {
         board = &spi_boards[i];
@@ -2016,7 +2016,7 @@ static int __init sunxi_spi_register_spidev(void)
 		}
 		board->mode = temp_info.val;
 
-        SPI_INF("%-16d %-16s %-16d %-8d %-4d %-4d\n", i, board->modalias, board->max_speed_hz,
+        pr_info("%-16d %-16s %-16d %-8d %-4d %-4d\n", i, board->modalias, board->max_speed_hz,
                 board->bus_num, board->chip_select, board->mode);
     }
 

diff --git a/sunxi-pack/chips/sun8iw6p1/configs/BPI_M3_1080P/sys_config.fex b/sunxi-pack/chips/sun8iw6p1/configs/BPI_M3_1080P/sys_config.fex
@@ -346,9 +346,9 @@ twi_scl         = port:PH2<2><default><default><default>
 twi_sda         = port:PH3<2><default><default><default>
 
 [twi2]
-twi_used        = 0
-twi_scl         = port:PH4<2><default><default><default>
-twi_sda         = port:PH5<2><default><default><default>
+twi_used        = 1
+twi_scl         = port:PH4<2><1><default><default>
+twi_sda         = port:PH5<2><1><default><default>
 
 ;----------------------------------------------------------------------------------
 ;uart configuration
@@ -373,7 +373,7 @@ uart_cts        = port:PG09<2><1><default><default>
 uart_regulator	= "vcc-io"
 
 [uart2]
-uart_used       = 0
+uart_used       = 1
 uart_port       = 2
 uart_type       = 4
 uart_tx         = port:PB00<2><1><default><default>
@@ -383,7 +383,7 @@ uart_cts        = port:PB03<2><1><default><default>
 uart_regulator	= "vcc-io"
 
 [uart3]
-uart_used       = 0
+uart_used       = 1
 uart_port       = 3
 uart_type       = 4
 uart_tx         = port:PG10<3><1><default><default>
@@ -405,7 +405,7 @@ uart_regulator	= "vcc-io"
 ;SPI controller configuration
 ;----------------------------------------------------------------------------------
 [spi0]
-spi_used       = 0
+spi_used       = 1
 spi_cs_bitmap  = 1
 spi_mosi       = port:PC00<3><default><default><default>
 spi_miso       = port:PC01<3><default><default><default>
@@ -429,11 +429,13 @@ spi_regulator  = "vcc-io"
 spi_dev_num = 1
 
 [spi_board0]
-modalias      = "m25p32"
+modalias      = "spidev"
 max_speed_hz  = 33000000
 bus_num       = 0
 chip_select   = 0
-mode          = 0
+mode          = 3
+full_duplex   = 0
+manual_cs     = 0
 
 ;----------------------------------------------------------------------------------
 ;resistance tp configuration