You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Cc: linux-i2c@vger.kernel.org
|
|
Subject: [PATCH 07/17] i2c: pxa: always set fm and hs members for each type
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Always set the fm and hs members of struct pxa_reg_layout. These
|
|
members are already taking space, we don't need code as well.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
|
@@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_lay
|
|
.icr = 0x10,
|
|
.isr = 0x18,
|
|
.isar = 0x20,
|
|
+ .fm = ICR_FM,
|
|
+ .hs = ICR_HS,
|
|
},
|
|
[REGS_PXA3XX] = {
|
|
.ibmr = 0x00,
|
|
@@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_lay
|
|
.icr = 0x08,
|
|
.isr = 0x0c,
|
|
.isar = 0x10,
|
|
+ .fm = ICR_FM,
|
|
+ .hs = ICR_HS,
|
|
},
|
|
[REGS_CE4100] = {
|
|
.ibmr = 0x14,
|
|
@@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_lay
|
|
.icr = 0x00,
|
|
.isr = 0x04,
|
|
/* no isar register */
|
|
+ .fm = ICR_FM,
|
|
+ .hs = ICR_HS,
|
|
},
|
|
[REGS_PXA910] = {
|
|
.ibmr = 0x00,
|
|
@@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_lay
|
|
.isar = 0x20,
|
|
.ilcr = 0x28,
|
|
.iwcr = 0x30,
|
|
+ .fm = ICR_FM,
|
|
+ .hs = ICR_HS,
|
|
},
|
|
[REGS_A3700] = {
|
|
.ibmr = 0x00,
|
|
@@ -1229,8 +1237,8 @@ static int i2c_pxa_probe(struct platform
|
|
i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
|
|
i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
|
|
i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
|
|
- i2c->fm_mask = pxa_reg_layout[i2c_type].fm ? : ICR_FM;
|
|
- i2c->hs_mask = pxa_reg_layout[i2c_type].hs ? : ICR_HS;
|
|
+ i2c->fm_mask = pxa_reg_layout[i2c_type].fm;
|
|
+ i2c->hs_mask = pxa_reg_layout[i2c_type].hs;
|
|
|
|
if (i2c_type != REGS_CE4100)
|
|
i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
|