diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
| commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
| tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/boot/dts/p1010rdb.dtsi | |
| parent | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (diff) | |
| parent | e96dde2b5edbc0d385ccced05fb5db68c070b0d4 (diff) | |
| download | blackbird-op-linux-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.tar.gz blackbird-op-linux-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/p1010rdb.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/p1010rdb.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi b/arch/powerpc/boot/dts/p1010rdb.dtsi index d4c4a7730285..49776143a1b8 100644 --- a/arch/powerpc/boot/dts/p1010rdb.dtsi +++ b/arch/powerpc/boot/dts/p1010rdb.dtsi @@ -138,7 +138,7 @@ #size-cells = <1>; compatible = "spansion,s25sl12801"; reg = <0>; - spi-max-frequency = <50000000>; + spi-max-frequency = <40000000>; partition@0 { /* 1MB for u-boot Bootloader Image */ @@ -196,7 +196,7 @@ }; tbi-phy@3 { - device-type = "tbi-phy"; + device_type = "tbi-phy"; reg = <0x3>; }; }; |
