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/boot | |
| 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/boot')
| -rw-r--r-- | sys/boot/fdt/dts/arm/imx6.dtsi | 1 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/arm/wandboard-dual.dts | 1 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/arm/wandboard-quad.dts | 1 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/arm/wandboard-solo.dts | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/sys/boot/fdt/dts/arm/imx6.dtsi b/sys/boot/fdt/dts/arm/imx6.dtsi index f7e739b..c24bb81 100644 --- a/sys/boot/fdt/dts/arm/imx6.dtsi +++ b/sys/boot/fdt/dts/arm/imx6.dtsi @@ -134,7 +134,6 @@ reg = <0x020e0000 0x4000>; interrupt-parent = <&gic>; interrupts = <32>; - status = "disabled"; }; gpio1: gpio@0209c000 { diff --git a/sys/boot/fdt/dts/arm/wandboard-dual.dts b/sys/boot/fdt/dts/arm/wandboard-dual.dts index aef8f49..af07c2d 100644 --- a/sys/boot/fdt/dts/arm/wandboard-dual.dts +++ b/sys/boot/fdt/dts/arm/wandboard-dual.dts @@ -44,7 +44,6 @@ SOC: soc@00000000 { aips@02000000 { /* AIPS1 */ - iomux@020e0000 { status = "disabled"; }; gpio@0209c000 { status = "okay"; }; gpio@020a0000 { status = "okay"; }; gpio@020a4000 { status = "okay"; }; diff --git a/sys/boot/fdt/dts/arm/wandboard-quad.dts b/sys/boot/fdt/dts/arm/wandboard-quad.dts index 4a861be..08177cb 100644 --- a/sys/boot/fdt/dts/arm/wandboard-quad.dts +++ b/sys/boot/fdt/dts/arm/wandboard-quad.dts @@ -44,7 +44,6 @@ SOC: soc@00000000 { aips@02000000 { /* AIPS1 */ - iomux@020e0000 { status = "disabled"; }; gpio@0209c000 { status = "okay"; }; gpio@020a0000 { status = "okay"; }; gpio@020a4000 { status = "okay"; }; diff --git a/sys/boot/fdt/dts/arm/wandboard-solo.dts b/sys/boot/fdt/dts/arm/wandboard-solo.dts index 4c46a24..bf3f7c3 100644 --- a/sys/boot/fdt/dts/arm/wandboard-solo.dts +++ b/sys/boot/fdt/dts/arm/wandboard-solo.dts @@ -44,7 +44,6 @@ SOC: soc@00000000 { aips@02000000 { /* AIPS1 */ - iomux@020e0000 { status = "disabled"; }; gpio@0209c000 { status = "okay"; }; gpio@020a0000 { status = "okay"; }; gpio@020a4000 { status = "okay"; }; |
