Merge branch 'for-2.6.24' of... (786d3693) · Commits · e / devices / android_kernel_xiaomi_markw

arch/powerpc/Kconfig.debug

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,6 @@ config PPC_EARLY_DEBUG_BEAT
	config PPC_EARLY_DEBUG_44x		config PPC_EARLY_DEBUG_44x
	bool "Early serial debugging for IBM/AMCC 44x CPUs"		bool "Early serial debugging for IBM/AMCC 44x CPUs"
	depends on 44x		depends on 44x
	select PPC_UDBG_16550
	help		help
	Select this to enable early debugging for IBM 44x chips via the		Select this to enable early debugging for IBM 44x chips via the
	inbuilt serial port.		inbuilt serial port.

arch/powerpc/boot/dts/bamboo.dts

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -98,11 +98,13 @@
	interrupt-parent = <&MAL0>;		interrupt-parent = <&MAL0>;
	interrupts = <0 1 2 3 4>;		interrupts = <0 1 2 3 4>;
	#interrupt-cells = <1>;		#interrupt-cells = <1>;
			#address-cells = <0>;
			#size-cells = <0>;
	interrupt-map = </TXEOB/ 0 &UIC0 a 4		interrupt-map = </TXEOB/ 0 &UIC0 a 4
	/RXEOB/ 1 &UIC0 b 4		/RXEOB/ 1 &UIC0 b 4
	/SERR/ 2 &UIC1 0 4		/SERR/ 2 &UIC1 0 4
	/TXDE/ 3 &UIC1 1 4		/TXDE/ 3 &UIC1 1 4
	/RXDE/ 4 &UIC1 3 4>;		/RXDE/ 4 &UIC1 2 4>;
	};		};

	POB0: opb {		POB0: opb {
	@@ -196,6 +198,7 @@
	};		};

	EMAC0: ethernet@ef600e00 {		EMAC0: ethernet@ef600e00 {
			linux,network-index = <0>;
	device_type = "network";		device_type = "network";
	compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";		compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
	interrupt-parent = <&UIC1>;		interrupt-parent = <&UIC1>;
	@@ -210,12 +213,13 @@
	rx-fifo-size = <1000>;		rx-fifo-size = <1000>;
	tx-fifo-size = <800>;		tx-fifo-size = <800>;
	phy-mode = "rmii";		phy-mode = "rmii";
	phy-map = <00000001>;		phy-map = <00000000>;
	zmii-device = <&ZMII0>;		zmii-device = <&ZMII0>;
	zmii-channel = <0>;		zmii-channel = <0>;
	};		};

	EMAC1: ethernet@ef600f00 {		EMAC1: ethernet@ef600f00 {
			linux,network-index = <1>;
	device_type = "network";		device_type = "network";
	compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";		compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
	interrupt-parent = <&UIC1>;		interrupt-parent = <&UIC1>;
	@@ -230,7 +234,7 @@
	rx-fifo-size = <1000>;		rx-fifo-size = <1000>;
	tx-fifo-size = <800>;		tx-fifo-size = <800>;
	phy-mode = "rmii";		phy-mode = "rmii";
	phy-map = <00000001>;		phy-map = <00000000>;
	zmii-device = <&ZMII0>;		zmii-device = <&ZMII0>;
	zmii-channel = <1>;		zmii-channel = <1>;
	};		};

