diff options
author | ian <ian@FreeBSD.org> | 2014-10-26 02:44:41 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-10-26 02:44:41 +0000 |
commit | 6bda1023a0b349e5b577181f03fb93e6d8744f69 (patch) | |
tree | 730edfb4c442dc3fdd7e68afd04ae872b981090d /sys/arm/conf | |
parent | caa088c379958ba1cd5c02da066c5f02c197d10d (diff) | |
download | FreeBSD-src-6bda1023a0b349e5b577181f03fb93e6d8744f69.zip FreeBSD-src-6bda1023a0b349e5b577181f03fb93e6d8744f69.tar.gz |
MFC r271097, r271100, r271101, r271102, r271124:
- Add a basic iomux driver for imx6.
- Implement the same public interface in imx51 and imx6 iomux
- The iomux driver is no longer optional, remove it from kernel configs.
- Implement the imx_iomux_get/set_gpr() interface for imx6.
- Stop setting the iomux device status to disabled, now that we have a driver.
Diffstat (limited to 'sys/arm/conf')
-rw-r--r-- | sys/arm/conf/DIGI-CCWMX53 | 2 | ||||
-rw-r--r-- | sys/arm/conf/EFIKA_MX | 2 | ||||
-rw-r--r-- | sys/arm/conf/IMX53-QSB | 2 | ||||
-rw-r--r-- | sys/arm/conf/IMX6 | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53 index 098473e..8834ba1 100644 --- a/sys/arm/conf/DIGI-CCWMX53 +++ b/sys/arm/conf/DIGI-CCWMX53 @@ -120,8 +120,6 @@ device atapci # Only for helper functions device imxata options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 82215c5..4d750ac 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -116,8 +116,6 @@ device atapci # Only for helper functions device imxata options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB index dd7b9a1..e912628 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -119,8 +119,6 @@ options ALT_BREAK_TO_DEBUGGER #device imxata #options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 9b53426..135e906 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -80,7 +80,6 @@ device md # Memory "disks" device ether # Ethernet support device miibus # Required for ethernet device bpf # Berkeley packet filter (required for DHCP) -#device iomux # IO Multiplexor # General-purpose input/output device gpio |