Patchwork [U-Boot,1/6,V2] EXYNOS5: FDT: Add I2C device node data

login
register
mail settings
Submitter Rajeshwari Birje
Date Nov. 14, 2012, 9:11 a.m.
Message ID <1352884279-24067-2-git-send-email-rajeshwari.s@samsung.com>
Download mbox | patch
Permalink /patch/198838/
State Superseded
Delegated to: Heiko Schocher
Headers show

Comments

Rajeshwari Birje - Nov. 14, 2012, 9:11 a.m.
Add I2C device node data for exynos

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
Changes in V2:
	Added Periph id to the I2C device node
 arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
 arch/arm/dts/exynos5250.dtsi       |   73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/dts/exynos-periph-id.dtsi
Heiko Schocher - Nov. 15, 2012, 6:56 a.m.
Hello Rajeshwari

On 14.11.2012 10:11, Rajeshwari Shinde wrote:
> Add I2C device node data for exynos
>
> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
> Acked-by: Simon Glass<sjg@chromium.org>
> ---
> Changes in V2:
> 	Added Periph id to the I2C device node
>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>   arch/arm/dts/exynos5250.dtsi       |   73 ++++++++++++++++++++++++++++++++++++
>   2 files changed, 108 insertions(+), 0 deletions(-)
>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi

I tried to apply this patch to current mainline head
commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5
Merge: 22b6fcb b3e5cd1
Author: Tom Rini <trini@ti.com>
Date:   Fri Nov 9 08:47:25 2012 -0700

     Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

but I got this error:

[hs@pollux u-boot-i2c]$ git am index.html
Applying: EXYNOS5: FDT: Add I2C device node data
error: arch/arm/dts/exynos5250.dtsi: does not exist in index
Patch failed at 0001 EXYNOS5: FDT: Add I2C device node data
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
[hs@pollux u-boot-i2c]$

Against which tree is this patchset? Should it go through
the samsung tree from Minkyu Kang found here:

http://git.denx.de/u-boot-samsung.git

? If so, I send my Acked-by for this patchset ...

bye,
Heiko
Rajeshwari Birje - Nov. 15, 2012, 10:58 a.m.
Hi Heiko,

Thank you for Acking the patchset.
It is based on u-boot-samsung, where the basic FDT support patches for
Exynos are submitted.

Regards
Rajeshwari Shinde.

On Thu, Nov 15, 2012 at 12:26 PM, Heiko Schocher <hs@denx.de> wrote:
> Hello Rajeshwari
>
>
> On 14.11.2012 10:11, Rajeshwari Shinde wrote:
>>
>> Add I2C device node data for exynos
>>
>> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
>> Acked-by: Simon Glass<sjg@chromium.org>
>> ---
>> Changes in V2:
>>         Added Periph id to the I2C device node
>>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>>   arch/arm/dts/exynos5250.dtsi       |   73
>> ++++++++++++++++++++++++++++++++++++
>>   2 files changed, 108 insertions(+), 0 deletions(-)
>>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi
>
>
> I tried to apply this patch to current mainline head
> commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5
> Merge: 22b6fcb b3e5cd1
> Author: Tom Rini <trini@ti.com>
> Date:   Fri Nov 9 08:47:25 2012 -0700
>
>     Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
>
> but I got this error:
>
> [hs@pollux u-boot-i2c]$ git am index.html
> Applying: EXYNOS5: FDT: Add I2C device node data
> error: arch/arm/dts/exynos5250.dtsi: does not exist in index
> Patch failed at 0001 EXYNOS5: FDT: Add I2C device node data
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> [hs@pollux u-boot-i2c]$
>
> Against which tree is this patchset? Should it go through
> the samsung tree from Minkyu Kang found here:
>
> http://git.denx.de/u-boot-samsung.git
>
> ? If so, I send my Acked-by for this patchset ...
>
> bye,
> Heiko
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Minkyu Kang - Nov. 15, 2012, 12:14 p.m.
Dear Heiko,

