Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 422d9abf authored Sep 23, 2014 by Olof Johansson

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

parents 2fee8c1d ace85781

arch/arm/boot/dts/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 \

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -143,6 +143,10 @@
	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 */

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,10 @@
	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 */

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,6 +223,10 @@
	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 */

arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts

+6 −10

Original line number	Original line	Diff line number	Diff line
	@@ -123,11 +123,11 @@

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

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