- while ((modalias_param[0]!='\0') && (i<SPI_DEV_MAX)) {
- struct spi_board_info chip; /* parport SPI board description placeholder*/
- struct spi_device *proxy; /* just need to check spi device result and add additional settings */
- modalias_param=strnarr(chip.modalias, modalias_param, " ,", sizeof(chip.modalias));
- if (modalias_param==NULL) {
- pr_err("%s: %d given modalias name is too long! See only that '%s'!\n", DRVNAME, i, chip.modalias);
- return -EINVAL;
- }
-
- /*
- * The modalias name MUST match the device_driver name
- * for the bus glue code to match and subsequently bind them.
- */
- chip.max_speed_hz = SPI_PARPORT_MAX_SPEED;
- chip.chip_select = i;
- chip.mode = spi_mode[i];
- chip.irq = pp->irq;
- chip.controller_data = pp; /* enable access to primary controller data */
- chip.platform_data = NULL; /* data area of SPI protocol driver */
- /* chip.bus_num = master->bus_num; // not needed for spi_new_device */
- i++; /* found new SPI protocol driver */
-
- if (spi_mode_cnt < i) {
- pr_warning("%s: No spi mode parameter given for device %d with driver '%s'. "
- "Will use default setting: %d\n",
- DRVNAME, i, chip.modalias, chip.mode);
- }
- pr_info("%s: Will load protocol driver: '%s' on CS%d with mode 0x%02x!\n",
- DRVNAME, chip.modalias, chip.chip_select, chip.mode);
-
- /*
- * Register spi device from board info settings.
- * Note that this will also call the probe inside the SPI protocall driver
- */
- proxy = spi_new_device(pp->bitbang.master, &chip);
- if (!proxy) {
- pr_err("%s: spi_new_device failed!\n", DRVNAME);
- return -ENODEV;
- }
- if (spi_bits_cnt < i) {
- pr_warning("%s: No spi bits per word parameter given for device %d with driver '%s'. "
- "Will use default setting: %d\n",
- DRVNAME, i, chip.modalias, spi_bits[i-1]);
- }
- proxy->bits_per_word=spi_bits[i-1];
- pr_info("%s: SPI device successfully registered at bus %s as device %s with %d bits/word\n", DRVNAME,
- proxy->dev.bus_id, chip.modalias, proxy->bits_per_word);
- }
+ for (i=0; (modalias_param[0]!='\0') && (i<SPI_DEV_MAX); i++) {
+ spi[i] = spi_alloc_device(pp->bitbang.master); /* kzalloc memory and add device to master controller */
+ if (NULL == spi[i]) {
+ while (i > 0) {
+ spi_dev_put(spi[--i]); /* free all spi devices from former spi_alloc_device */
+ }
+ return -ENOMEM;
+ }
+
+ /*
+ * first copy the modalias parameter
+ */
+ modalias_param=strnarr(spi[i]->modalias, modalias_param, " ,", sizeof(spi[i]->modalias));
+ if (NULL == spi[i]->modalias) {
+ pr_err("%s: %d given modalias name is too long! See only that '%s'!\n",
+ DRVNAME, i, spi[i]->modalias);
+ while (i >= 0) {
+ spi_dev_put(spi[i--]); /* free all spi devices */
+ }
+ return -EINVAL;
+ }
+
+ /*
+ * now setup the rest as it would be done by
+ * the spi_new_device from a given board_info
+ * structure.
+ */
+ spi[i]->max_speed_hz = SPI_PARPORT_MAX_SPEED;
+ spi[i]->chip_select = i;
+ spi[i]->master = pp->bitbang.master;
+ spi[i]->controller_data = pp; /* enable access to primary controller data */
+ spi[i]->controller_state = NULL; /* init state like in new_spi_device */
+ spi[i]->mode = spi_mode[i];
+ spi[i]->irq = spi_irq[i];
+ spi[i]->bits_per_word = spi_bits[i]; /* must normally be done by protocol driver */
+ spi[i]->dev.platform_data = (void *)NULL; /* data area of SPI protocol driver,
+ hot plug drivers must do that itself */
+ /*
+ * first only initialize the chipselect
+ * for that spi device to set it inactive
+ */
+ spi_parport_chipselect(spi[i], BITBANG_CS_INACTIVE);
+ if (spi_mode_cnt < (i+1)) {
+ pr_warning("%s: No spi mode parameter given for device %d with driver '%s'. "
+ "Will use default setting: %d\n",
+ DRVNAME, i, spi[i]->modalias, spi[i]->mode);
+ }
+ }
+ /* additional parameter checks and possibly logged warnings */
projects / pub / spi-gpio-pp.git / blobdiff