diff options
| author | Olof Johansson <olof@lixom.net> | 2014-08-23 01:57:22 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-08-23 01:57:57 -0400 |
| commit | 2136edf3bf5ee6dfda9ac7abe272a080c35dc811 (patch) | |
| tree | 47f7620d8b2ae8ea9914e1548029f21043fd73a1 | |
| parent | 95d516b9fca8ce77d6babd0c35513e7354441e7d (diff) | |
| parent | 495bccf3917b04c6727d720b56620e265c693ace (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 44b07e512c24..e06fbfc55bb7 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi | |||
| @@ -660,6 +660,8 @@ | |||
| 660 | clock-frequency = <100000>; | 660 | clock-frequency = <100000>; |
| 661 | resets = <&apb2_rst 0>; | 661 | resets = <&apb2_rst 0>; |
| 662 | status = "disabled"; | 662 | status = "disabled"; |
| 663 | #address-cells = <1>; | ||
| 664 | #size-cells = <0>; | ||
| 663 | }; | 665 | }; |
| 664 | 666 | ||
| 665 | i2c1: i2c@01c2b000 { | 667 | i2c1: i2c@01c2b000 { |
| @@ -670,6 +672,8 @@ | |||
| 670 | clock-frequency = <100000>; | 672 | clock-frequency = <100000>; |
| 671 | resets = <&apb2_rst 1>; | 673 | resets = <&apb2_rst 1>; |
| 672 | status = "disabled"; | 674 | status = "disabled"; |
| 675 | #address-cells = <1>; | ||
| 676 | #size-cells = <0>; | ||
| 673 | }; | 677 | }; |
| 674 | 678 | ||
| 675 | i2c2: i2c@01c2b400 { | 679 | i2c2: i2c@01c2b400 { |
| @@ -680,6 +684,8 @@ | |||
| 680 | clock-frequency = <100000>; | 684 | clock-frequency = <100000>; |
| 681 | resets = <&apb2_rst 2>; | 685 | resets = <&apb2_rst 2>; |
| 682 | status = "disabled"; | 686 | status = "disabled"; |
| 687 | #address-cells = <1>; | ||
| 688 | #size-cells = <0>; | ||
| 683 | }; | 689 | }; |
| 684 | 690 | ||
| 685 | i2c3: i2c@01c2b800 { | 691 | i2c3: i2c@01c2b800 { |
| @@ -690,6 +696,8 @@ | |||
| 690 | clock-frequency = <100000>; | 696 | clock-frequency = <100000>; |
| 691 | resets = <&apb2_rst 3>; | 697 | resets = <&apb2_rst 3>; |
| 692 | status = "disabled"; | 698 | status = "disabled"; |
| 699 | #address-cells = <1>; | ||
| 700 | #size-cells = <0>; | ||
| 693 | }; | 701 | }; |
| 694 | 702 | ||
| 695 | gmac: ethernet@01c30000 { | 703 | gmac: ethernet@01c30000 { |
