History

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

Olof Johansson committed 12 years ago

Commit 2136edf2 parents 95d516b 495bccf1 file · +8 −0Browse files

Unified · Split

arch/arm/boot/dts/sun6i-a31.dtsi+8−0
@@ -660,6 +660,8 @@ · 659 unmodified lines
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 @@ · 4 unmodified lines
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 @@ · 4 unmodified lines
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 @@ · 4 unmodified lines
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 {