arch/powerpc/boot/dts/sequoia.dts

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -241,6 +241,12 @@
	reg = <ef600d00 c>;		reg = <ef600d00 c>;
	};		};

			RGMII0: emac-rgmii@ef601000 {
			device_type = "rgmii-interface";
			compatible = "ibm,rgmii-440epx", "ibm,rgmii";
			reg = <ef601000 8>;
			};

	EMAC0: ethernet@ef600e00 {		EMAC0: ethernet@ef600e00 {
	linux,network-index = <0>;		linux,network-index = <0>;
	device_type = "network";		device_type = "network";
	@@ -261,10 +267,12 @@
	max-frame-size = <5dc>;		max-frame-size = <5dc>;
	rx-fifo-size = <1000>;		rx-fifo-size = <1000>;
	tx-fifo-size = <800>;		tx-fifo-size = <800>;
	phy-mode = "rmii";		phy-mode = "rgmii";
	phy-map = <00000000>;		phy-map = <00000000>;
	zmii-device = <&ZMII0>;		zmii-device = <&ZMII0>;
	zmii-channel = <0>;		zmii-channel = <0>;
			rgmii-device = <&RGMII0>;
			rgmii-channel = <0>;
	};		};

	EMAC1: ethernet@ef600f00 {		EMAC1: ethernet@ef600f00 {
	@@ -287,10 +295,12 @@
	max-frame-size = <5dc>;		max-frame-size = <5dc>;
	rx-fifo-size = <1000>;		rx-fifo-size = <1000>;
	tx-fifo-size = <800>;		tx-fifo-size = <800>;
	phy-mode = "rmii";		phy-mode = "rgmii";
	phy-map = <00000000>;		phy-map = <00000000>;
	zmii-device = <&ZMII0>;		zmii-device = <&ZMII0>;
	zmii-channel = <1>;		zmii-channel = <1>;
			rgmii-device = <&RGMII0>;
			rgmii-channel = <1>;
	};		};
	};		};
	};		};

arch/powerpc/boot/dts/walnut.dts

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -64,10 +64,15 @@
	MAL: mcmal {		MAL: mcmal {
	compatible = "ibm,mcmal-405gp", "ibm,mcmal";		compatible = "ibm,mcmal-405gp", "ibm,mcmal";
	dcr-reg = <180 62>;		dcr-reg = <180 62>;
	num-tx-chans = <2>;		num-tx-chans = <1>;
	num-rx-chans = <1>;		num-rx-chans = <1>;
	interrupt-parent = <&UIC0>;		interrupt-parent = <&UIC0>;
	interrupts = <a 4 b 4 c 4 d 4 e 4>;		interrupts = <
			b 4 /* TXEOB */
			c 4 /* RXEOB */
			a 4 /* SERR */
			d 4 /* TXDE */
			e 4 /* RXDE */>;
	};		};

	POB0: opb {		POB0: opb {
	@@ -118,9 +123,10 @@
	compatible = "ibm,emac-405gp", "ibm,emac";		compatible = "ibm,emac-405gp", "ibm,emac";
	interrupt-parent = <&UIC0>;		interrupt-parent = <&UIC0>;
	interrupts = <9 4 f 4>;		interrupts = <9 4 f 4>;
			local-mac-address = [000000000000]; /* Filled in by zImage */
	reg = <ef600800 70>;		reg = <ef600800 70>;
	mal-device = <&MAL>;		mal-device = <&MAL>;
	mal-tx-channel = <0 1>;		mal-tx-channel = <0>;
	mal-rx-channel = <0>;		mal-rx-channel = <0>;
	cell-index = <0>;		cell-index = <0>;
	max-frame-size = <5dc>;		max-frame-size = <5dc>;

arch/powerpc/boot/treeboot-walnut.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)

	/* setup the timebase clock to tick at the cpu frequency */		/* setup the timebase clock to tick at the cpu frequency */
	cpc0_cr1 = cpc0_cr1 & ~0x00800000;		cpc0_cr1 = cpc0_cr1 & ~0x00800000;
	mtdcr(DCRN_CPC0_CR1, cpc0_cr1);		mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
	tb = cpu;		tb = cpu;

	dt_fixup_cpu_clocks(cpu, tb, 0);		dt_fixup_cpu_clocks(cpu, tb, 0);
	@@ -109,6 +109,7 @@ static void walnut_flashsel_fixup(void)
	setprop(sram, "reg", reg_sram, sizeof(reg_sram));		setprop(sram, "reg", reg_sram, sizeof(reg_sram));
	}		}

			#define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
	static void walnut_fixups(void)		static void walnut_fixups(void)
	{		{
	ibm4xx_fixup_memsize();		ibm4xx_fixup_memsize();
	@@ -116,6 +117,7 @@ static void walnut_fixups(void)
	ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);		ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
	ibm4xx_fixup_ebc_ranges("/plb/ebc");		ibm4xx_fixup_ebc_ranges("/plb/ebc");
	walnut_flashsel_fixup();		walnut_flashsel_fixup();
			dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF);
	}		}

	void platform_init(void)		void platform_init(void)