mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

mvebu fixes for v3.17

Browse source 
- kirkwood
     - final driver cleanup of ARCH_KIRKWOOD removal
     - fix DT based DSA
 
  - mvebu
     - use BCH ECC for the RN2120 and RN104/2 nand chips
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUFVCDAAoJEP45WPkGe8ZnEYcP/1M3SDwvSk4lwXbvJnZQUo+H
 NS32Ve0O85ZAVgdV8KiETBq2DJS1rioYrJ4QK5t5NhTFBkNpLZ8R3H7TBbobohaq
 hVLEidOx8RoV/igsGzx1fCsmWSQN/v+qvaQxvmHUrvAcha9QkcluIJ7gIZ3Oe8iD
 L/VFCcJDInmXGNw9pmcz00NR4OUIkOuaYibgz6ZgpfeeZJ/rWtSJkYR9DmzzwwU7
 yj8CU8ErcrgAeqe8o3fCAENZmQmnG14B3fPfBvJU02GZzfLGUSbVNe6hP2DuKnP6
 xpx2CCA1tJaovD9AVu70/vbH/E2sOqaydV7CYXLGwKA3E5X2XAnVMzS9pWVwMFMk
 ed+31urGaLm74y4XBcGtGCqVTzP/xXEX0dsKhxqiEGyz/jf/E6LrcBIuEnTm4iYl
 p0tGlqwZb97hXORZDitry5hUrgJ7Yu6tGUAEeZ6hvvaLhCADMctoNeaavthmSI+w
 YsdvAMM31XxyRgvgERvZfk+eNraV+X5EXyBQzJ8880279aV640nq/LjDcrq3kOZz
 3FcdrRnX1fSyhUStbs+5h+T7vQ5zJd07xtvK0xsdl1g7DaqURCKgla/VZ2xJuNrf
 eK8NTERF0Y/nwUXeq37ETDx25Kd4wTGgitzNAW8gkVp3gIvxGDpjDBQvwY1Bc6Fz
 NQN0g0pX4TSgcXJywEoX
 =D/As
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical

Merge "mvebu fixes for v3.17" from Jason Cooper:

 - kirkwood
    - final driver cleanup of ARCH_KIRKWOOD removal
    - fix DT based DSA

 - mvebu
    - use BCH ECC for the RN2120 and RN104/2 nand chips

* tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
  ARM: Kirkwood: Fix DT based DSA.
  ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
  ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
  cpufreq: Remove ARCH_KIRKWOOD dependency
  watchdog: Remove ARCH_KIRKWOOD dependency
  rtc: Remove ARCH_KIRKWOOD dependency
  leds: Remove ARCH_KIRKWOOD dependency
  thermal: Remove ARCH_KIRKWOOD dependency
  ata: Remove ARCH_KIRKWOOD dependency
  cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
This commit is contained in:
Olof Johansson 2014-09-23 22:29:09 -07:00
commit 422d9abf99
17 changed files with 89 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View file

@ -144,8 +144,8 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
kirkwood-openrd-client.dtb \ kirkwood-openrd-client.dtb \
kirkwood-openrd-ultimate.dtb \ kirkwood-openrd-ultimate.dtb \
kirkwood-rd88f6192.dtb \ kirkwood-rd88f6192.dtb \
kirkwood-rd88f6281-a0.dtb \ kirkwood-rd88f6281-z0.dtb \
kirkwood-rd88f6281-a1.dtb \ kirkwood-rd88f6281-a.dtb \
kirkwood-rs212.dtb \ kirkwood-rs212.dtb \
kirkwood-rs409.dtb \ kirkwood-rs409.dtb \
kirkwood-rs411.dtb \ kirkwood-rs411.dtb \

4
arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file

