Commit c4568d6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code
  powerpc/pseries: Correct VIO bus accounting problem in CMO env.
  powerpc: More printing warning fixes for the l64 to ll64 conversion
  powerpc: Remove arch/ppc cruft from Kconfig
  powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
  powerpc/embedded6xx: Update defconfigs
  powerpc/8xx: Update defconfigs
  powerpc/86xx: Update defconfigs
  powerpc/83xx: Update defconfigs
  powerpc/85xx: Update defconfigs
  powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed
  powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
  powerpc/44x: Update PowerPC 44x defconfigs
  powerpc/40x: Update PowerPC 40x defconfigs
  powerpc/85xx: Fix typo in mpc8572ds dts
  powerpc/44x: Warp patches for the new NDFC driver
  powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info
parents 78a768b6 4c456a67

arch/powerpc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -876,10 +876,6 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



# XXX source "arch/ppc/8xx_io/Kconfig"



# XXX source "arch/ppc/8260_io/Kconfig"



source "arch/powerpc/sysdev/qe_lib/Kconfig"



source "lib/Kconfig"

arch/powerpc/boot/cuboot-warp.c

+0 −43
Original line number Diff line number Diff line
@@ -18,57 +18,14 @@ 


static bd_t bd;



static void warp_fixup_one_nor(u32 from, u32 to)

{

	void *devp;

	char name[50];

	u32 v[2];



	sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);



	devp = finddevice(name);

	if (!devp)

		return;



	if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {

		v[0] = to;

		setprop(devp, "reg", v, sizeof(v));



		printf("NOR 64M fixup %x -> %x\r\n", from, to);

	}

}





static void warp_fixups(void)

{

	ibm440ep_fixup_clocks(66000000, 11059200, 50000000);

	ibm4xx_sdram_fixup_memsize();

	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");

	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);



	/* Fixup for 64M flash on Rev A boards. */

	if (bd.bi_flashsize == 0x4000000) {

		void *devp;

		u32 v[3];



		devp = finddevice("/plb/opb/ebc/nor_flash@0,0");

		if (!devp)

			return;



		/* Fixup the size */

		if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {

			v[2] = bd.bi_flashsize;

			setprop(devp, "reg", v, sizeof(v));

}



		/* Fixup parition offsets */

		warp_fixup_one_nor(0x300000, 0x3f00000);

		warp_fixup_one_nor(0x340000, 0x3f40000);

		warp_fixup_one_nor(0x380000, 0x3f80000);

	}

}





void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

		   unsigned long r6, unsigned long r7)

{

arch/powerpc/boot/dts/haleakala.dts

+4 −1
Original line number Diff line number Diff line
@@ -89,8 +89,11 @@ 
		clock-frequency = <0>; /* Filled in by U-Boot */



		SDRAM0: memory-controller {

			compatible = "ibm,sdram-405exr";

			compatible = "ibm,sdram-405exr", "ibm,sdram-4xx-ddr2";

			dcr-reg = <0x010 0x002>;

			interrupt-parent = <&UIC2>;

			interrupts = <0x5 0x4	/* ECC DED Error */ 

				      0x6 0x4>;	/* ECC SEC Error */ 

		};



		MAL0: mcmal {

arch/powerpc/boot/dts/kilauea.dts

+4 −1
Original line number Diff line number Diff line
@@ -90,8 +90,11 @@ 
		clock-frequency = <0>; /* Filled in by U-Boot */



		SDRAM0: memory-controller {

			compatible = "ibm,sdram-405ex";

			compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";

			dcr-reg = <0x010 0x002>;

			interrupt-parent = <&UIC2>;

			interrupts = <0x5 0x4	/* ECC DED Error */ 

				      0x6 0x4>;	/* ECC SEC Error */ 

		};



		MAL0: mcmal {

arch/powerpc/boot/dts/makalu.dts

+4 −1
Original line number Diff line number Diff line
@@ -90,8 +90,11 @@ 
		clock-frequency = <0>; /* Filled in by U-Boot */



		SDRAM0: memory-controller {

			compatible = "ibm,sdram-405ex";

			compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";

			dcr-reg = <0x010 0x002>;

			interrupt-parent = <&UIC2>;

			interrupts = <0x5 0x4 /* ECC DED Error */

			              0x6 0x4 /* ECC SEC Error */ >;

		};



		MAL0: mcmal {

CRA Git | Maintained and supported by SUSTech CRA and CCSE