diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
| commit | 4bd93343124ffe3bdc21c2b485c2668aba6651be (patch) | |
| tree | 4dd0ce9dd93b3ed8bce9126e4407207fb01839cd /arch/arm/boot/dts/atlas6.dtsi | |
| parent | 19c2c5f55e31ac8da87bb8efe0cf86aa933e6a2f (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | lwn-4bd93343124ffe3bdc21c2b485c2668aba6651be.tar.gz lwn-4bd93343124ffe3bdc21c2b485c2668aba6651be.zip | |
Merge tag 'v3.11-rc5' into asoc-dapm
Linux 3.11-rc5
Diffstat (limited to 'arch/arm/boot/dts/atlas6.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/atlas6.dtsi | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index 9866cd736dee..a0f2721ea583 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -485,6 +485,12 @@ sirf,function = "usp0"; }; }; + usp0_uart_nostreamctrl_pins_a: usp0@1 { + usp0 { + sirf,pins = "usp0_uart_nostreamctrl_grp"; + sirf,function = "usp0_uart_nostreamctrl"; + }; + }; usp1_pins_a: usp1@0 { usp1 { sirf,pins = "usp1grp"; @@ -515,16 +521,16 @@ sirf,function = "pulse_count"; }; }; - cko0_rst_pins_a: cko0_rst@0 { - cko0_rst { - sirf,pins = "cko0_rstgrp"; - sirf,function = "cko0_rst"; + cko0_pins_a: cko0@0 { + cko0 { + sirf,pins = "cko0grp"; + sirf,function = "cko0"; }; }; - cko1_rst_pins_a: cko1_rst@0 { - cko1_rst { - sirf,pins = "cko1_rstgrp"; - sirf,function = "cko1_rst"; + cko1_pins_a: cko1@0 { + cko1 { + sirf,pins = "cko1grp"; + sirf,function = "cko1"; }; }; }; |