Commit bc20deba authored by Arnd Bergmann's avatar Arnd Bergmann

Merge branch 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into fixes

* 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500:
  ARM: ux500: Correct SDI5 address and add some format changes
  ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT
  ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2adca567 76ff4e43
...@@ -483,6 +483,8 @@ i2c@80004000 { ...@@ -483,6 +483,8 @@ i2c@80004000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80004000 0x1000>; reg = <0x80004000 0x1000>;
interrupts = <0 21 0x4>; interrupts = <0 21 0x4>;
arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
v-i2c-supply = <&db8500_vape_reg>; v-i2c-supply = <&db8500_vape_reg>;
...@@ -494,6 +496,8 @@ i2c@80122000 { ...@@ -494,6 +496,8 @@ i2c@80122000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80122000 0x1000>; reg = <0x80122000 0x1000>;
interrupts = <0 22 0x4>; interrupts = <0 22 0x4>;
arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
v-i2c-supply = <&db8500_vape_reg>; v-i2c-supply = <&db8500_vape_reg>;
...@@ -505,6 +509,8 @@ i2c@80128000 { ...@@ -505,6 +509,8 @@ i2c@80128000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80128000 0x1000>; reg = <0x80128000 0x1000>;
interrupts = <0 55 0x4>; interrupts = <0 55 0x4>;
arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
v-i2c-supply = <&db8500_vape_reg>; v-i2c-supply = <&db8500_vape_reg>;
...@@ -516,6 +522,8 @@ i2c@80110000 { ...@@ -516,6 +522,8 @@ i2c@80110000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80110000 0x1000>; reg = <0x80110000 0x1000>;
interrupts = <0 12 0x4>; interrupts = <0 12 0x4>;
arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
v-i2c-supply = <&db8500_vape_reg>; v-i2c-supply = <&db8500_vape_reg>;
...@@ -527,6 +535,8 @@ i2c@8012a000 { ...@@ -527,6 +535,8 @@ i2c@8012a000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x8012a000 0x1000>; reg = <0x8012a000 0x1000>;
interrupts = <0 51 0x4>; interrupts = <0 51 0x4>;
arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
v-i2c-supply = <&db8500_vape_reg>; v-i2c-supply = <&db8500_vape_reg>;
...@@ -573,33 +583,38 @@ sdi@80126000 { ...@@ -573,33 +583,38 @@ sdi@80126000 {
interrupts = <0 60 0x4>; interrupts = <0 60 0x4>;
status = "disabled"; status = "disabled";
}; };
sdi@80118000 { sdi@80118000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80118000 0x1000>; reg = <0x80118000 0x1000>;
interrupts = <0 50 0x4>; interrupts = <0 50 0x4>;
status = "disabled"; status = "disabled";
}; };
sdi@80005000 { sdi@80005000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80005000 0x1000>; reg = <0x80005000 0x1000>;
interrupts = <0 41 0x4>; interrupts = <0 41 0x4>;
status = "disabled"; status = "disabled";
}; };
sdi@80119000 { sdi@80119000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80119000 0x1000>; reg = <0x80119000 0x1000>;
interrupts = <0 59 0x4>; interrupts = <0 59 0x4>;
status = "disabled"; status = "disabled";
}; };
sdi@80114000 { sdi@80114000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>; reg = <0x80114000 0x1000>;
interrupts = <0 99 0x4>; interrupts = <0 99 0x4>;
status = "disabled"; status = "disabled";
}; };
sdi@80008000 { sdi@80008000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>; reg = <0x80008000 0x1000>;
interrupts = <0 100 0x4>; interrupts = <0 100 0x4>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/irq.h>
#include <linux/platform_data/clk-ux500.h> #include <linux/platform_data/clk-ux500.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment