ramips: adapt VoCore to new second spi device code

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 47667
This commit is contained in:
John Crispin 2015-11-28 23:24:52 +00:00
parent af14fa011c
commit 82557aee85
3 changed files with 66 additions and 70 deletions

View File

@ -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>;
};
};
};

View File

@ -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>;
};
};
};

View File

@ -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>;
};
};