diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-04-04 16:08:06 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 16:08:06 -0600 |
| commit | 8aa15d82df291b398d604b527a20310f10c1c706 (patch) | |
| tree | 2e72fa6d6cdcb62c63f31bbd0f15a28909db7625 /arch/arm/boot/dts/tegra30-beaver.dts | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
| parent | 4d82d0587b4a964ea3a7c73aa044b433000527dd (diff) | |
| download | blackbird-op-linux-8aa15d82df291b398d604b527a20310f10c1c706.tar.gz blackbird-op-linux-8aa15d82df291b398d604b527a20310f10c1c706.zip | |
Merge branch 'for-3.10/soc' into for-3.10/clk
Diffstat (limited to 'arch/arm/boot/dts/tegra30-beaver.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 8ff2ff20e4a3..6248b2445b32 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -257,7 +257,7 @@ sdhci@78000000 { status = "okay"; - cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + cd-gpios = <&gpio 69 1>; /* gpio PI5 */ wp-gpios = <&gpio 155 0>; /* gpio PT3 */ power-gpios = <&gpio 31 0>; /* gpio PD7 */ bus-width = <4>; @@ -268,6 +268,19 @@ bus-width = <8>; }; + clocks { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + clk32k_in: clock { + compatible = "fixed-clock"; + reg=<0>; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + }; + regulators { compatible = "simple-bus"; #address-cells = <1>; |
