Author: blogic Date: 2015-11-29 00:24:52 +0100 (Sun, 29 Nov 2015) New Revision: 47667
Modified: trunk/target/linux/ramips/dts/VOCORE-16M.dts trunk/target/linux/ramips/dts/VOCORE-8M.dts trunk/target/linux/ramips/dts/VOCORE.dtsi Log: ramips: adapt VoCore to new second spi device code Signed-off-by: ?\195?\129lvaro Fern?\195?\161ndez Rojas <[email protected]> Modified: trunk/target/linux/ramips/dts/VOCORE-16M.dts =================================================================== --- trunk/target/linux/ramips/dts/VOCORE-16M.dts 2015-11-28 23:24:40 UTC (rev 47666) +++ trunk/target/linux/ramips/dts/VOCORE-16M.dts 2015-11-28 23:24:52 UTC (rev 47667) @@ -2,40 +2,38 @@ /include/ "VOCORE.dtsi" -/ { - palmbus@10000000 { - spi@b00 { - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "w25q128"; - reg = <0>; - linux,modalias = "m25p80", "w25q128"; - spi-max-frequency = <10000000>; +&spi0 { + status = "okay"; - partition@0 { - label = "uboot"; - reg = <0x0 0x30000>; - read-only; - }; + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25q128"; + reg = <0>; + linux,modalias = "m25p80", "w25q128"; + spi-max-frequency = <10000000>; - partition@30000 { - label = "uboot-env"; - reg = <0x30000 0x10000>; - read-only; - }; + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x10000>; + read-only; + }; - partition@50000 { - label = "firmware"; - reg = <0x50000 0xfb0000>; - }; - }; + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0xfb0000>; + }; }; }; Modified: trunk/target/linux/ramips/dts/VOCORE-8M.dts =================================================================== --- trunk/target/linux/ramips/dts/VOCORE-8M.dts 2015-11-28 23:24:40 UTC (rev 47666) +++ trunk/target/linux/ramips/dts/VOCORE-8M.dts 2015-11-28 23:24:52 UTC (rev 47667) @@ -2,40 +2,38 @@ /include/ "VOCORE.dtsi" -/ { - palmbus@10000000 { - spi@b00 { - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fl064k"; - reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; - spi-max-frequency = <10000000>; +&spi0 { + status = "okay"; - partition@0 { - label = "uboot"; - reg = <0x0 0x30000>; - read-only; - }; + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fl064k"; + reg = <0>; + linux,modalias = "m25p80", "s25fl064k"; + spi-max-frequency = <10000000>; - partition@30000 { - label = "uboot-env"; - reg = <0x30000 0x10000>; - read-only; - }; + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x10000>; + read-only; + }; - partition@50000 { - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; }; }; Modified: trunk/target/linux/ramips/dts/VOCORE.dtsi =================================================================== --- trunk/target/linux/ramips/dts/VOCORE.dtsi 2015-11-28 23:24:40 UTC (rev 47666) +++ trunk/target/linux/ramips/dts/VOCORE.dtsi 2015-11-28 23:24:52 UTC (rev 47667) @@ -12,16 +12,6 @@ i2c@900 { status = "okay"; }; - - spi@b00 { - status = "okay"; - - spidev@1 { - compatible = "linux,spidev"; - spi-max-frequency = <10000000>; - reg = <1>; - }; - }; }; pinctrl { @@ -195,3 +185,13 @@ }; }; }; + +&spi1 { + status = "okay"; + + spidev@0 { + compatible = "linux,spidev"; + spi-max-frequency = <10000000>; + reg = <0>; + }; +}; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
