Commit 2136edf3 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-dt-for-3.17-2' of...

Merge tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner DT changes, take 2" from Maxime Ripard:

Only a single patch in here that fixes a DTC warning.

* tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dt: sun6i: Add #address-cells and #size-cells to i2c controller nodes
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 95d516b9 495bccf3
...@@ -660,6 +660,8 @@ i2c0: i2c@01c2ac00 { ...@@ -660,6 +660,8 @@ i2c0: i2c@01c2ac00 {
clock-frequency = <100000>; clock-frequency = <100000>;
resets = <&apb2_rst 0>; resets = <&apb2_rst 0>;
status = "disabled"; status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
}; };
i2c1: i2c@01c2b000 { i2c1: i2c@01c2b000 {
...@@ -670,6 +672,8 @@ i2c1: i2c@01c2b000 { ...@@ -670,6 +672,8 @@ i2c1: i2c@01c2b000 {
clock-frequency = <100000>; clock-frequency = <100000>;
resets = <&apb2_rst 1>; resets = <&apb2_rst 1>;
status = "disabled"; status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
}; };
i2c2: i2c@01c2b400 { i2c2: i2c@01c2b400 {
...@@ -680,6 +684,8 @@ i2c2: i2c@01c2b400 { ...@@ -680,6 +684,8 @@ i2c2: i2c@01c2b400 {
clock-frequency = <100000>; clock-frequency = <100000>;
resets = <&apb2_rst 2>; resets = <&apb2_rst 2>;
status = "disabled"; status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
}; };
i2c3: i2c@01c2b800 { i2c3: i2c@01c2b800 {
...@@ -690,6 +696,8 @@ i2c3: i2c@01c2b800 { ...@@ -690,6 +696,8 @@ i2c3: i2c@01c2b800 {
clock-frequency = <100000>; clock-frequency = <100000>;
resets = <&apb2_rst 3>; resets = <&apb2_rst 3>;
status = "disabled"; status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
}; };
gmac: ethernet@01c30000 { gmac: ethernet@01c30000 {
......
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