aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2013-07-04 03:55:27 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-07-21 18:53:32 -0400
commitc8078de853d51e9b86a2f025ee281b5a81c80655 (patch)
treec0ec3d71b4dd9e44d790293301a2c0a20ae81b4d /arch
parentd58e9a02e1435744d80a99742d1135a6921318eb (diff)
arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
in drivers/pinctrl/sirf, pingroup name is cko0 and cko1, but in dts, they are cko0 and cko1_rst. this patch fixes the error in dts. Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/atlas6.dtsi16
-rw-r--r--arch/arm/boot/dts/prima2.dtsi16
2 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 537041253db7..a0f2721ea583 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -521,16 +521,16 @@
521 sirf,function = "pulse_count"; 521 sirf,function = "pulse_count";
522 }; 522 };
523 }; 523 };
524 cko0_rst_pins_a: cko0_rst@0 { 524 cko0_pins_a: cko0@0 {
525 cko0_rst { 525 cko0 {
526 sirf,pins = "cko0_rstgrp"; 526 sirf,pins = "cko0grp";
527 sirf,function = "cko0_rst"; 527 sirf,function = "cko0";
528 }; 528 };
529 }; 529 };
530 cko1_rst_pins_a: cko1_rst@0 { 530 cko1_pins_a: cko1@0 {
531 cko1_rst { 531 cko1 {
532 sirf,pins = "cko1_rstgrp"; 532 sirf,pins = "cko1grp";
533 sirf,function = "cko1_rst"; 533 sirf,function = "cko1";
534 }; 534 };
535 }; 535 };
536 }; 536 };
diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 05e9489cf95c..bbeb623fc2c6 100644
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -515,16 +515,16 @@
515 sirf,function = "pulse_count"; 515 sirf,function = "pulse_count";
516 }; 516 };
517 }; 517 };
518 cko0_rst_pins_a: cko0_rst@0 { 518 cko0_pins_a: cko0@0 {
519 cko0_rst { 519 cko0 {
520 sirf,pins = "cko0_rstgrp"; 520 sirf,pins = "cko0grp";
521 sirf,function = "cko0_rst"; 521 sirf,function = "cko0";
522 }; 522 };
523 }; 523 };
524 cko1_rst_pins_a: cko1_rst@0 { 524 cko1_pins_a: cko1@0 {
525 cko1_rst { 525 cko1 {
526 sirf,pins = "cko1_rstgrp"; 526 sirf,pins = "cko1grp";
527 sirf,function = "cko1_rst"; 527 sirf,function = "cko1";
528 }; 528 };
529 }; 529 };
530 }; 530 };