Blackfin: unify SDH/RSI bitmasks (c385acce) · Commits · e / devices / android_kernel_teracube_emerald

arch/blackfin/include/asm/bfin_sdh.h

+117 −2

Original line number	Diff line number	Diff line
		/*
		* bfin_sdh.h - Blackfin SDH definitions
		* Blackfin Secure Digital Host (SDH) definitions
		*
		* Copyright 2008 Analog Devices Inc.
		* Copyright 2008-2010 Analog Devices Inc.
		*
		* Licensed under the GPL-2 or later.
		*/
		@@ -9,6 +9,7 @@
		#ifndef __BFIN_SDH_H__
		#define __BFIN_SDH_H__

		/* Platform resources */
		struct bfin_sd_host {
		int dma_chan;
		int irq_int0;
		@@ -16,4 +17,118 @@ struct bfin_sd_host {
		u16 pin_req[7];
		};

		/* SDH_COMMAND bitmasks */
		#define CMD_IDX 0x3f /* Command Index */
		#define CMD_RSP (1 << 6) /* Response */
		#define CMD_L_RSP (1 << 7) /* Long Response */
		#define CMD_INT_E (1 << 8) /* Command Interrupt */
		#define CMD_PEND_E (1 << 9) /* Command Pending */
		#define CMD_E (1 << 10) /* Command Enable */

		/* SDH_PWR_CTL bitmasks */
		#define PWR_ON 0x3 /* Power On */
		#define SD_CMD_OD (1 << 6) /* Open Drain Output */
		#define ROD_CTL (1 << 7) /* Rod Control */

		/* SDH_CLK_CTL bitmasks */
		#define CLKDIV 0xff /* MC_CLK Divisor */
		#define CLK_E (1 << 8) /* MC_CLK Bus Clock Enable */
		#define PWR_SV_E (1 << 9) /* Power Save Enable */
		#define CLKDIV_BYPASS (1 << 10) /* Bypass Divisor */
		#define WIDE_BUS (1 << 11) /* Wide Bus Mode Enable */

		/* SDH_RESP_CMD bitmasks */
		#define RESP_CMD 0x3f /* Response Command */

		/* SDH_DATA_CTL bitmasks */
		#define DTX_E (1 << 0) /* Data Transfer Enable */
		#define DTX_DIR (1 << 1) /* Data Transfer Direction */
		#define DTX_MODE (1 << 2) /* Data Transfer Mode */
		#define DTX_DMA_E (1 << 3) /* Data Transfer DMA Enable */
		#define DTX_BLK_LGTH (0xf << 4) /* Data Transfer Block Length */

		/* SDH_STATUS bitmasks */
		#define CMD_CRC_FAIL (1 << 0) /* CMD CRC Fail */
		#define DAT_CRC_FAIL (1 << 1) /* Data CRC Fail */
		#define CMD_TIME_OUT (1 << 2) /* CMD Time Out */
		#define DAT_TIME_OUT (1 << 3) /* Data Time Out */
		#define TX_UNDERRUN (1 << 4) /* Transmit Underrun */
		#define RX_OVERRUN (1 << 5) /* Receive Overrun */
		#define CMD_RESP_END (1 << 6) /* CMD Response End */
		#define CMD_SENT (1 << 7) /* CMD Sent */
		#define DAT_END (1 << 8) /* Data End */
		#define START_BIT_ERR (1 << 9) /* Start Bit Error */
		#define DAT_BLK_END (1 << 10) /* Data Block End */
		#define CMD_ACT (1 << 11) /* CMD Active */
		#define TX_ACT (1 << 12) /* Transmit Active */
		#define RX_ACT (1 << 13) /* Receive Active */
		#define TX_FIFO_STAT (1 << 14) /* Transmit FIFO Status */
		#define RX_FIFO_STAT (1 << 15) /* Receive FIFO Status */
		#define TX_FIFO_FULL (1 << 16) /* Transmit FIFO Full */
		#define RX_FIFO_FULL (1 << 17) /* Receive FIFO Full */
		#define TX_FIFO_ZERO (1 << 18) /* Transmit FIFO Empty */
		#define RX_DAT_ZERO (1 << 19) /* Receive FIFO Empty */
		#define TX_DAT_RDY (1 << 20) /* Transmit Data Available */
		#define RX_FIFO_RDY (1 << 21) /* Receive Data Available */

		/* SDH_STATUS_CLR bitmasks */
		#define CMD_CRC_FAIL_STAT (1 << 0) /* CMD CRC Fail Status */
		#define DAT_CRC_FAIL_STAT (1 << 1) /* Data CRC Fail Status */
		#define CMD_TIMEOUT_STAT (1 << 2) /* CMD Time Out Status */
		#define DAT_TIMEOUT_STAT (1 << 3) /* Data Time Out status */
		#define TX_UNDERRUN_STAT (1 << 4) /* Transmit Underrun Status */
		#define RX_OVERRUN_STAT (1 << 5) /* Receive Overrun Status */
		#define CMD_RESP_END_STAT (1 << 6) /* CMD Response End Status */
		#define CMD_SENT_STAT (1 << 7) /* CMD Sent Status */
		#define DAT_END_STAT (1 << 8) /* Data End Status */
		#define START_BIT_ERR_STAT (1 << 9) /* Start Bit Error Status */
		#define DAT_BLK_END_STAT (1 << 10) /* Data Block End Status */

		/* SDH_MASK0 bitmasks */
		#define CMD_CRC_FAIL_MASK (1 << 0) /* CMD CRC Fail Mask */
		#define DAT_CRC_FAIL_MASK (1 << 1) /* Data CRC Fail Mask */
		#define CMD_TIMEOUT_MASK (1 << 2) /* CMD Time Out Mask */
		#define DAT_TIMEOUT_MASK (1 << 3) /* Data Time Out Mask */
		#define TX_UNDERRUN_MASK (1 << 4) /* Transmit Underrun Mask */
		#define RX_OVERRUN_MASK (1 << 5) /* Receive Overrun Mask */
		#define CMD_RESP_END_MASK (1 << 6) /* CMD Response End Mask */
		#define CMD_SENT_MASK (1 << 7) /* CMD Sent Mask */
		#define DAT_END_MASK (1 << 8) /* Data End Mask */
		#define START_BIT_ERR_MASK (1 << 9) /* Start Bit Error Mask */
		#define DAT_BLK_END_MASK (1 << 10) /* Data Block End Mask */
		#define CMD_ACT_MASK (1 << 11) /* CMD Active Mask */
		#define TX_ACT_MASK (1 << 12) /* Transmit Active Mask */
		#define RX_ACT_MASK (1 << 13) /* Receive Active Mask */
		#define TX_FIFO_STAT_MASK (1 << 14) /* Transmit FIFO Status Mask */
		#define RX_FIFO_STAT_MASK (1 << 15) /* Receive FIFO Status Mask */
		#define TX_FIFO_FULL_MASK (1 << 16) /* Transmit FIFO Full Mask */
		#define RX_FIFO_FULL_MASK (1 << 17) /* Receive FIFO Full Mask */
		#define TX_FIFO_ZERO_MASK (1 << 18) /* Transmit FIFO Empty Mask */
		#define RX_DAT_ZERO_MASK (1 << 19) /* Receive FIFO Empty Mask */
		#define TX_DAT_RDY_MASK (1 << 20) /* Transmit Data Available Mask */
		#define RX_FIFO_RDY_MASK (1 << 21) /* Receive Data Available Mask */

		/* SDH_FIFO_CNT bitmasks */
		#define FIFO_COUNT 0x7fff /* FIFO Count */

		/* SDH_E_STATUS bitmasks */
		#define SDIO_INT_DET (1 << 1) /* SDIO Int Detected */
		#define SD_CARD_DET (1 << 4) /* SD Card Detect */

		/* SDH_E_MASK bitmasks */
		#define SDIO_MSK (1 << 1) /* Mask SDIO Int Detected */
		#define SCD_MSK (1 << 6) /* Mask Card Detect */

		/* SDH_CFG bitmasks */
		#define CLKS_EN (1 << 0) /* Clocks Enable */
		#define SD4E (1 << 2) /* SDIO 4-Bit Enable */
		#define MWE (1 << 3) /* Moving Window Enable */
		#define SD_RST (1 << 4) /* SDMMC Reset */
		#define PUP_SDDAT (1 << 5) /* Pull-up SD_DAT */
		#define PUP_SDDAT3 (1 << 6) /* Pull-up SD_DAT3 */
		#define PD_SDDAT3 (1 << 7) /* Pull-down SD_DAT3 */

		/* SDH_RD_WAIT_EN bitmasks */
		#define RWR (1 << 0) /* Read Wait Request */

		#endif

arch/blackfin/mach-bf518/include/mach/defBF514.h

+0 −135

Original line number	Diff line number	Diff line
		@@ -45,139 +45,4 @@
		#define RSI_PID6 0xFFC03FF8 /* RSI Peripheral ID Register 6 */
		#define RSI_PID7 0xFFC03FFC /* RSI Peripheral ID Register 7 */

		/* ********************************************************** */
		/* SINGLE BIT MACRO PAIRS (bit mask and negated one) */
		/* and MULTI BIT READ MACROS */
		/* ********************************************************** */

		/* Bit masks for SDH_COMMAND */

		#define CMD_IDX 0x3f /* Command Index */
		#define CMD_RSP 0x40 /* Response */
		#define CMD_L_RSP 0x80 /* Long Response */
		#define CMD_INT_E 0x100 /* Command Interrupt */
		#define CMD_PEND_E 0x200 /* Command Pending */
		#define CMD_E 0x400 /* Command Enable */

		/* Bit masks for SDH_PWR_CTL */

		#define PWR_ON 0x3 /* Power On */
		#if 0
		#define TBD 0x3c /* TBD */
		#endif
		#define SD_CMD_OD 0x40 /* Open Drain Output */
		#define ROD_CTL 0x80 /* Rod Control */

		/* Bit masks for SDH_CLK_CTL */

		#define CLKDIV 0xff /* MC_CLK Divisor */
		#define CLK_E 0x100 /* MC_CLK Bus Clock Enable */
		#define PWR_SV_E 0x200 /* Power Save Enable */
		#define CLKDIV_BYPASS 0x400 /* Bypass Divisor */
		#define WIDE_BUS 0x800 /* Wide Bus Mode Enable */

		/* Bit masks for SDH_RESP_CMD */

		#define RESP_CMD 0x3f /* Response Command */

		/* Bit masks for SDH_DATA_CTL */

		#define DTX_E 0x1 /* Data Transfer Enable */
		#define DTX_DIR 0x2 /* Data Transfer Direction */
		#define DTX_MODE 0x4 /* Data Transfer Mode */
		#define DTX_DMA_E 0x8 /* Data Transfer DMA Enable */
		#define DTX_BLK_LGTH 0xf0 /* Data Transfer Block Length */

		/* Bit masks for SDH_STATUS */

		#define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */
		#define DAT_CRC_FAIL 0x2 /* Data CRC Fail */
		#define CMD_TIME_OUT 0x4 /* CMD Time Out */
		#define DAT_TIME_OUT 0x8 /* Data Time Out */
		#define TX_UNDERRUN 0x10 /* Transmit Underrun */
		#define RX_OVERRUN 0x20 /* Receive Overrun */
		#define CMD_RESP_END 0x40 /* CMD Response End */
		#define CMD_SENT 0x80 /* CMD Sent */
		#define DAT_END 0x100 /* Data End */
		#define START_BIT_ERR 0x200 /* Start Bit Error */
		#define DAT_BLK_END 0x400 /* Data Block End */
		#define CMD_ACT 0x800 /* CMD Active */
		#define TX_ACT 0x1000 /* Transmit Active */
		#define RX_ACT 0x2000 /* Receive Active */
		#define TX_FIFO_STAT 0x4000 /* Transmit FIFO Status */
		#define RX_FIFO_STAT 0x8000 /* Receive FIFO Status */
		#define TX_FIFO_FULL 0x10000 /* Transmit FIFO Full */
		#define RX_FIFO_FULL 0x20000 /* Receive FIFO Full */
		#define TX_FIFO_ZERO 0x40000 /* Transmit FIFO Empty */
		#define RX_DAT_ZERO 0x80000 /* Receive FIFO Empty */
		#define TX_DAT_RDY 0x100000 /* Transmit Data Available */
		#define RX_FIFO_RDY 0x200000 /* Receive Data Available */

		/* Bit masks for SDH_STATUS_CLR */

		#define CMD_CRC_FAIL_STAT 0x1 /* CMD CRC Fail Status */
		#define DAT_CRC_FAIL_STAT 0x2 /* Data CRC Fail Status */
		#define CMD_TIMEOUT_STAT 0x4 /* CMD Time Out Status */
		#define DAT_TIMEOUT_STAT 0x8 /* Data Time Out status */
		#define TX_UNDERRUN_STAT 0x10 /* Transmit Underrun Status */
		#define RX_OVERRUN_STAT 0x20 /* Receive Overrun Status */
		#define CMD_RESP_END_STAT 0x40 /* CMD Response End Status */
		#define CMD_SENT_STAT 0x80 /* CMD Sent Status */
		#define DAT_END_STAT 0x100 /* Data End Status */
		#define START_BIT_ERR_STAT 0x200 /* Start Bit Error Status */
		#define DAT_BLK_END_STAT 0x400 /* Data Block End Status */

		/* Bit masks for SDH_MASK0 */

		#define CMD_CRC_FAIL_MASK 0x1 /* CMD CRC Fail Mask */
		#define DAT_CRC_FAIL_MASK 0x2 /* Data CRC Fail Mask */
		#define CMD_TIMEOUT_MASK 0x4 /* CMD Time Out Mask */
		#define DAT_TIMEOUT_MASK 0x8 /* Data Time Out Mask */
		#define TX_UNDERRUN_MASK 0x10 /* Transmit Underrun Mask */
		#define RX_OVERRUN_MASK 0x20 /* Receive Overrun Mask */
		#define CMD_RESP_END_MASK 0x40 /* CMD Response End Mask */
		#define CMD_SENT_MASK 0x80 /* CMD Sent Mask */
		#define DAT_END_MASK 0x100 /* Data End Mask */
		#define START_BIT_ERR_MASK 0x200 /* Start Bit Error Mask */
		#define DAT_BLK_END_MASK 0x400 /* Data Block End Mask */
		#define CMD_ACT_MASK 0x800 /* CMD Active Mask */
		#define TX_ACT_MASK 0x1000 /* Transmit Active Mask */
		#define RX_ACT_MASK 0x2000 /* Receive Active Mask */
		#define TX_FIFO_STAT_MASK 0x4000 /* Transmit FIFO Status Mask */
		#define RX_FIFO_STAT_MASK 0x8000 /* Receive FIFO Status Mask */
		#define TX_FIFO_FULL_MASK 0x10000 /* Transmit FIFO Full Mask */
		#define RX_FIFO_FULL_MASK 0x20000 /* Receive FIFO Full Mask */
		#define TX_FIFO_ZERO_MASK 0x40000 /* Transmit FIFO Empty Mask */
		#define RX_DAT_ZERO_MASK 0x80000 /* Receive FIFO Empty Mask */
		#define TX_DAT_RDY_MASK 0x100000 /* Transmit Data Available Mask */
		#define RX_FIFO_RDY_MASK 0x200000 /* Receive Data Available Mask */

		/* Bit masks for SDH_FIFO_CNT */

		#define FIFO_COUNT 0x7fff /* FIFO Count */

		/* Bit masks for SDH_E_STATUS */

		#define SDIO_INT_DET 0x2 /* SDIO Int Detected */
		#define SD_CARD_DET 0x10 /* SD Card Detect */

		/* Bit masks for SDH_E_MASK */

		#define SDIO_MSK 0x2 /* Mask SDIO Int Detected */
		#define SCD_MSK 0x40 /* Mask Card Detect */

		/* Bit masks for SDH_CFG */

		#define CLKS_EN 0x1 /* Clocks Enable */
		#define SD4E 0x4 /* SDIO 4-Bit Enable */
		#define MWE 0x8 /* Moving Window Enable */
		#define SD_RST 0x10 /* SDMMC Reset */
		#define PUP_SDDAT 0x20 /* Pull-up SD_DAT */
		#define PUP_SDDAT3 0x40 /* Pull-up SD_DAT3 */
		#define PD_SDDAT3 0x80 /* Pull-down SD_DAT3 */

		/* Bit masks for SDH_RD_WAIT_EN */

		#define RWR 0x1 /* Read Wait Request */

		#endif /* _DEF_BF514_H */

arch/blackfin/mach-bf548/include/mach/defBF542.h

+0 −130

Original line number	Diff line number	Diff line
		@@ -366,136 +366,6 @@

		#define KPAD_SOFTEVAL_E 0x2 /* Software Programmable Force Evaluate */

		/* Bit masks for SDH_COMMAND */

		#define CMD_IDX 0x3f /* Command Index */
		#define CMD_RSP 0x40 /* Response */
		#define CMD_L_RSP 0x80 /* Long Response */
		#define CMD_INT_E 0x100 /* Command Interrupt */
		#define CMD_PEND_E 0x200 /* Command Pending */
		#define CMD_E 0x400 /* Command Enable */

		/* Bit masks for SDH_PWR_CTL */

		#define PWR_ON 0x3 /* Power On */
		#if 0
		#define TBD 0x3c /* TBD */
		#endif
		#define SD_CMD_OD 0x40 /* Open Drain Output */
		#define ROD_CTL 0x80 /* Rod Control */

		/* Bit masks for SDH_CLK_CTL */

		#define CLKDIV 0xff /* MC_CLK Divisor */
		#define CLK_E 0x100 /* MC_CLK Bus Clock Enable */
		#define PWR_SV_E 0x200 /* Power Save Enable */
		#define CLKDIV_BYPASS 0x400 /* Bypass Divisor */
		#define WIDE_BUS 0x800 /* Wide Bus Mode Enable */

		/* Bit masks for SDH_RESP_CMD */

		#define RESP_CMD 0x3f /* Response Command */

		/* Bit masks for SDH_DATA_CTL */

		#define DTX_E 0x1 /* Data Transfer Enable */
		#define DTX_DIR 0x2 /* Data Transfer Direction */
		#define DTX_MODE 0x4 /* Data Transfer Mode */
		#define DTX_DMA_E 0x8 /* Data Transfer DMA Enable */
		#define DTX_BLK_LGTH 0xf0 /* Data Transfer Block Length */

		/* Bit masks for SDH_STATUS */

		#define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */
		#define DAT_CRC_FAIL 0x2 /* Data CRC Fail */
		#define CMD_TIME_OUT 0x4 /* CMD Time Out */
		#define DAT_TIME_OUT 0x8 /* Data Time Out */
		#define TX_UNDERRUN 0x10 /* Transmit Underrun */
		#define RX_OVERRUN 0x20 /* Receive Overrun */
		#define CMD_RESP_END 0x40 /* CMD Response End */
		#define CMD_SENT 0x80 /* CMD Sent */
		#define DAT_END 0x100 /* Data End */
		#define START_BIT_ERR 0x200 /* Start Bit Error */
		#define DAT_BLK_END 0x400 /* Data Block End */
		#define CMD_ACT 0x800 /* CMD Active */
		#define TX_ACT 0x1000 /* Transmit Active */
		#define RX_ACT 0x2000 /* Receive Active */
		#define TX_FIFO_STAT 0x4000 /* Transmit FIFO Status */
		#define RX_FIFO_STAT 0x8000 /* Receive FIFO Status */
		#define TX_FIFO_FULL 0x10000 /* Transmit FIFO Full */
		#define RX_FIFO_FULL 0x20000 /* Receive FIFO Full */
		#define TX_FIFO_ZERO 0x40000 /* Transmit FIFO Empty */
		#define RX_DAT_ZERO 0x80000 /* Receive FIFO Empty */
		#define TX_DAT_RDY 0x100000 /* Transmit Data Available */
		#define RX_FIFO_RDY 0x200000 /* Receive Data Available */

		/* Bit masks for SDH_STATUS_CLR */

		#define CMD_CRC_FAIL_STAT 0x1 /* CMD CRC Fail Status */
		#define DAT_CRC_FAIL_STAT 0x2 /* Data CRC Fail Status */
		#define CMD_TIMEOUT_STAT 0x4 /* CMD Time Out Status */
		#define DAT_TIMEOUT_STAT 0x8 /* Data Time Out status */
		#define TX_UNDERRUN_STAT 0x10 /* Transmit Underrun Status */
		#define RX_OVERRUN_STAT 0x20 /* Receive Overrun Status */
		#define CMD_RESP_END_STAT 0x40 /* CMD Response End Status */
		#define CMD_SENT_STAT 0x80 /* CMD Sent Status */
		#define DAT_END_STAT 0x100 /* Data End Status */
		#define START_BIT_ERR_STAT 0x200 /* Start Bit Error Status */
		#define DAT_BLK_END_STAT 0x400 /* Data Block End Status */

		/* Bit masks for SDH_MASK0 */

		#define CMD_CRC_FAIL_MASK 0x1 /* CMD CRC Fail Mask */
		#define DAT_CRC_FAIL_MASK 0x2 /* Data CRC Fail Mask */
		#define CMD_TIMEOUT_MASK 0x4 /* CMD Time Out Mask */
		#define DAT_TIMEOUT_MASK 0x8 /* Data Time Out Mask */
		#define TX_UNDERRUN_MASK 0x10 /* Transmit Underrun Mask */
		#define RX_OVERRUN_MASK 0x20 /* Receive Overrun Mask */
		#define CMD_RESP_END_MASK 0x40 /* CMD Response End Mask */
		#define CMD_SENT_MASK 0x80 /* CMD Sent Mask */
		#define DAT_END_MASK 0x100 /* Data End Mask */
		#define START_BIT_ERR_MASK 0x200 /* Start Bit Error Mask */
		#define DAT_BLK_END_MASK 0x400 /* Data Block End Mask */
		#define CMD_ACT_MASK 0x800 /* CMD Active Mask */
		#define TX_ACT_MASK 0x1000 /* Transmit Active Mask */
		#define RX_ACT_MASK 0x2000 /* Receive Active Mask */
		#define TX_FIFO_STAT_MASK 0x4000 /* Transmit FIFO Status Mask */
		#define RX_FIFO_STAT_MASK 0x8000 /* Receive FIFO Status Mask */
		#define TX_FIFO_FULL_MASK 0x10000 /* Transmit FIFO Full Mask */
		#define RX_FIFO_FULL_MASK 0x20000 /* Receive FIFO Full Mask */
		#define TX_FIFO_ZERO_MASK 0x40000 /* Transmit FIFO Empty Mask */
		#define RX_DAT_ZERO_MASK 0x80000 /* Receive FIFO Empty Mask */
		#define TX_DAT_RDY_MASK 0x100000 /* Transmit Data Available Mask */
		#define RX_FIFO_RDY_MASK 0x200000 /* Receive Data Available Mask */

		/* Bit masks for SDH_FIFO_CNT */

		#define FIFO_COUNT 0x7fff /* FIFO Count */

		/* Bit masks for SDH_E_STATUS */

		#define SDIO_INT_DET 0x2 /* SDIO Int Detected */
		#define SD_CARD_DET 0x10 /* SD Card Detect */

		/* Bit masks for SDH_E_MASK */

		#define SDIO_MSK 0x2 /* Mask SDIO Int Detected */
		#define SCD_MSK 0x40 /* Mask Card Detect */

		/* Bit masks for SDH_CFG */

		#define CLKS_EN 0x1 /* Clocks Enable */
		#define SD4E 0x4 /* SDIO 4-Bit Enable */
		#define MWE 0x8 /* Moving Window Enable */
		#define SD_RST 0x10 /* SDMMC Reset */
		#define PUP_SDDAT 0x20 /* Pull-up SD_DAT */
		#define PUP_SDDAT3 0x40 /* Pull-up SD_DAT3 */
		#define PD_SDDAT3 0x80 /* Pull-down SD_DAT3 */

		/* Bit masks for SDH_RD_WAIT_EN */

		#define RWR 0x1 /* Read Wait Request */

		/* Bit masks for ATAPI_CONTROL */

		#define PIO_START 0x1 /* Start PIO/Reg Op */

arch/blackfin/mach-bf548/include/mach/defBF547.h

+0 −130

File changed.

Preview size limit exceeded, changes collapsed.