@ -143,6 +143,10 @@ nand@d0000 {
marvell,nand-enable-arbiter; marvell,nand-enable-arbiter;
nand-on-flash-bbt; nand-on-flash-bbt;
/* Use Hardware BCH ECC */
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */ reg = <0x0000000 0x180000>; /* 1.5MB */

4
arch/arm/boot/dts/armada-370-netgear-rn104.dts
View file

@ -145,6 +145,10 @@ nand@d0000 {
marvell,nand-enable-arbiter; marvell,nand-enable-arbiter;
nand-on-flash-bbt; nand-on-flash-bbt;
/* Use Hardware BCH ECC */
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */ reg = <0x0000000 0x180000>; /* 1.5MB */

4
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file

@ -223,6 +223,10 @@ nand@d0000 {
marvell,nand-enable-arbiter; marvell,nand-enable-arbiter;
nand-on-flash-bbt; nand-on-flash-bbt;
/* Use Hardware BCH ECC */
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */ reg = <0x0000000 0x180000>; /* 1.5MB */

16
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View file

@ -123,11 +123,11 @@ button@2 {
dsa@0 { dsa@0 {
compatible = "marvell,dsa"; compatible = "marvell,dsa";
#address-cells = <2>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
dsa,ethernet = <&eth0>; dsa,ethernet = <&eth0port>;
dsa,mii-bus = <&ethphy0>; dsa,mii-bus = <&mdio>;
switch@0 { switch@0 {
#address-cells = <1>; #address-cells = <1>;
@ -169,17 +169,13 @@ port@5 {
&mdio { &mdio {
status = "okay"; status = "okay";
ethphy0: ethernet-phy@ff {
reg = <0xff>; /* No phy attached */
speed = <1000>;
duplex = <1>;
};
}; };
&eth0 { &eth0 {
status = "okay"; status = "okay";
ethernet0-port@0 { ethernet0-port@0 {
phy-handle = <&ethphy0>; speed = <1000>;
duplex = <1>;
}; };
}; };

43
arch/arm/boot/dts/kirkwood-rd88f6281-a.dts Normal file
View file

@ -0,0 +1,43 @@
/*
* Marvell RD88F6181 A Board descrition
*
* Andrew Lunn <andrew@lunn.ch>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*
* This file contains the definitions for the board with the A0 or
* higher stepping of the SoC. The ethernet switch does not have a
* "wan" port.
*/
/dts-v1/;
#include "kirkwood-rd88f6281.dtsi"
/ {
model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa@0 {
switch@0 {
reg = <10 0>; /* MDIO address 10, switch 0 in tree */
};
};
};
&mdio {
status = "okay";
ethphy1: ethernet-phy@11 {
reg = <11>;
};
};
&eth1 {
status = "okay";
ethernet1-port@0 {
phy-handle = <&ethphy1>;
};
};

26
arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
View file

@ -1,26 +0,0 @@
/*
* Marvell RD88F6181 A0 Board descrition
*
* Andrew Lunn <andrew@lunn.ch>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*
* This file contains the definitions for the board with the A0 variant of
* the SoC. The ethernet switch does not have a "wan" port.
*/
/dts-v1/;
#include "kirkwood-rd88f6281.dtsi"
/ {
model = "Marvell RD88f6281 Reference design, with A0 SoC";
compatible = "marvell,rd88f6281-a0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa@0 {
switch@0 {
reg = <10 0>; /* MDIO address 10, switch 0 in tree */
};
};
};

18
arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts → arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
View file

@ -1,5 +1,5 @@
/* /*
* Marvell RD88F6181 A1 Board descrition * Marvell RD88F6181 Z0 stepping descrition
* *
* Andrew Lunn <andrew@lunn.ch> * Andrew Lunn <andrew@lunn.ch>
* *
@ -7,17 +7,17 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
* *
* This file contains the definitions for the board with the A1 variant of * This file contains the definitions for the board using the Z0
* the SoC. The ethernet switch has a "wan" port. * stepping of the SoC. The ethernet switch has a "wan" port.
*/ */
/dts-v1/; /dts-v1/;
#include "kirkwood-rd88f6281.dtsi" #include "kirkwood-rd88f6281.dtsi"
/ { / {
model = "Marvell RD88f6281 Reference design, with A1 SoC"; model = "Marvell RD88f6281 Reference design, with Z0 SoC";
compatible = "marvell,rd88f6281-a1", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood"; compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa@0 { dsa@0 {
switch@0 { switch@0 {
@ -28,4 +28,8 @@ port@4 {
}; };
}; };
}; };
}; };
&eth1 {
status = "disabled";
};

27
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View file

@ -37,7 +37,6 @@ pcie@1,0 {
ocp@f1000000 { ocp@f1000000 {
pinctrl: pin-controller@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_sdio_cd>;
pinctrl-names = "default"; pinctrl-names = "default";
pmx_sdio_cd: pmx-sdio-cd { pmx_sdio_cd: pmx-sdio-cd {
@ -69,8 +68,8 @@ dsa@0 {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
dsa,ethernet = <&eth0>; dsa,ethernet = <&eth0port>;
dsa,mii-bus = <&ethphy1>; dsa,mii-bus = <&mdio>;
switch@0 { switch@0 {
#address-cells = <1>; #address-cells = <1>;
@ -119,35 +118,19 @@ partition@100000 {
}; };
partition@300000 { partition@300000 {
label = "data"; label = "rootfs";
reg = <0x0300000 0x500000>; reg = <0x0300000 0x500000>;
}; };
}; };
&mdio { &mdio {
status = "okay"; status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
ethphy1: ethernet-phy@ff {
reg = <0xff>; /* No PHY attached */
speed = <1000>;
duple = <1>;
};
}; };
&eth0 { &eth0 {
status = "okay"; status = "okay";
ethernet0-port@0 { ethernet0-port@0 {
phy-handle = <&ethphy0>; speed = <1000>;
}; duplex = <1>;
};
&eth1 {
status = "okay";
ethernet1-port@0 {
phy-handle = <&ethphy1>;
}; };
}; };

4
arch/arm/boot/dts/kirkwood.dtsi
View file

@ -309,7 +309,7 @@ eth0: ethernet-controller@72000 {
marvell,tx-checksum-limit = <1600>; marvell,tx-checksum-limit = <1600>;
status = "disabled"; status = "disabled";
ethernet0-port@0 { eth0port: ethernet0-port@0 {
compatible = "marvell,kirkwood-eth-port"; compatible = "marvell,kirkwood-eth-port";
reg = <0>; reg = <0>;
interrupts = <11>; interrupts = <11>;
@ -342,7 +342,7 @@ eth1: ethernet-controller@76000 {
pinctrl-names = "default"; pinctrl-names = "default";
status = "disabled"; status = "disabled";
ethernet1-port@0 { eth1port: ethernet1-port@0 {
compatible = "marvell,kirkwood-eth-port"; compatible = "marvell,kirkwood-eth-port";
reg = <0>; reg = <0>;
interrupts = <15>; interrupts = <15>;

2
drivers/ata/Kconfig
View file

@ -299,7 +299,7 @@ config SATA_HIGHBANK
config SATA_MV config SATA_MV
tristate "Marvell SATA support" tristate "Marvell SATA support"
depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \ depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
select GENERIC_PHY select GENERIC_PHY
help help

2
drivers/cpufreq/Kconfig.arm
View file

@ -119,7 +119,7 @@ config ARM_INTEGRATOR
If in doubt, say Y. If in doubt, say Y.
config ARM_KIRKWOOD_CPUFREQ config ARM_KIRKWOOD_CPUFREQ
def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD def_bool MACH_KIRKWOOD
help help
This adds the CPUFreq driver for Marvell Kirkwood This adds the CPUFreq driver for Marvell Kirkwood
SoCs. SoCs.

2
drivers/cpuidle/Kconfig.arm
View file

@ -28,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE
config ARM_KIRKWOOD_CPUIDLE config ARM_KIRKWOOD_CPUIDLE
bool "CPU Idle Driver for Marvell Kirkwood SoCs" bool "CPU Idle Driver for Marvell Kirkwood SoCs"
depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on MACH_KIRKWOOD
help help
This adds the CPU Idle driver for Marvell Kirkwood SoCs. This adds the CPU Idle driver for Marvell Kirkwood SoCs.

4
drivers/leds/Kconfig
View file

@ -410,7 +410,7 @@ config LEDS_MC13783
config LEDS_NS2 config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs" tristate "LED support for Network Space v2 GPIO LEDs"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on MACH_KIRKWOOD
default y default y
help help
This option enable support for the dual-GPIO LED found on the This option enable support for the dual-GPIO LED found on the
@ -420,7 +420,7 @@ config LEDS_NS2
config LEDS_NETXBIG config LEDS_NETXBIG
tristate "LED support for Big Network series LEDs" tristate "LED support for Big Network series LEDs"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on MACH_KIRKWOOD
default y default y
help help
This option enable support for LEDs found on the LaCie 2Big This option enable support for LEDs found on the LaCie 2Big

2
drivers/rtc/Kconfig
View file

@ -1198,7 +1198,7 @@ config RTC_DRV_TX4939
config RTC_DRV_MV config RTC_DRV_MV
tristate "Marvell SoC RTC" tristate "Marvell SoC RTC"
depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU depends on ARCH_DOVE || ARCH_MVEBU
help help
If you say yes here you will get support for the in-chip RTC If you say yes here you will get support for the in-chip RTC
that can be found in some of Marvell's SoC devices, such as that can be found in some of Marvell's SoC devices, such as

2
drivers/thermal/Kconfig
View file

@ -143,7 +143,7 @@ config RCAR_THERMAL
config KIRKWOOD_THERMAL config KIRKWOOD_THERMAL
tristate "Temperature sensor on Marvell Kirkwood SoCs" tristate "Temperature sensor on Marvell Kirkwood SoCs"
depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on MACH_KIRKWOOD
depends on OF depends on OF
help help
Support for the Kirkwood thermal sensor driver into the Linux thermal Support for the Kirkwood thermal sensor driver into the Linux thermal

2
drivers/watchdog/Kconfig
View file

@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
config ORION_WATCHDOG config ORION_WATCHDOG
tristate "Orion watchdog" tristate "Orion watchdog"
depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
select WATCHDOG_CORE select WATCHDOG_CORE
help help
Say Y here if to include support for the watchdog timer Say Y here if to include support for the watchdog timer