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

Commit dece8ada authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge branch 'merge' into next 



Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parents a68c33f3 f991db1c

arch/powerpc/boot/dts/mpc5121.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
		compatible = "fsl,mpc5121-immr";

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		ranges = <0x0 0x80000000 0x400000>;

		reg = <0x80000000 0x400000>;

		bus-frequency = <66000000>;	/* 66 MHz ips bus */

arch/powerpc/boot/dts/mpc5125twr.dts

+5 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
		compatible = "fsl,mpc5121-immr";

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		ranges = <0x0 0x80000000 0x400000>;

		reg = <0x80000000 0x400000>;

		bus-frequency = <66000000>;	// 66 MHz ips bus
@@ -189,6 +188,10 @@ 
			reg = <0xA000 0x1000>;

		};



		// disable USB1 port

		// TODO:

		// correct pinmux config and fix USB3320 ulpi dependency

		// before re-enabling it

		usb@3000 {

			compatible = "fsl,mpc5121-usb2-dr";

			reg = <0x3000 0x400>;
@@ -197,6 +200,7 @@ 
			interrupts = <43 0x8>;

			dr_mode = "host";

			phy_type = "ulpi";

			status = "disabled";

		};



		// 5125 PSCs are not 52xx or 5121 PSC compatible

arch/powerpc/configs/52xx/cm5200_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_EXPERT=y 
CONFIG_PPC_MPC52xx=y

CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_SPARSE_IRQ=y

CONFIG_PM=y

# CONFIG_PCI is not set
@@ -71,6 +70,8 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y

CONFIG_USB_STORAGE=y

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

arch/powerpc/configs/52xx/lite5200b_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ CONFIG_PPC_MPC52xx=y 
CONFIG_PPC_MPC5200_SIMPLE=y

CONFIG_PPC_LITE5200=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SPARSE_IRQ=y
@@ -59,6 +58,8 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MPC=y

# CONFIG_HWMON is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

arch/powerpc/configs/52xx/motionpro_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_EXPERT=y 
CONFIG_PPC_MPC52xx=y

CONFIG_PPC_MPC5200_SIMPLE=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_SPARSE_IRQ=y

CONFIG_PM=y

# CONFIG_PCI is not set
@@ -84,6 +83,8 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_DMADEVICES=y

CONFIG_PPC_BESTCOMM=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set