mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AU_LINUX_QSDK_FIG_TARGET_ALL.12.0.000.818

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAmGlMKAACgkQoUgPZYCpAfHA5gCguluFwsFIYsm3gl5l0BBrId8c
 HfwAnjQ82ZpAJJ7SpVbI9CTlHgW3a7An
 =EyHt
 -----END PGP SIGNATURE-----

Merge AU_LINUX_QSDK_FIG_TARGET_ALL.12.0.000.818 on remote branch

Change-Id: I28e35073815bebcad64bc725be245dd385b34e7f
Signed-off-by: Linux Build Service Account <lnxbuild@localhost>
This commit is contained in:
Linux Build Service Account 2021-12-02 00:30:27 -07:00
commit 4872fe0dba
12 changed files with 114 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/dts/ipq5018-soc.dtsi
View file

@ -37,6 +37,10 @@
compatible = "qcom,spi-qup-v2.7.0"; compatible = "qcom,spi-qup-v2.7.0";
wr_pipe_0 = <4>; wr_pipe_0 = <4>;
rd_pipe_0 = <5>; rd_pipe_0 = <5>;
wr_pipe_1 = <6>;
rd_pipe_1 = <7>;
wr_pipe_2 = <8>;
rd_pipe_2 = <9>;
status = "ok"; status = "ok";
spi_gpio { spi_gpio {
blsp0_spi_clk { blsp0_spi_clk {

11
arch/arm/dts/ipq6018-soc.dtsi
View file

@ -81,6 +81,17 @@
compatible = "qcom,spi-qup-v2.7.0"; compatible = "qcom,spi-qup-v2.7.0";
wr_pipe_0 = <12>; wr_pipe_0 = <12>;
rd_pipe_0 = <13>; rd_pipe_0 = <13>;
wr_pipe_1 = <14>;
rd_pipe_1 = <15>;
wr_pipe_2 = <16>;
rd_pipe_2 = <17>;
wr_pipe_3 = <18>;
rd_pipe_3 = <19>;
wr_pipe_4 = <20>;
rd_pipe_4 = <21>;
wr_pipe_5 = <22>;
rd_pipe_5 = <23>;
spi_gpio { spi_gpio {
gpio1 { gpio1 {
gpio = <38>; gpio = <38>;

11
arch/arm/dts/ipq807x-soc.dtsi
View file

@ -61,6 +61,17 @@
compatible = "qcom,spi-qup-v2.7.0"; compatible = "qcom,spi-qup-v2.7.0";
wr_pipe_0 = <12>; wr_pipe_0 = <12>;
rd_pipe_0 = <13>; rd_pipe_0 = <13>;
wr_pipe_1 = <14>;
rd_pipe_1 = <15>;
wr_pipe_2 = <16>;
rd_pipe_2 = <17>;
wr_pipe_3 = <18>;
rd_pipe_3 = <19>;
wr_pipe_4 = <20>;
rd_pipe_4 = <21>;
wr_pipe_5 = <22>;
rd_pipe_5 = <23>;
}; };
nand: nand-controller@79B0000 { nand: nand-controller@79B0000 {

10
arch/arm/dts/ipq9574-soc.dtsi
View file

@ -88,6 +88,16 @@
compatible = "qcom,spi-qup-v2.7.0"; compatible = "qcom,spi-qup-v2.7.0";
wr_pipe_0 = <12>; wr_pipe_0 = <12>;
rd_pipe_0 = <13>; rd_pipe_0 = <13>;
wr_pipe_1 = <14>;
rd_pipe_1 = <15>;
wr_pipe_2 = <16>;
rd_pipe_2 = <17>;
wr_pipe_3 = <18>;
rd_pipe_3 = <19>;
wr_pipe_4 = <20>;
rd_pipe_4 = <21>;
wr_pipe_5 = <22>;
rd_pipe_5 = <23>;
status = "ok"; status = "ok";
spi_gpio { spi_gpio {
}; };

22
common/usb.c
View file

@ -46,6 +46,8 @@
#define TRANSCEND_USB_VENDOR_ID 0x8564 #define TRANSCEND_USB_VENDOR_ID 0x8564
#define TRANSCEND_USB_PRODUCT_ID 0x1000 #define TRANSCEND_USB_PRODUCT_ID 0x1000
#define SP_USB_VENDOR_ID 0x058f
#define SP_USB_PRODUCT_ID 0x6387
static int asynch_allowed; static int asynch_allowed;
char usb_started; /* flag for the started/stopped USB status */ char usb_started; /* flag for the started/stopped USB status */
@ -1091,18 +1093,22 @@ int usb_select_config(struct usb_device *dev)
le16_to_cpus(&dev->descriptor.idProduct); le16_to_cpus(&dev->descriptor.idProduct);
le16_to_cpus(&dev->descriptor.bcdDevice); le16_to_cpus(&dev->descriptor.bcdDevice);
/*The Transcend device fails for get configuration length. Adding /*The Transcend and Silicon-power devices fails for get configuration length.
delay about 10 micro secs to fix this.*/ Adding delay about 10 micro secs to fix this.*/
if (dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID && if ((dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) ||
(dev->descriptor.idVendor == SP_USB_VENDOR_ID &&
dev->descriptor.idProduct == SP_USB_PRODUCT_ID))
udelay(10); udelay(10);
/* only support for one config for now */ /* only support for one config for now */
err = usb_get_configuration_len(dev, 0); err = usb_get_configuration_len(dev, 0);
/*The Transcend device fails for get configuration number. Adding /*The Transcend and Silicon-power devices fails for get configuration number.
delay about 10 micro secs to fix this.*/ Adding delay about 10 micro secs to fix this.*/
if (dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID && if ((dev->descriptor.idVendor == TRANSCEND_USB_VENDOR_ID &&
dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) dev->descriptor.idProduct == TRANSCEND_USB_PRODUCT_ID) ||
(dev->descriptor.idVendor == SP_USB_VENDOR_ID &&
dev->descriptor.idProduct == SP_USB_PRODUCT_ID))
udelay(10); udelay(10);
if (err >= 0) { if (err >= 0) {

18
drivers/spi/qca_qup_spi_bam.c
View file

@ -40,8 +40,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static unsigned int read_pipe[NO_OF_QUPS]; static unsigned int read_pipe[CONFIG_IPQ_MAX_BLSP_QUPS];
static unsigned int write_pipe[NO_OF_QUPS]; static unsigned int write_pipe[CONFIG_IPQ_MAX_BLSP_QUPS];
static unsigned char qup_pipe_initialized = 0; static unsigned char qup_pipe_initialized = 0;
static int check_bit_state(uint32_t reg_addr, int bit_num, int val, static int check_bit_state(uint32_t reg_addr, int bit_num, int val,
@ -177,7 +177,7 @@ static void qup_pipe_init(void)
qup_pipe_initialized = 1; qup_pipe_initialized = 1;
node = fdt_path_offset(gd->fdt_blob, "/spi"); node = fdt_path_offset(gd->fdt_blob, "/spi");
if (node >= 0) { if (node >= 0) {
for(i = 0; i < NO_OF_QUPS; i++) { for(i = 0; i < CONFIG_IPQ_MAX_BLSP_QUPS; i++) {
snprintf(rd_pipe_name, sizeof(rd_pipe_name), snprintf(rd_pipe_name, sizeof(rd_pipe_name),
"rd_pipe_%01d", i); "rd_pipe_%01d", i);
@ -352,19 +352,19 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
memset(ds, 0, sizeof(struct ipq_spi_slave)); memset(ds, 0, sizeof(struct ipq_spi_slave));
/* /*
* QCA BLSP supports SPI Flash * QCA BLSP supports SPI Flash
* on different BLSP0 and BLSP1 * on different BLSP 0 to CONFIG_IPQ_MAX_BLSP_QUPS-1
* with different number of chip selects (CS, channels): * with different number of chip selects (CS, channels):
*/ */
if ((bus > BLSP1_SPI) if (bus >= CONFIG_IPQ_MAX_BLSP_QUPS){
|| ((bus == BLSP0_SPI) && (cs > 2))
|| ((bus == BLSP1_SPI) && (cs > 0))) {
printf("SPI error: unsupported bus %d " printf("SPI error: unsupported bus %d "
"(Supported busses 0,1 and 2) or chipselect\n", bus); "Supported busses 0 to %d\n", bus, CONFIG_IPQ_MAX_BLSP_QUPS-1);
goto err; goto err;
} }
ds->slave.bus = bus; ds->slave.bus = bus;
ds->slave.cs = cs; ds->slave.cs = cs;
BLSP_SPI_REGISTERS(spi_reg[bus]);
ds->regs = &spi_reg[bus]; ds->regs = &spi_reg[bus];
/* TODO For different clock frequency */ /* TODO For different clock frequency */
@ -384,7 +384,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
/* DMA mode */ /* DMA mode */
ds->use_dma = CONFIG_QUP_SPI_USE_DMA; ds->use_dma = CONFIG_QUP_SPI_USE_DMA;
if (ds->slave.cs == 1 && if (ds->slave.cs >= 1 &&
cs_is_valid(ds->slave.bus, ds->slave.cs)) { cs_is_valid(ds->slave.bus, ds->slave.cs)) {
/* GPIO Configuration for SPI NAND */ /* GPIO Configuration for SPI NAND */
blsp_pin_config(ds->slave.bus, ds->slave.cs); blsp_pin_config(ds->slave.bus, ds->slave.cs);

156
drivers/spi/qca_qup_spi_bam.h
View file

@ -31,79 +31,57 @@
#ifndef _IPQ_SPI_BAM_H_ #ifndef _IPQ_SPI_BAM_H_
#define _IPQ_SPI_BAM_H_ #define _IPQ_SPI_BAM_H_
#define QUP0_BASE 0x78b5000 #define QUP_BASE 0x78b5000
#define QUP1_BASE 0x78b6000 #define BLSP0_BAM_BASE 0x7884000
#define BLSP0_BAM_BASE 0x7884000
#define BLSP0_QUP_REG_BASE (QUP0_BASE + 0x00000000) #define BLSP_QUP_REG_BASE(p) (QUP_BASE + (p*0x1000) )
#define BLSP1_QUP_REG_BASE (QUP1_BASE + 0x00000000)
#define BLSP0_SPI_CONFIG_REG (BLSP0_QUP_REG_BASE + 0x00000300) #define BLSP_SPI_CONFIG_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000300)
#define BLSP1_SPI_CONFIG_REG (BLSP1_QUP_REG_BASE + 0x00000300)
#define BLSP0_SPI_IO_CONTROL_REG (BLSP0_QUP_REG_BASE + 0x00000304) #define BLSP_SPI_IO_CONTROL_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000304)
#define BLSP1_SPI_IO_CONTROL_REG (BLSP1_QUP_REG_BASE + 0x00000304)
#define BLSP0_SPI_ERROR_FLAGS_REG (BLSP0_QUP_REG_BASE + 0x00000308) #define BLSP_SPI_ERROR_FLAGS_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000308)
#define BLSP1_SPI_ERROR_FLAGS_REG (BLSP1_QUP_REG_BASE + 0x00000308)
#define BLSP0_SPI_DEASSERT_WAIT_REG (BLSP0_QUP_REG_BASE + 0x00000310) #define BLSP_SPI_DEASSERT_WAIT_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000310)
#define BLSP1_SPI_DEASSERT_WAIT_REG (BLSP1_QUP_REG_BASE + 0x00000310)
#define BLSP0_SPI_ERROR_FLAGS_EN_REG (BLSP0_QUP_REG_BASE + 0x0000030c)
#define BLSP1_SPI_ERROR_FLAGS_EN_REG (BLSP1_QUP_REG_BASE + 0x0000030c)
#define BLSP0_QUP_CONFIG_REG (BLSP0_QUP_REG_BASE + 0x00000000) #define BLSP_SPI_ERROR_FLAGS_EN_REG(p) (BLSP_QUP_REG_BASE(p) + 0x0000030c)
#define BLSP1_QUP_CONFIG_REG (BLSP1_QUP_REG_BASE + 0x00000000)
#define BLSP0_QUP_ERROR_FLAGS_REG (BLSP0_QUP_REG_BASE + 0x0000001c) #define BLSP_QUP_CONFIG_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000000)
#define BLSP1_QUP_ERROR_FLAGS_REG (BLSP1_QUP_REG_BASE + 0x0000001c)
#define BLSP0_QUP_ERROR_FLAGS_EN_REG (BLSP0_QUP_REG_BASE + 0x00000020) #define BLSP_QUP_ERROR_FLAGS_REG(p) (BLSP_QUP_REG_BASE(p) + 0x0000001c)
#define BLSP1_QUP_ERROR_FLAGS_EN_REG (BLSP1_QUP_REG_BASE + 0x00000020)
#define BLSP0_QUP_OPERATIONAL_MASK (BLSP0_QUP_REG_BASE + 0x00000028) #define BLSP_QUP_ERROR_FLAGS_EN_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000020)
#define BLSP1_QUP_OPERATIONAL_MASK (BLSP1_QUP_REG_BASE + 0x00000028)
#define BLSP0_QUP_OPERATIONAL_REG (BLSP0_QUP_REG_BASE + 0x00000018) #define BLSP_QUP_OPERATIONAL_MASK(p) (BLSP_QUP_REG_BASE(p) + 0x00000028)
#define BLSP1_QUP_OPERATIONAL_REG (BLSP1_QUP_REG_BASE + 0x00000018)
#define BLSP0_QUP_IO_MODES_REG (BLSP0_QUP_REG_BASE + 0x00000008) #define BLSP_QUP_OPERATIONAL_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000018)
#define BLSP1_QUP_IO_MODES_REG (BLSP1_QUP_REG_BASE + 0x00000008)
#define BLSP0_QUP_STATE_REG (BLSP0_QUP_REG_BASE + 0x00000004) #define BLSP_QUP_IO_MODES_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000008)
#define BLSP1_QUP_STATE_REG (BLSP1_QUP_REG_BASE + 0x00000004)
#define BLSP_QUP_STATE_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000004)
#define BLSP0_QUP_INPUT_FIFOc_REG(c) \ #define BLSP_QUP_INPUT_FIFOc_REG(p, c) \
(BLSP0_QUP_REG_BASE + 0x00000218 + 4 * (c)) (BLSP_QUP_REG_BASE(p) + 0x00000218 + 4 * (c))
#define BLSP1_QUP_INPUT_FIFOc_REG(c) \
(BLSP1_QUP_REG_BASE + 0x00000218 + 4 * (c))
#define BLSP0_QUP_OUTPUT_FIFOc_REG(c) \ #define BLSP_QUP_OUTPUT_FIFOc_REG(p, c) \
(BLSP0_QUP_REG_BASE + 0x00000110 + 4 * (c)) (BLSP_QUP_REG_BASE(p) + 0x00000110 + 4 * (c))
#define BLSP1_QUP_OUTPUT_FIFOc_REG(c) \
(BLSP1_QUP_REG_BASE + 0x00000110 + 4 * (c))
#define BLSP0_QUP_MX_INPUT_COUNT_REG (BLSP0_QUP_REG_BASE + 0x00000200) #define BLSP_QUP_MX_INPUT_COUNT_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000200)
#define BLSP1_QUP_MX_INPUT_COUNT_REG (BLSP1_QUP_REG_BASE + 0x00000200)
#define BLSP0_QUP_MX_OUTPUT_COUNT_REG (BLSP0_QUP_REG_BASE + 0x00000100) #define BLSP_QUP_MX_OUTPUT_COUNT_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000100)
#define BLSP1_QUP_MX_OUTPUT_COUNT_REG (BLSP1_QUP_REG_BASE + 0x00000100)
#define BLSP0_QUP_MX_READ_COUNT_REG (BLSP0_QUP_REG_BASE + 0x00000208) #define BLSP_QUP_MX_READ_COUNT_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000208)
#define BLSP1_QUP_MX_READ_COUNT_REG (BLSP1_QUP_REG_BASE + 0x00000208)
#define BLSP0_QUP_MX_WRITE_COUNT_REG (BLSP0_QUP_REG_BASE + 0x00000150) #define BLSP_QUP_MX_WRITE_COUNT_REG(p) (BLSP_QUP_REG_BASE(p) + 0x00000150)
#define BLSP1_QUP_MX_WRITE_COUNT_REG (BLSP1_QUP_REG_BASE + 0x00000150)
#define BLSP_QUP_SW_RESET_REG(p) (BLSP_QUP_REG_BASE(p) + 0x0000000C)
#define BLSP0_QUP_SW_RESET_REG (BLSP0_QUP_REG_BASE + 0x0000000c)
#define BLSP1_QUP_SW_RESET_REG (BLSP1_QUP_REG_BASE + 0x0000000c)
#define QUP_STATE_VALID_BIT 2 #define QUP_STATE_VALID_BIT 2
#define QUP_STATE_VALID 1 #define QUP_STATE_VALID 1
#define QUP_STATE_MASK 0x3 #define QUP_STATE_MASK 0x3
#define QUP_CONFIG_MINI_CORE_MSK (0x0F << 8) #define QUP_CONFIG_MINI_CORE_MSK (0x0F << 8)
#define QUP_CONFIG_MINI_CORE_SPI (1 << 8) #define QUP_CONFIG_MINI_CORE_SPI (1 << 8)
#define QUP_CONF_INPUT_MSK (1 << 7) #define QUP_CONF_INPUT_MSK (1 << 7)
#define QUP_CONF_INPUT_ENA (0 << 7) #define QUP_CONF_INPUT_ENA (0 << 7)
#define QUP_CONF_NO_INPUT (1 << 7) #define QUP_CONF_NO_INPUT (1 << 7)
@ -111,7 +89,7 @@
#define QUP_CONF_OUTPUT_ENA (0 << 6) #define QUP_CONF_OUTPUT_ENA (0 << 6)
#define QUP_CONF_NO_OUTPUT (1 << 6) #define QUP_CONF_NO_OUTPUT (1 << 6)
#define QUP_STATE_RUN_STATE 0x1 #define QUP_STATE_RUN_STATE 0x1
#define QUP_STATE_RESET_STATE 0x0 #define QUP_STATE_RESET_STATE 0x0
#define QUP_STATE_PAUSE_STATE 0x3 #define QUP_STATE_PAUSE_STATE 0x3
#define SPI_BIT_WORD_MSK 0x1F #define SPI_BIT_WORD_MSK 0x1F
#define SPI_8_BIT_WORD 0x07 #define SPI_8_BIT_WORD 0x07
@ -191,52 +169,28 @@ struct blsp_spi {
unsigned int qup_deassert_wait; unsigned int qup_deassert_wait;
}; };
static const struct blsp_spi spi_reg[] = { struct blsp_spi spi_reg[CONFIG_IPQ_MAX_BLSP_QUPS];
/* BLSP0 registers for SPI interface */
{ #define BLSP_SPI_REGISTERS(x) \
BLSP0_SPI_CONFIG_REG, x.spi_config = BLSP_SPI_CONFIG_REG(bus);\
BLSP0_SPI_IO_CONTROL_REG, x.io_control = BLSP_SPI_IO_CONTROL_REG(bus);\
BLSP0_SPI_ERROR_FLAGS_REG, x.error_flags = BLSP_SPI_ERROR_FLAGS_REG(bus);\
BLSP0_SPI_ERROR_FLAGS_EN_REG, x.error_flags_en = BLSP_SPI_ERROR_FLAGS_EN_REG(bus);\
BLSP0_QUP_CONFIG_REG, x.qup_config = BLSP_QUP_CONFIG_REG(bus);\
BLSP0_QUP_ERROR_FLAGS_REG, x.qup_error_flags = BLSP_QUP_ERROR_FLAGS_REG(bus);\
BLSP0_QUP_ERROR_FLAGS_EN_REG, x.qup_error_flags_en = BLSP_QUP_ERROR_FLAGS_EN_REG(bus);\
BLSP0_QUP_OPERATIONAL_REG, x.qup_operational = BLSP_QUP_OPERATIONAL_REG(bus);\
BLSP0_QUP_IO_MODES_REG, x.qup_io_modes = BLSP_QUP_IO_MODES_REG(bus);\
BLSP0_QUP_STATE_REG, x.qup_state = BLSP_QUP_STATE_REG(bus);\
BLSP0_QUP_INPUT_FIFOc_REG(0), x.qup_input_fifo = BLSP_QUP_INPUT_FIFOc_REG(bus, 0);\
BLSP0_QUP_OUTPUT_FIFOc_REG(0), x.qup_output_fifo = BLSP_QUP_OUTPUT_FIFOc_REG(bus, 0);\
BLSP0_QUP_MX_INPUT_COUNT_REG, x.qup_mx_input_count = BLSP_QUP_MX_INPUT_COUNT_REG(bus);\
BLSP0_QUP_MX_OUTPUT_COUNT_REG, x.qup_mx_output_count = BLSP_QUP_MX_OUTPUT_COUNT_REG(bus);\
BLSP0_QUP_MX_READ_COUNT_REG, x.qup_mx_read_count = BLSP_QUP_MX_READ_COUNT_REG(bus);\
BLSP0_QUP_MX_WRITE_COUNT_REG, x.qup_mx_write_count = BLSP_QUP_MX_WRITE_COUNT_REG(bus);\
BLSP0_QUP_SW_RESET_REG, x.qup_sw_reset = BLSP_QUP_SW_RESET_REG(bus);\
BLSP0_QUP_OPERATIONAL_MASK, x.qup_op_mask = BLSP_QUP_OPERATIONAL_MASK(bus);\
BLSP0_SPI_DEASSERT_WAIT_REG, x.qup_deassert_wait = BLSP_SPI_DEASSERT_WAIT_REG(bus);\
},
/* BLSP1 registers for SPI interface */
{
BLSP1_SPI_CONFIG_REG,
BLSP1_SPI_IO_CONTROL_REG,
BLSP1_SPI_ERROR_FLAGS_REG,
BLSP1_SPI_ERROR_FLAGS_EN_REG,
BLSP1_QUP_CONFIG_REG,
BLSP1_QUP_ERROR_FLAGS_REG,
BLSP1_QUP_ERROR_FLAGS_EN_REG,
BLSP1_QUP_OPERATIONAL_REG,
BLSP1_QUP_IO_MODES_REG,
BLSP1_QUP_STATE_REG,
BLSP1_QUP_INPUT_FIFOc_REG(0),
BLSP1_QUP_OUTPUT_FIFOc_REG(0),
BLSP1_QUP_MX_INPUT_COUNT_REG,
BLSP1_QUP_MX_OUTPUT_COUNT_REG,
BLSP1_QUP_MX_READ_COUNT_REG,
BLSP1_QUP_MX_WRITE_COUNT_REG,
BLSP1_QUP_SW_RESET_REG,
BLSP1_QUP_OPERATIONAL_MASK,
BLSP1_SPI_DEASSERT_WAIT_REG,
},
};
#define SUCCESS 0 #define SUCCESS 0
#define FAILURE 1 #define FAILURE 1
@ -268,14 +222,6 @@ static inline struct ipq_spi_slave *to_ipq_spi(struct spi_slave *slave)
#define DATA_CONSUMER_PIPE_INDEX 0 #define DATA_CONSUMER_PIPE_INDEX 0
#define DATA_PRODUCER_PIPE_INDEX 1 #define DATA_PRODUCER_PIPE_INDEX 1
/* QUP0 BAM pipe numbers */
#define QUP0_DATA_CONSUMER_PIPE 12
#define QUP0_DATA_PRODUCER_PIPE 13
/* QUP1 BAM pipe numbers */
#define QUP1_DATA_CONSUMER_PIPE 6
#define QUP1_DATA_PRODUCER_PIPE 7
/* QUP0 BAM pipe groups */ /* QUP0 BAM pipe groups */
#define QUP0_DATA_PRODUCER_PIPE_GRP 0 #define QUP0_DATA_PRODUCER_PIPE_GRP 0
#define QUP0_DATA_CONSUMER_PIPE_GRP 0 #define QUP0_DATA_CONSUMER_PIPE_GRP 0
@ -284,8 +230,6 @@ static inline struct ipq_spi_slave *to_ipq_spi(struct spi_slave *slave)
#define QUP1_DATA_PRODUCER_PIPE_GRP 0 #define QUP1_DATA_PRODUCER_PIPE_GRP 0
#define QUP1_DATA_CONSUMER_PIPE_GRP 0 #define QUP1_DATA_CONSUMER_PIPE_GRP 0
#define NO_OF_QUPS 2
/* QUP EE */ /* QUP EE */
#define QUP_SPI_EE 0 #define QUP_SPI_EE 0

1
include/configs/ipq40xx.h
View file

@ -199,6 +199,7 @@ typedef struct {
#define CONFIG_SYS_MAX_NAND_DEVICE (CONFIG_IPQ_MAX_NAND_DEVICE + \ #define CONFIG_SYS_MAX_NAND_DEVICE (CONFIG_IPQ_MAX_NAND_DEVICE + \
CONFIG_IPQ_MAX_SPI_DEVICE) CONFIG_IPQ_MAX_SPI_DEVICE)
#define CONFIG_IPQ_MAX_BLSP_QUPS 2
#define CONFIG_IPQ_MAX_SPI_DEVICE 2 #define CONFIG_IPQ_MAX_SPI_DEVICE 2
#define CONFIG_IPQ_MAX_NAND_DEVICE 1 #define CONFIG_IPQ_MAX_NAND_DEVICE 1

1
include/configs/ipq5018.h
View file

@ -294,6 +294,7 @@ extern loff_t board_env_size;
#define CONFIG_IPQ_MAX_NAND_DEVICE 1 #define CONFIG_IPQ_MAX_NAND_DEVICE 1
#define CONFIG_IPQ_MAX_SPI_DEVICE 1 #define CONFIG_IPQ_MAX_SPI_DEVICE 1
#define CONFIG_IPQ_MAX_BLSP_QUPS 3
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0 #define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 1 #define CONFIG_IPQ_SPI_NOR_INFO_IDX 1

2
include/configs/ipq6018.h
View file

@ -248,7 +248,7 @@ extern loff_t board_env_size;
CONFIG_IPQ_MAX_SPI_DEVICE CONFIG_IPQ_MAX_SPI_DEVICE
#define CONFIG_IPQ_MAX_NAND_DEVICE 1 #define CONFIG_IPQ_MAX_NAND_DEVICE 1
#define CONFIG_IPQ_MAX_BLSP_QUPS 6
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0 #define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
#define CONFIG_NAND_FLASH_INFO_IDX CONFIG_QPIC_NAND_NAND_INFO_IDX #define CONFIG_NAND_FLASH_INFO_IDX CONFIG_QPIC_NAND_NAND_INFO_IDX

1
include/configs/ipq807x.h
View file

@ -214,6 +214,7 @@ extern loff_t board_env_size;
#define CONFIG_IPQ_MAX_NAND_DEVICE 1 #define CONFIG_IPQ_MAX_NAND_DEVICE 1
#define CONFIG_IPQ_MAX_SPI_DEVICE 1 #define CONFIG_IPQ_MAX_SPI_DEVICE 1
#define CONFIG_IPQ_MAX_BLSP_QUPS 6
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0 #define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 1 #define CONFIG_IPQ_SPI_NOR_INFO_IDX 1

1
include/configs/ipq9574.h
View file

@ -220,6 +220,7 @@ extern loff_t board_env_size;
#define CONFIG_IPQ_MAX_NAND_DEVICE 1 #define CONFIG_IPQ_MAX_NAND_DEVICE 1
#define CONFIG_IPQ_MAX_SPI_DEVICE 1 #define CONFIG_IPQ_MAX_SPI_DEVICE 1
#define CONFIG_IPQ_MAX_BLSP_QUPS 6
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0 #define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 1 #define CONFIG_IPQ_SPI_NOR_INFO_IDX 1