ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices

Since initial support was provided for the Nomadik I2C driver, it
has been converted to an AMBA device. AMBA devices are probed in
a slightly different way to other devices, so we have to identify
them using an "arm,primecell" compatible string. As well as doing
just that, this patch specifies which regulators the controller
should use and requests a clock-speed. The latter is provided as
more of an example, as it's the same as the recently changed
default configuration.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index dc290d0b72f88883d41401fb13ed69f24bab615f..cbef6abbf9072d8849fdffafee11f609ef4cd879 100644 (file)
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -474,43 +474,58 @@
                };
 
                i2c@80004000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c";
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
                        reg = <0x80004000 0x1000>;
                        interrupts = <0 21 0x4>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
                };
 
                i2c@80122000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c";
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
                        reg = <0x80122000 0x1000>;
                        interrupts = <0 22 0x4>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
                };
 
                i2c@80128000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c";
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
                        reg = <0x80128000 0x1000>;
                        interrupts = <0 55 0x4>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
                };
 
                i2c@80110000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c";
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
                        reg = <0x80110000 0x1000>;
                        interrupts = <0 12 0x4>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
                };
 
                i2c@8012a000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c";
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
                        reg = <0x8012a000 0x1000>;
                        interrupts = <0 51 0x4>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
                };
 
                ssp@80002000 {