d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r268973, r268977: Rename i.MX I2C driver file, enable it on imx6.

Browse Source
This commit is contained in:
ian 2014-10-26 02:40:34 +00:00
parent bb76782ad5
commit caa088c379
7 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/conf/IMX6
View File

@ -154,8 +154,8 @@ options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
# SoC-specific devices
device ffec # Freescale Fast Ethernet Controller
#device fsliic # Freescale i2c/iic (not ready yet)
#device iic # iic protocol
#device iicbus # iic bus
device fsliic # Freescale i2c/iic
device iic # iic protocol
device iicbus # iic bus
#device imxwdt # Watchdog. WARNING: can't be disabled!!!

2
sys/arm/freescale/imx/files.imx51
View File

@ -44,7 +44,7 @@ dev/usb/controller/ehci_imx.c optional ehci
arm/freescale/imx/imx_wdog.c optional imxwdt
# i2c
arm/freescale/imx/i2c.c optional fsliic
arm/freescale/imx/imx_i2c.c optional fsliic
# IPU - Image Processing Unit (frame buffer also)
arm/freescale/imx/imx51_ipuv3.c optional sc

2
sys/arm/freescale/imx/files.imx53
View File

@ -47,7 +47,7 @@ dev/usb/controller/ehci_imx.c optional ehci
arm/freescale/imx/imx_wdog.c optional imxwdt
# i2c
arm/freescale/imx/i2c.c optional fsliic
arm/freescale/imx/imx_i2c.c optional fsliic
# IPU - Image Processing Unit (frame buffer also)
arm/freescale/imx/imx51_ipuv3.c optional sc

2
sys/arm/freescale/imx/files.imx6
View File

@ -27,6 +27,7 @@ arm/freescale/imx/imx6_pl310.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx_gpt.c standard
arm/freescale/imx/imx_gpio.c optional gpio
arm/freescale/imx/imx_i2c.c optional fsliic
#
# Optional devices.
@ -52,5 +53,4 @@ arm/freescale/imx/imx6_usbphy.c optional ehci
#
#arm/freescale/imx/imx51_iomux.c optional iomux
#dev/ata/chipsets/ata-fsl.c optional imxata
#arm/freescale/imx/i2c.c optional fsliic
#arm/freescale/imx/imx51_ipuv3.c optional sc

10
sys/arm/freescale/imx/i2c.c → sys/arm/freescale/imx/imx_i2c.c
View File

@ -86,6 +86,12 @@ __FBSDID("$FreeBSD$");
#define debugf(fmt, args...)
#endif
static struct ofw_compat_data compat_data[] = {
{"fsl,imx6q-i2c", 1},
{"fsl,imx-i2c", 1},
{NULL, 0}
};
struct i2c_softc {
device_t dev;
device_t iicbus;
@ -227,7 +233,7 @@ i2c_probe(device_t dev)
if (!ofw_bus_status_okay(dev))
return (ENXIO);
if (!ofw_bus_is_compatible(dev, "fsl,imx-i2c"))
if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
return (ENXIO);
sc = device_get_softc(dev);
@ -246,7 +252,7 @@ i2c_probe(device_t dev)
/* Enable I2C */
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN);
bus_release_resource(dev, SYS_RES_MEMORY, sc->rid, sc->res);
device_set_desc(dev, "I2C bus controller");
device_set_desc(dev, "Freescale i.MX I2C bus controller");
return (BUS_PROBE_DEFAULT);
}

2
sys/arm/freescale/vybrid/vf_i2c.c
View File

@ -30,7 +30,7 @@
*/
/*
* This driver is based on the I2C driver for IMX (imx/i2c.c).
* This driver is based on the I2C driver for i.MX
*/
#include <sys/cdefs.h>

21
sys/boot/fdt/dts/arm/imx6.dtsi
View File

@ -338,6 +338,27 @@
reg = <0x02100000 0x00100000>;
ranges;
i2c1: i2c@021a0000 {
compatible = "fsl,imx6q-i2c";
reg = <0x021a0000 0x4000>;
interrupts = < 68 >;
status = "disabled";
};
i2c2: i2c@021a4000 {
compatible = "fsl,imx6q-i2c";
reg = <0x021a4000 0x4000>;
interrupts = < 69 >;
status = "disabled";
};
i2c3: i2c@021ac000 {
compatible = "fsl,imx6q-i2c";
reg = <0x021a8000 0x4000>;
interrupts = < 70 >;
status = "disabled";
};
fec1: ethernet@02188000 {
compatible = "fsl,imx6q-fec";
reg = <0x02188000 0x4000>;