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

Commit 3455229f 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/kvm: Fix build failure with HV KVM and CBE
  powerpc/ps3: Fix lv1_gpu_attribute hcall
  powerpc/ps3: Fix PS3 repository build warnings
  powerpc/ps3: irq: Remove IRQF_DISABLED
  powerpc/irq: Remove IRQF_DISABLED
  powerpc/numa: NUMA topology support for PowerNV
  powerpc: Add System RAM to /proc/iomem
  powerpc: Add KVM as module to defconfigs
  powerpc/kvm: Fix build with older toolchains
  powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.
  powerpc/5200: add support for charon board
parents 732783fe 5ccf55dd

arch/powerpc/boot/dts/charon.dts

0 → 100644
+236 −0
Original line number Diff line number Diff line 
/*

 * charon board Device Tree Source

 *

 * Copyright (C) 2007 Semihalf

 * Marian Balakowicz <m8@semihalf.com>

 *

 * Copyright (C) 2010 DENX Software Engineering GmbH

 * Heiko Schocher <hs@denx.de>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



/dts-v1/;



/ {

	model = "anon,charon";

	compatible = "anon,charon";

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&mpc5200_pic>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,5200@0 {

			device_type = "cpu";

			reg = <0>;

			d-cache-line-size = <32>;

			i-cache-line-size = <32>;

			d-cache-size = <0x4000>;	// L1, 16K

			i-cache-size = <0x4000>;	// L1, 16K

			timebase-frequency = <0>;	// from bootloader

			bus-frequency = <0>;		// from bootloader

			clock-frequency = <0>;		// from bootloader

		};

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x08000000>;	// 128MB

	};



	soc5200@f0000000 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "fsl,mpc5200-immr";

		ranges = <0 0xf0000000 0x0000c000>;

		reg = <0xf0000000 0x00000100>;

		bus-frequency = <0>;		// from bootloader

		system-frequency = <0>;		// from bootloader



		cdm@200 {

			compatible = "fsl,mpc5200-cdm";

			reg = <0x200 0x38>;

		};



		mpc5200_pic: interrupt-controller@500 {

			// 5200 interrupts are encoded into two levels;

			interrupt-controller;

			#interrupt-cells = <3>;

			compatible = "fsl,mpc5200-pic";

			reg = <0x500 0x80>;

		};



		timer@600 {	// General Purpose Timer

			compatible = "fsl,mpc5200-gpt";

			reg = <0x600 0x10>;

			interrupts = <1 9 0>;

			fsl,has-wdt;

		};



		can@900 {

			compatible = "fsl,mpc5200-mscan";

			interrupts = <2 17 0>;

			reg = <0x900 0x80>;

		};



		can@980 {

			compatible = "fsl,mpc5200-mscan";

			interrupts = <2 18 0>;

			reg = <0x980 0x80>;

		};



		gpio_simple: gpio@b00 {

			compatible = "fsl,mpc5200-gpio";

			reg = <0xb00 0x40>;

			interrupts = <1 7 0>;

			gpio-controller;

			#gpio-cells = <2>;

		};



		usb@1000 {

			compatible = "fsl,mpc5200-ohci","ohci-be";

			reg = <0x1000 0xff>;

			interrupts = <2 6 0>;

		};



		dma-controller@1200 {

			device_type = "dma-controller";

			compatible = "fsl,mpc5200-bestcomm";

			reg = <0x1200 0x80>;

			interrupts = <3 0 0  3 1 0  3 2 0  3 3 0

			              3 4 0  3 5 0  3 6 0  3 7 0

			              3 8 0  3 9 0  3 10 0  3 11 0

			              3 12 0  3 13 0  3 14 0  3 15 0>;

		};



		xlb@1f00 {

			compatible = "fsl,mpc5200-xlb";

			reg = <0x1f00 0x100>;

		};



		serial@2000 {		// PSC1

			compatible = "fsl,mpc5200-psc-uart";

			reg = <0x2000 0x100>;

			interrupts = <2 1 0>;

		};



		serial@2400 {		// PSC3

			compatible = "fsl,mpc5200-psc-uart";

			reg = <0x2400 0x100>;

			interrupts = <2 3 0>;

		};



		ethernet@3000 {

			compatible = "fsl,mpc5200-fec";

			reg = <0x3000 0x400>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <2 5 0>;

			fixed-link = <1 1 100 0 0>;

		};



		mdio@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200-mdio";

			reg = <0x3000 0x400>;       // fec range, since we need to setup fec interrupts

			interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.

		};



		ata@3a00 {

			compatible = "fsl,mpc5200-ata";

			reg = <0x3a00 0x100>;

			interrupts = <2 7 0>;

		};



		i2c@3d00 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200-i2c","fsl-i2c";

			reg = <0x3d00 0x40>;

			interrupts = <2 15 0>;

		};





		i2c@3d40 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200-i2c","fsl-i2c";

			reg = <0x3d40 0x40>;

			interrupts = <2 16 0>;



			dtt@28 {

				compatible = "national,lm80";

				reg = <0x28>;

			};



			rtc@68 {

				compatible = "dallas,ds1374";

				reg = <0x68>;

			};

		};



		sram@8000 {

			compatible = "fsl,mpc5200-sram";

			reg = <0x8000 0x4000>;

		};

	};



	localbus {

		compatible = "fsl,mpc5200-lpb","simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;

		ranges = <	0 0 0xfc000000 0x02000000

				1 0 0xe0000000 0x04000000 // CS1 range, SM501

				3 0 0xe8000000 0x00080000>;



		flash@0,0 {

			compatible = "cfi-flash";

			reg = <0 0 0x02000000>;

			bank-width = <4>;

			device-width = <2>;

			#size-cells = <1>;

			#address-cells = <1>;

		};



		display@1,0 {

			compatible = "smi,sm501";

			reg = <1 0x00000000 0x00800000

			       1 0x03e00000 0x00200000>;

			mode = "640x480-32@60";

			interrupts = <1 1 3>;

			little-endian;

		};



		mram0@3,0 {

			compatible = "mtd-ram";

			reg = <3 0x00000 0x80000>;

			bank-width = <1>;

		};

	};



	pci@f0000d00 {

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		compatible = "fsl,mpc5200-pci";

		reg = <0xf0000d00 0x100>;

		interrupt-map-mask = <0xf800 0 0 7>;

		interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3

				 0xc000 0 0 2 &mpc5200_pic 0 0 3

				 0xc000 0 0 3 &mpc5200_pic 0 0 3

				 0xc000 0 0 4 &mpc5200_pic 0 0 3>;

		clock-frequency = <0>; // From boot loader

		interrupts = <2 8 0 2 9 0 2 10 0>;

		bus-range = <0 0>;

		ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000

			  0x02000000 0 0x90000000 0x90000000 0 0x10000000

			  0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;

	};

};

arch/powerpc/configs/52xx/tqm5200_defconfig

+12 −8
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_SPARSE_IRQ=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_KALLSYMS is not set

# CONFIG_EPOLL is not set
@@ -17,7 +18,6 @@ CONFIG_PPC_MPC5200_SIMPLE=y 
CONFIG_PPC_MPC5200_BUGFIX=y

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_BESTCOMM=y

CONFIG_SPARSE_IRQ=y

CONFIG_PM=y

# CONFIG_PCI is not set

CONFIG_NET=y
@@ -38,17 +38,18 @@ CONFIG_MTD=y 
CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_OF_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_ROM=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_PLATRAM=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

# CONFIG_MISC_DEVICES is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_ATA=y
@@ -56,13 +57,11 @@ CONFIG_PATA_MPC52xx=y 
CONFIG_PATA_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_LXT_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC_MPC52xx=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_SERIAL_MPC52xx=y

CONFIG_SERIAL_MPC52xx_CONSOLE=y

CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
@@ -70,7 +69,13 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 
CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MPC=y

CONFIG_SENSORS_LM80=y

CONFIG_WATCHDOG=y

CONFIG_MFD_SM501=y

CONFIG_FB=y

CONFIG_FB_FOREIGN_ENDIAN=y

CONFIG_FB_SM501=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_DEVICE_CLASS is not set
@@ -80,10 +85,10 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 
CONFIG_USB_STORAGE=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_DS1374=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_INOTIFY=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y
@@ -102,7 +107,6 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_HUNG_TASK=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_PCBC=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/powerpc/configs/ppc64_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -485,3 +485,7 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_LZO=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_VIRTUALIZATION=y

CONFIG_KVM_BOOK3S_64=m

CONFIG_KVM_BOOK3S_64_HV=y

CONFIG_VHOST_NET=m

arch/powerpc/configs/pseries_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -362,3 +362,7 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_LZO=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_VIRTUALIZATION=y

CONFIG_KVM_BOOK3S_64=m

CONFIG_KVM_BOOK3S_64_HV=y

CONFIG_VHOST_NET=m

arch/powerpc/include/asm/floppy.h

+2 −2
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ static int fd_request_irq(void) 
{

	if (can_use_virtual_dma)

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

	else

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

}



static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)