target/linux/generic/backport-5.4/809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch

   1 From: Russell King <rmk+kernel@armlinux.org.uk>
   2 Bcc: linux@mail.armlinux.org.uk
   3 Cc: linux-i2c@vger.kernel.org
   4 Subject: [PATCH 07/17] i2c: pxa: always set fm and hs members for each type
   5 MIME-Version: 1.0
   6 Content-Disposition: inline
   7 Content-Transfer-Encoding: 8bit
   8 Content-Type: text/plain; charset="utf-8"
   9
  10 Always set the fm and hs members of struct pxa_reg_layout. These
  11 members are already taking space, we don't need code as well.
  12
  13 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  14 ---
  15  drivers/i2c/busses/i2c-pxa.c | 12 ++++++++++--
  16  1 file changed, 10 insertions(+), 2 deletions(-)
  17
  18 --- a/drivers/i2c/busses/i2c-pxa.c
  19 +++ b/drivers/i2c/busses/i2c-pxa.c
  20 @@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_lay
  21                 .icr =  0x10,
  22                 .isr =  0x18,
  23                 .isar = 0x20,
  24 +               .fm = ICR_FM,
  25 +               .hs = ICR_HS,
  26         },
  27         [REGS_PXA3XX] = {
  28                 .ibmr = 0x00,
  29 @@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_lay
  30                 .icr =  0x08,
  31                 .isr =  0x0c,
  32                 .isar = 0x10,
  33 +               .fm = ICR_FM,
  34 +               .hs = ICR_HS,
  35         },
  36         [REGS_CE4100] = {
  37                 .ibmr = 0x14,
  38 @@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_lay
  39                 .icr =  0x00,
  40                 .isr =  0x04,
  41                 /* no isar register */
  42 +               .fm = ICR_FM,
  43 +               .hs = ICR_HS,
  44         },
  45         [REGS_PXA910] = {
  46                 .ibmr = 0x00,
  47 @@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_lay
  48                 .isar = 0x20,
  49                 .ilcr = 0x28,
  50                 .iwcr = 0x30,
  51 +               .fm = ICR_FM,
  52 +               .hs = ICR_HS,
  53         },
  54         [REGS_A3700] = {
  55                 .ibmr = 0x00,
  56 @@ -1229,8 +1237,8 @@ static int i2c_pxa_probe(struct platform
  57         i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
  58         i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
  59         i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
  60 -       i2c->fm_mask = pxa_reg_layout[i2c_type].fm ? : ICR_FM;
  61 -       i2c->hs_mask = pxa_reg_layout[i2c_type].hs ? : ICR_HS;
  62 +       i2c->fm_mask = pxa_reg_layout[i2c_type].fm;
  63 +       i2c->hs_mask = pxa_reg_layout[i2c_type].hs;
  64
  65         if (i2c_type != REGS_CE4100)
  66                 i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;