On 15/11/12 19:58, Rajeshwari Birje wrote:
> Hi Heiko,
> 
> Thank you for Acking the patchset.
> It is based on u-boot-samsung, where the basic FDT support patches for
> Exynos are submitted.
> 
> Regards
> Rajeshwari Shinde.
> 
> On Thu, Nov 15, 2012 at 12:26 PM, Heiko Schocher <hs@denx.de> wrote:
>> Hello Rajeshwari
>>
>>
>> On 14.11.2012 10:11, Rajeshwari Shinde wrote:
>>>
>>> Add I2C device node data for exynos
>>>
>>> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
>>> Acked-by: Simon Glass<sjg@chromium.org>
>>> ---
>>> Changes in V2:
>>>         Added Periph id to the I2C device node
>>>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>>>   arch/arm/dts/exynos5250.dtsi       |   73
>>> ++++++++++++++++++++++++++++++++++++
>>>   2 files changed, 108 insertions(+), 0 deletions(-)
>>>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi
>>
>>
>> I tried to apply this patch to current mainline head
>> commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5
>> Merge: 22b6fcb b3e5cd1
>> Author: Tom Rini <trini@ti.com>
>> Date:   Fri Nov 9 08:47:25 2012 -0700
>>
>>     Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
>>
>> but I got this error:
>>
>> [hs@pollux u-boot-i2c]$ git am index.html
>> Applying: EXYNOS5: FDT: Add I2C device node data
>> error: arch/arm/dts/exynos5250.dtsi: does not exist in index
>> Patch failed at 0001 EXYNOS5: FDT: Add I2C device node data
>> When you have resolved this problem run "git am --resolved".
>> If you would prefer to skip this patch, instead run "git am --skip".
>> To restore the original branch and stop patching run "git am --abort".
>> [hs@pollux u-boot-i2c]$
>>
>> Against which tree is this patchset? Should it go through
>> the samsung tree from Minkyu Kang found here:
>>
>> http://git.denx.de/u-boot-samsung.git
>>
>> ? If so, I send my Acked-by for this patchset ...
>>

I'll merge this patchset to samsung tree.
Please send your Ack.

Thanks.
Minkyu Kang.
Heiko Schocher - Nov. 19, 2012, 8:54 a.m.
Hello Rajeshwari,

On 14.11.2012 10:11, Rajeshwari Shinde wrote:
> Add I2C device node data for exynos
>
> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
> Acked-by: Simon Glass<sjg@chromium.org>
> ---
> Changes in V2:
> 	Added Periph id to the I2C device node
>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>   arch/arm/dts/exynos5250.dtsi       |   73 ++++++++++++++++++++++++++++++++++++
>   2 files changed, 108 insertions(+), 0 deletions(-)
>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Simon Glass - Nov. 19, 2012, 4:42 p.m.
Hi,

On Mon, Nov 19, 2012 at 12:54 AM, Heiko Schocher <hs@denx.de> wrote:
> Hello Rajeshwari,
>
>
> On 14.11.2012 10:11, Rajeshwari Shinde wrote:
>>
>> Add I2C device node data for exynos
>>
>> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
>> Acked-by: Simon Glass<sjg@chromium.org>
>> ---
>> Changes in V2:
>>         Added Periph id to the I2C device node
>>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>>   arch/arm/dts/exynos5250.dtsi       |   73
>> ++++++++++++++++++++++++++++++++++++
>>   2 files changed, 108 insertions(+), 0 deletions(-)
>>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi
>
>
> Acked-by: Heiko Schocher <hs@denx.de>

