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 diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
  19 index b3286d7ab75d..05dbe6bf4633 100644
  20 --- a/drivers/i2c/busses/i2c-pxa.c
  21 +++ b/drivers/i2c/busses/i2c-pxa.c
  22 @@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
  23                 .icr =  0x10,
  24                 .isr =  0x18,
  25                 .isar = 0x20,
  26 +               .fm = ICR_FM,
  27 +               .hs = ICR_HS,
  28         },
  29         [REGS_PXA3XX] = {
  30                 .ibmr = 0x00,
  31 @@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
  32                 .icr =  0x08,
  33                 .isr =  0x0c,
  34                 .isar = 0x10,
  35 +               .fm = ICR_FM,
  36 +               .hs = ICR_HS,
  37         },
  38         [REGS_CE4100] = {
  39                 .ibmr = 0x14,
  40 @@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
  41                 .icr =  0x00,
  42                 .isr =  0x04,
  43                 /* no isar register */
  44 +               .fm = ICR_FM,
  45 +               .hs = ICR_HS,
  46         },
  47         [REGS_PXA910] = {
  48                 .ibmr = 0x00,
  49 @@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
  50                 .isar = 0x20,
  51                 .ilcr = 0x28,
  52                 .iwcr = 0x30,
  53 +               .fm = ICR_FM,
  54 +               .hs = ICR_HS,
  55         },
  56         [REGS_A3700] = {
  57                 .ibmr = 0x00,
  58 @@ -1235,8 +1243,8 @@ static int i2c_pxa_probe(struct platform_device *dev)
  59         i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
  60         i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
  61         i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
  62 -       i2c->fm_mask = pxa_reg_layout[i2c_type].fm ? : ICR_FM;
  63 -       i2c->hs_mask = pxa_reg_layout[i2c_type].hs ? : ICR_HS;
  64 +       i2c->fm_mask = pxa_reg_layout[i2c_type].fm;
  65 +       i2c->hs_mask = pxa_reg_layout[i2c_type].hs;
  66
  67         if (i2c_type != REGS_CE4100)
  68                 i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
  69 --
  70 2.20.1
  71