diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm/conf/DB-78XXX | 3 | ||||
| -rw-r--r-- | sys/arm/conf/DB-88F5XXX | 3 | ||||
| -rw-r--r-- | sys/arm/conf/DB-88F6XXX | 3 | ||||
| -rw-r--r-- | sys/arm/conf/DOCKSTAR | 3 | ||||
| -rw-r--r-- | sys/arm/conf/DREAMPLUG-1001 | 3 | ||||
| -rw-r--r-- | sys/arm/conf/SHEEVAPLUG | 3 | ||||
| -rw-r--r-- | sys/arm/conf/TS7800 | 3 | ||||
| -rw-r--r-- | sys/arm/mv/armadaxp/armadaxp.c | 7 | ||||
| -rw-r--r-- | sys/arm/mv/files.mv | 2 |
9 files changed, 22 insertions, 8 deletions
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index 024593c..d40990b 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -90,6 +90,9 @@ device mvs # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 5fd96fc..28f448a 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -88,6 +88,9 @@ device da # SATA device mvs +# GPIO +device gpio + # Flattened Device Tree options FDT makeoptions FDT_DTS_FILE=db88f5281.dts diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index c3f238c..9dafb82 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -94,6 +94,9 @@ device mvs # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR index d7fa96e..c643b92 100644 --- a/sys/arm/conf/DOCKSTAR +++ b/sys/arm/conf/DOCKSTAR @@ -148,6 +148,9 @@ device pf device pflog device pfsync +# GPIO +device gpio + # ALTQ, required for PF options ALTQ # Basic ALTQ support options ALTQ_CBQ # Class Based Queueing diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001 index 3277b43..b5f4bd4 100644 --- a/sys/arm/conf/DREAMPLUG-1001 +++ b/sys/arm/conf/DREAMPLUG-1001 @@ -122,6 +122,9 @@ device u3g # USB-based 3G modems (Option, Huawei, Sierra) device iic device iicbus +# GPIO +device gpio + # SATA device mvs device ahci diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG index 5d89c2d..367de9d 100644 --- a/sys/arm/conf/SHEEVAPLUG +++ b/sys/arm/conf/SHEEVAPLUG @@ -82,6 +82,9 @@ device da # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800 index 1b62e59..e06b0aa 100644 --- a/sys/arm/conf/TS7800 +++ b/sys/arm/conf/TS7800 @@ -76,6 +76,9 @@ device da # SATA device ata +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c index 3bbeadd..693ae6a 100644 --- a/sys/arm/mv/armadaxp/armadaxp.c +++ b/sys/arm/mv/armadaxp/armadaxp.c @@ -86,13 +86,6 @@ int platform_get_ncpus(void); #define COHER_FABRIC_CFU 0x28 #define COHER_FABRIC_CIB_CTRL 0x80 -/* XXX Make gpio driver optional and remove it */ -struct resource_spec mv_gpio_res[] = { - { SYS_RES_MEMORY, 0, RF_ACTIVE }, - { SYS_RES_IRQ, 0, RF_ACTIVE }, - { -1, 0 } -}; - struct vco_freq_ratio { uint8_t vco_cpu; /* VCO to CLK0(CPU) clock ratio */ uint8_t vco_l2c; /* VCO to NB(L2 cache) clock ratio */ diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv index 78b5548..791ef00 100644 --- a/sys/arm/mv/files.mv +++ b/sys/arm/mv/files.mv @@ -12,7 +12,7 @@ # - JTAG/ICE # - Vector Floating Point (VFP) unit # -arm/mv/gpio.c standard +arm/mv/gpio.c optional gpio arm/mv/mv_common.c standard arm/mv/mv_localbus.c standard arm/mv/mv_machdep.c standard |
