Author: rmilecki Date: 2015-11-26 12:43:16 +0100 (Thu, 26 Nov 2015) New Revision: 47653
Modified: trunk/target/linux/bcm53xx/files/drivers/mtd/spi-nor/bcm53xxspiflash.c Log: bcm53xx: update bcm53xxspiflash to match spi-nor backported from 4.4-rc1 Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/bcm53xx/files/drivers/mtd/spi-nor/bcm53xxspiflash.c =================================================================== --- trunk/target/linux/bcm53xx/files/drivers/mtd/spi-nor/bcm53xxspiflash.c 2015-11-26 11:17:54 UTC (rev 47652) +++ trunk/target/linux/bcm53xx/files/drivers/mtd/spi-nor/bcm53xxspiflash.c 2015-11-26 11:43:16 UTC (rev 47653) @@ -10,7 +10,6 @@ struct bcm53xxsf { struct spi_device *spi; - struct mtd_info mtd; struct spi_nor nor; }; @@ -27,7 +26,7 @@ } static int bcm53xxspiflash_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, - int len, int write_enable) + int len) { struct bcm53xxsf *b53sf = nor->priv; u8 *cmd = kzalloc(len + 1, GFP_KERNEL); @@ -58,7 +57,7 @@ spi_message_init(&m); cmd[cmd_len++] = SPINOR_OP_READ; - if (b53sf->mtd.size > 0x1000000) + if (nor->mtd.size > 0x1000000) cmd[cmd_len++] = (from & 0xFF000000) >> 24; cmd[cmd_len++] = (from & 0x00FF0000) >> 16; cmd[cmd_len++] = (from & 0x0000FF00) >> 8; @@ -98,7 +97,7 @@ spi_message_init(&m); cmd[cmd_len++] = nor->program_opcode; - if (b53sf->mtd.size > 0x1000000) + if (nor->mtd.size > 0x1000000) cmd[cmd_len++] = (to & 0xFF000000) >> 24; cmd[cmd_len++] = (to & 0x00FF0000) >> 16; cmd[cmd_len++] = (to & 0x0000FF00) >> 8; @@ -128,7 +127,7 @@ i = 0; cmd[i++] = nor->erase_opcode; - if (b53sf->mtd.size > 0x1000000) + if (nor->mtd.size > 0x1000000) cmd[i++] = (offs & 0xFF000000) >> 24; cmd[i++] = ((offs & 0x00FF0000) >> 16); cmd[i++] = ((offs & 0x0000FF00) >> 8); @@ -189,9 +188,7 @@ nor = &b53sf->nor; b53sf->spi = spi; - b53sf->mtd.priv = &b53sf->nor; - nor->mtd = &b53sf->mtd; nor->dev = &spi->dev; nor->read_reg = bcm53xxspiflash_read_reg; nor->write_reg = bcm53xxspiflash_write_reg; @@ -206,7 +203,7 @@ return err; parser_data.of_node = spi->master->dev.parent->of_node; - err = mtd_device_parse_register(&b53sf->mtd, probes, &parser_data, + err = mtd_device_parse_register(&nor->mtd, probes, &parser_data, NULL, 0); if (err) return err; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
