Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1231170 > unrolled thread

[PATCH v2] i2c-ocores: support big-endian register layout

Started byMax Filippov <jcmvbkbc@gmail.com>
First post2015-09-23 08:40 +0200
Last post2015-09-24 23:40 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2] i2c-ocores: support big-endian register layout Max Filippov <jcmvbkbc@gmail.com> - 2015-09-23 08:40 +0200
    Re: [PATCH v2] i2c-ocores: support big-endian register layout Peter Korsgaard <peter@korsgaard.com> - 2015-09-24 22:00 +0200
      Re: [PATCH v2] i2c-ocores: support big-endian register layout Max Filippov <jcmvbkbc@gmail.com> - 2015-09-24 23:30 +0200
        Re: [PATCH v2] i2c-ocores: support big-endian register layout Peter Korsgaard <peter@korsgaard.com> - 2015-09-24 23:40 +0200

#1231170 — [PATCH v2] i2c-ocores: support big-endian register layout

FromMax Filippov <jcmvbkbc@gmail.com>
Date2015-09-23 08:40 +0200
Subject[PATCH v2] i2c-ocores: support big-endian register layout
Message-ID<qbLSG-4C7-7@gated-at.bofh.it>
This allows using OpenCores I2C controller attached to its host in
native-endian mode with bi-endian CPUs. Example of such system is Xtensa
XTFPGA platform.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
Changes v1->v2:
- expand changelog with motivation for the change.

 drivers/i2c/busses/i2c-ocores.c | 31 +++++++++++++++++++++++++++----
 include/linux/i2c-ocores.h      |  1 +
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index abf5db7..11b7b87 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -92,6 +92,16 @@ static void oc_setreg_32(struct ocores_i2c *i2c, int reg, u8 value)
 	iowrite32(value, i2c->base + (reg << i2c->reg_shift));
 }
 
+static void oc_setreg_16be(struct ocores_i2c *i2c, int reg, u8 value)
+{
+	iowrite16be(value, i2c->base + (reg << i2c->reg_shift));
+}
+
+static void oc_setreg_32be(struct ocores_i2c *i2c, int reg, u8 value)
+{
+	iowrite32be(value, i2c->base + (reg << i2c->reg_shift));
+}
+
 static inline u8 oc_getreg_8(struct ocores_i2c *i2c, int reg)
 {
 	return ioread8(i2c->base + (reg << i2c->reg_shift));
@@ -107,6 +117,16 @@ static inline u8 oc_getreg_32(struct ocores_i2c *i2c, int reg)
 	return ioread32(i2c->base + (reg << i2c->reg_shift));
 }
 
+static inline u8 oc_getreg_16be(struct ocores_i2c *i2c, int reg)
+{
+	return ioread16be(i2c->base + (reg << i2c->reg_shift));
+}
+
+static inline u8 oc_getreg_32be(struct ocores_i2c *i2c, int reg)
+{
+	return ioread32be(i2c->base + (reg << i2c->reg_shift));
+}
+
 static inline void oc_setreg(struct ocores_i2c *i2c, int reg, u8 value)
 {
 	i2c->setreg(i2c, reg, value);
@@ -428,6 +448,9 @@ static int ocores_i2c_probe(struct platform_device *pdev)
 		i2c->reg_io_width = 1; /* Set to default value */
 
 	if (!i2c->setreg || !i2c->getreg) {
+		bool be = pdata ? pdata->big_endian :
+			of_device_is_big_endian(pdev->dev.of_node);
+
 		switch (i2c->reg_io_width) {
 		case 1:
 			i2c->setreg = oc_setreg_8;
@@ -435,13 +458,13 @@ static int ocores_i2c_probe(struct platform_device *pdev)
 			break;
 
 		case 2:
-			i2c->setreg = oc_setreg_16;
-			i2c->getreg = oc_getreg_16;
+			i2c->setreg = be ? oc_setreg_16be : oc_setreg_16;
+			i2c->getreg = be ? oc_getreg_16be : oc_getreg_16;
 			break;
 
 		case 4:
-			i2c->setreg = oc_setreg_32;
-			i2c->getreg = oc_getreg_32;
+			i2c->setreg = be ? oc_setreg_32be : oc_setreg_32;
+			i2c->getreg = be ? oc_getreg_32be : oc_getreg_32;
 			break;
 
 		default:
diff --git a/include/linux/i2c-ocores.h b/include/linux/i2c-ocores.h
index 1c06b5c..01edd96 100644
--- a/include/linux/i2c-ocores.h
+++ b/include/linux/i2c-ocores.h
@@ -15,6 +15,7 @@ struct ocores_i2c_platform_data {
 	u32 reg_shift; /* register offset shift value */
 	u32 reg_io_width; /* register io read/write width */
 	u32 clock_khz; /* input clock in kHz */
+	bool big_endian; /* registers are big endian */
 	u8 num_devices; /* number of devices in the devices list */
 	struct i2c_board_info const *devices; /* devices connected to the bus */
 };
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1232406

FromPeter Korsgaard <peter@korsgaard.com>
Date2015-09-24 22:00 +0200
Message-ID<qckQq-4u2-13@gated-at.bofh.it>
In reply to#1231170
>>>>> "Max" == Max Filippov <jcmvbkbc@gmail.com> writes:

 > This allows using OpenCores I2C controller attached to its host in
 > native-endian mode with bi-endian CPUs. Example of such system is Xtensa
 > XTFPGA platform.

 > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 > ---
 > Changes v1->v2:
 > - expand changelog with motivation for the change.

You should also document the big-endian property in
Documentation/devicetree/bindings/i2c/i2c-ocores.txt, otherwise it looks
good.

With that added:

Acked-by: Peter Korsgaard <peter@korsgaard.com>

-- 
Bye, Peter Korsgaard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1232443

FromMax Filippov <jcmvbkbc@gmail.com>
Date2015-09-24 23:30 +0200
Message-ID<qcmfx-6CQ-35@gated-at.bofh.it>
In reply to#1232406
Peter,

On Thu, Sep 24, 2015 at 10:55 PM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Max" == Max Filippov <jcmvbkbc@gmail.com> writes:
>
>  > This allows using OpenCores I2C controller attached to its host in
>  > native-endian mode with bi-endian CPUs. Example of such system is Xtensa
>  > XTFPGA platform.
>
>  > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
>  > ---
>  > Changes v1->v2:
>  > - expand changelog with motivation for the change.
>
> You should also document the big-endian property in
> Documentation/devicetree/bindings/i2c/i2c-ocores.txt, otherwise it looks
> good.

'big-endian' and 'native-endian' are common properties documented
in the Documentation/devicetree/bindings/common-properties.txt

-- 
Thanks.
-- Max
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1232446

FromPeter Korsgaard <peter@korsgaard.com>
Date2015-09-24 23:40 +0200
Message-ID<qcmpc-6Pk-5@gated-at.bofh.it>
In reply to#1232443
>>>>> "Max" == Max Filippov <jcmvbkbc@gmail.com> writes:

Hi,

 >> You should also document the big-endian property in
 >> Documentation/devicetree/bindings/i2c/i2c-ocores.txt, otherwise it looks
 >> good.

 > 'big-endian' and 'native-endian' are common properties documented
 > in the Documentation/devicetree/bindings/common-properties.txt

Ok, then it looks good to me.

-- 
Bye, Peter Korsgaard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web