Deleted Added
full compact
avila_ata.c (302408) avila_ata.c (305614)
1/*-
2 * Copyright (c) 2006 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: stable/11/sys/arm/xscale/ixp425/avila_ata.c 297000 2016-03-18 01:28:41Z jhibbits $");
31__FBSDID("$FreeBSD: stable/11/sys/arm/xscale/ixp425/avila_ata.c 305614 2016-09-08 15:05:25Z pfg $");
32
33/*
34 * Compact Flash Support for the Avila Gateworks XScale boards.
35 * The CF slot is operated in "True IDE" mode. Registers are on
36 * the Expansion Bus connected to CS1 and CS2. Interrupts are
37 * tied to GPIO pin 12. No DMA, just PIO.
38 *
39 * The ADI Pronghorn Metro is very similar. It use CS3 and CS4 and

--- 157 unchanged lines hidden (view full) ---

197 * that go through the expansion bus and require
198 * special hackery to ena/dis 16-bit operations.
199 *
200 * XXX probably should just make this generic for
201 * accessing the expansion bus.
202 */
203 sc->sc_expbus_tag.bs_privdata = sc; /* NB: backpointer */
204 /* read single */
32
33/*
34 * Compact Flash Support for the Avila Gateworks XScale boards.
35 * The CF slot is operated in "True IDE" mode. Registers are on
36 * the Expansion Bus connected to CS1 and CS2. Interrupts are
37 * tied to GPIO pin 12. No DMA, just PIO.
38 *
39 * The ADI Pronghorn Metro is very similar. It use CS3 and CS4 and

--- 157 unchanged lines hidden (view full) ---

197 * that go through the expansion bus and require
198 * special hackery to ena/dis 16-bit operations.
199 *
200 * XXX probably should just make this generic for
201 * accessing the expansion bus.
202 */
203 sc->sc_expbus_tag.bs_privdata = sc; /* NB: backpointer */
204 /* read single */
205 sc->sc_expbus_tag.bs_r_1 = ata_bs_r_1,
206 sc->sc_expbus_tag.bs_r_2 = ata_bs_r_2,
205 sc->sc_expbus_tag.bs_r_1 = ata_bs_r_1;
206 sc->sc_expbus_tag.bs_r_2 = ata_bs_r_2;
207 /* read multiple */
207 /* read multiple */
208 sc->sc_expbus_tag.bs_rm_2 = ata_bs_rm_2,
209 sc->sc_expbus_tag.bs_rm_2_s = ata_bs_rm_2_s,
208 sc->sc_expbus_tag.bs_rm_2 = ata_bs_rm_2;
209 sc->sc_expbus_tag.bs_rm_2_s = ata_bs_rm_2_s;
210 /* write (single) */
210 /* write (single) */
211 sc->sc_expbus_tag.bs_w_1 = ata_bs_w_1,
212 sc->sc_expbus_tag.bs_w_2 = ata_bs_w_2,
211 sc->sc_expbus_tag.bs_w_1 = ata_bs_w_1;
212 sc->sc_expbus_tag.bs_w_2 = ata_bs_w_2;
213 /* write multiple */
213 /* write multiple */
214 sc->sc_expbus_tag.bs_wm_2 = ata_bs_wm_2,
215 sc->sc_expbus_tag.bs_wm_2_s = ata_bs_wm_2_s,
214 sc->sc_expbus_tag.bs_wm_2 = ata_bs_wm_2;
215 sc->sc_expbus_tag.bs_wm_2_s = ata_bs_wm_2_s;
216
217 rman_set_bustag(&sc->sc_ata, &sc->sc_expbus_tag);
218 rman_set_bustag(&sc->sc_alt_ata, &sc->sc_expbus_tag);
219 } else {
220 /*
221 * On Cambria use the shared CS3 expansion bus tag
222 * that handles interlock for sharing access with the
223 * optional UART's.

--- 330 unchanged lines hidden ---
216
217 rman_set_bustag(&sc->sc_ata, &sc->sc_expbus_tag);
218 rman_set_bustag(&sc->sc_alt_ata, &sc->sc_expbus_tag);
219 } else {
220 /*
221 * On Cambria use the shared CS3 expansion bus tag
222 * that handles interlock for sharing access with the
223 * optional UART's.

--- 330 unchanged lines hidden ---