.. | .. |
---|
722 | 722 | } |
---|
723 | 723 | |
---|
724 | 724 | switch (bus_speed) { |
---|
725 | | - case 100000: |
---|
| 725 | + case I2C_MAX_STANDARD_MODE_FREQ: |
---|
726 | 726 | dev->std_cfg = &std_cfg_table[BCM_SPD_100K]; |
---|
727 | 727 | break; |
---|
728 | | - case 400000: |
---|
| 728 | + case I2C_MAX_FAST_MODE_FREQ: |
---|
729 | 729 | dev->std_cfg = &std_cfg_table[BCM_SPD_400K]; |
---|
730 | 730 | break; |
---|
731 | | - case 1000000: |
---|
| 731 | + case I2C_MAX_FAST_MODE_PLUS_FREQ: |
---|
732 | 732 | dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ]; |
---|
733 | 733 | break; |
---|
734 | | - case 3400000: |
---|
| 734 | + case I2C_MAX_HIGH_SPEED_MODE_FREQ: |
---|
735 | 735 | /* Send mastercode at 100k */ |
---|
736 | 736 | dev->std_cfg = &std_cfg_table[BCM_SPD_100K]; |
---|
737 | 737 | dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ]; |
---|
.. | .. |
---|
750 | 750 | int rc = 0; |
---|
751 | 751 | struct bcm_kona_i2c_dev *dev; |
---|
752 | 752 | struct i2c_adapter *adap; |
---|
753 | | - struct resource *iomem; |
---|
754 | 753 | |
---|
755 | 754 | /* Allocate memory for private data structure */ |
---|
756 | 755 | dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); |
---|
.. | .. |
---|
762 | 761 | init_completion(&dev->done); |
---|
763 | 762 | |
---|
764 | 763 | /* Map hardware registers */ |
---|
765 | | - iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
---|
766 | | - dev->base = devm_ioremap_resource(dev->device, iomem); |
---|
| 764 | + dev->base = devm_platform_ioremap_resource(pdev, 0); |
---|
767 | 765 | if (IS_ERR(dev->base)) |
---|
768 | 766 | return -ENOMEM; |
---|
769 | 767 | |
---|
.. | .. |
---|
823 | 821 | /* Get the interrupt number */ |
---|
824 | 822 | dev->irq = platform_get_irq(pdev, 0); |
---|
825 | 823 | if (dev->irq < 0) { |
---|
826 | | - dev_err(dev->device, "no irq resource\n"); |
---|
827 | | - rc = -ENODEV; |
---|
| 824 | + rc = dev->irq; |
---|
828 | 825 | goto probe_disable_clk; |
---|
829 | 826 | } |
---|
830 | 827 | |
---|