I'm sorry to say that there is one problem with this. It is using a
non-standard dtc feature (Stephen Warren's symbolic work), so I think
we should wait until Rajeshwari updates it to avoid that. I believe he
will do that soon.

Regards,
Simon

>
>
> bye,
> Heiko
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Minkyu Kang - Nov. 20, 2012, 1:36 a.m.
On 20/11/12 01:42, Simon Glass wrote:
> Hi,
> 
> On Mon, Nov 19, 2012 at 12:54 AM, Heiko Schocher <hs@denx.de> wrote:
>> Hello Rajeshwari,
>>
>>
>> On 14.11.2012 10:11, Rajeshwari Shinde wrote:
>>>
>>> Add I2C device node data for exynos
>>>
>>> Signed-off-by: Rajeshwari Shinde<rajeshwari.s@samsung.com>
>>> Acked-by: Simon Glass<sjg@chromium.org>
>>> ---
>>> Changes in V2:
>>>         Added Periph id to the I2C device node
>>>   arch/arm/dts/exynos-periph-id.dtsi |   35 +++++++++++++++++
>>>   arch/arm/dts/exynos5250.dtsi       |   73
>>> ++++++++++++++++++++++++++++++++++++
>>>   2 files changed, 108 insertions(+), 0 deletions(-)
>>>   create mode 100644 arch/arm/dts/exynos-periph-id.dtsi
>>
>>
>> Acked-by: Heiko Schocher <hs@denx.de>
> 
> I'm sorry to say that there is one problem with this. It is using a
> non-standard dtc feature (Stephen Warren's symbolic work), so I think
> we should wait until Rajeshwari updates it to avoid that. I believe he
> will do that soon.
> 

OK.

Thanks.
Minkyu Kang.

Patch

diff --git a/arch/arm/dts/exynos-periph-id.dtsi b/arch/arm/dts/exynos-periph-id.dtsi
new file mode 100644
index 0000000..cfe2c3d
--- /dev/null
+++ b/arch/arm/dts/exynos-periph-id.dtsi
@@ -0,0 +1,35 @@ 
+/*
+ * U-Boot Peripheral ID header file for Exynos boards
+ *
+ * Copyright (c) 2012 The Chromium OS Authors.
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * These values come from arch/arm/include/arch-exynos5/periph.h. For
+ * now they must be manually kept in sync.
+ */
+/define/ PERIPH_ID_I2C0 <0>;
+/define/ PERIPH_ID_I2C1 <1>;
+/define/ PERIPH_ID_I2C2 <2>;
+/define/ PERIPH_ID_I2C3 <3>;
+/define/ PERIPH_ID_I2C4 <4>;
+/define/ PERIPH_ID_I2C5 <5>;
+/define/ PERIPH_ID_I2C6 <6>;
+/define/ PERIPH_ID_I2C7 <7>;
diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi
index db22db6..ae71ae4 100644
--- a/arch/arm/dts/exynos5250.dtsi
+++ b/arch/arm/dts/exynos5250.dtsi
@@ -18,6 +18,7 @@ 
 */
 
 /include/ "skeleton.dtsi"
+/include/ "exynos-periph-id.dtsi"
 
 / {
 	compatible = "samsung,exynos5250";
@@ -33,4 +34,76 @@ 
 		compatible = "samsung,exynos-tmu";
 		reg = <0x10060000 0xffff>;
 	};
+
+	i2c@12c60000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12C60000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C0>;
+		interrupts = <0 56 0>;
+	};
+
+	i2c@12c70000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12C70000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C1>;
+		interrupts = <0 57 0>;
+	};
+
+	i2c@12c80000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12C80000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C2>;
+		interrupts = <0 58 0>;
+	};
+
+	i2c@12c90000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12C90000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C3>;
+		interrupts = <0 59 0>;
+	};
+
+	i2c@12ca0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12CA0000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C4>;
+		interrupts = <0 60 0>;
+	};
+
+	i2c@12cb0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12CB0000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C5>;
+		interrupts = <0 61 0>;
+	};
+
+	i2c@12cc0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12CC0000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C6>;
+		interrupts = <0 62 0>;
+	};
+
+	i2c@12cd0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		reg = <0x12CD0000 0x100>;
+		samsung,periph-id = <PERIPH_ID_I2C7>;
+		interrupts = <0 63 0>;
+	};
 };