Subject: Re: [PATCH] [v2] powerpc: introduce basic support for the Freescale P1022DS reference board

From: Felix Radensky <[email-masked]>
Date: Sat, 03 Jul 2010 10:01:42 +0300

Hi Timur,

There are currently no drivers in mainline for FSL eSPI controller and eSPI flash.
They are present only in FSL BSP kernel. Do you think it makes sense to keep
DTS entries for something that is not supported ?

Felix.

On 7/3/2010 1:25 AM, Timur Tabi wrote:
> Introduce basic support for the Freescale P1022DS reference board, based on the
> Freescale BSP for this board.  This patch excludes the DIU, SSI, and MMC/SD
> drivers.  Only a 36-bit DTS is provided.
>
> Update mpc86xx_smp_defconfig and mpc85xx_defconfig to support the P1022DS.
> This means enabling 64-bit physical address support, increasing the maximum
> zone order to 12 (to allow the DIU driver to allocate large chunks), and
> clean up the audio options to disable the deprecated OSS support.
>
> Signed-off-by: Timur Tabi<[email-masked]>
> ---
>
> This patch is for 2.6.36.
>
>   arch/powerpc/boot/dts/p1022ds.dts          |  633 ++++++++++++++++++++++++++++
>   arch/powerpc/configs/mpc85xx_defconfig     |   34 +-
>   arch/powerpc/configs/mpc85xx_smp_defconfig |   34 +-
>   arch/powerpc/platforms/85xx/Kconfig        |    8 +
>   arch/powerpc/platforms/85xx/Makefile       |    1 +
>   arch/powerpc/platforms/85xx/p1022_ds.c     |  148 +++++++
>   6 files changed, 814 insertions(+), 44 deletions(-)
>   create mode 100644 arch/powerpc/boot/dts/p1022ds.dts
>   create mode 100644 arch/powerpc/platforms/85xx/p1022_ds.c
>
> diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts
> new file mode 100644
> index 0000000..8bcb10b
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/p1022ds.dts
> @@ -0,0 +1,633 @@
> +/*
> + * P1022 DS 36Bit Physical Address Map Device Tree Source
> + *
> + * Copyright 2010 Freescale Semiconductor, Inc.
> + *
> + * This file is licensed under the terms of the GNU General Public License
> + * version 2.  This program is licensed "as is" without any warranty of any
> + * kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +/ {
> +	model = "fsl,P1022";
> +	compatible = "fsl,P1022DS";
> +	#address-cells =<2>;
> +	#size-cells =<2>;
> +	interrupt-parent =<&mpic>;
> +
> +	aliases {
> +		ethernet0 =&enet0;
> +		ethernet1 =&enet1;
> +		serial0 =&serial0;
> +		serial1 =&serial1;
> +		pci0 =&pci0;
> +		pci1 =&pci1;
> +		pci2 =&pci2;
> +	};
> +
> +	cpus {
> +		#address-cells =<1>;
> +		#size-cells =<0>;
> +
> +		PowerPC,P1022@0 {
> +			device_type = "cpu";
> +			reg =<0x0>;
> +			next-level-cache =<&L2>;
> +		};
> +
> +		PowerPC,P1022@1 {
> +			device_type = "cpu";
> +			reg =<0x1>;
> +			next-level-cache =<&L2>;
> +		};
> +	};
> +
> +	memory {
> +		device_type = "memory";
> +	};
> +
> +	localbus@fffe05000 {
> +		#address-cells =<2>;
> +		#size-cells =<1>;
> +		compatible = "fsl,p1022-elbc", "fsl,elbc", "simple-bus";
> +		reg =<0 0xffe05000 0 0x1000>;
> +		interrupts =<19 2>;
> +
> +		ranges =<0x0 0x0 0xf 0xe8000000 0x08000000
> +			  0x1 0x0 0xf 0xe0000000 0x08000000
> +			  0x2 0x0 0x0 0xffa00000 0x00040000
> +			  0x3 0x0 0xf 0xffdf0000 0x00008000>;
> +
> +		nor@0,0 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			compatible = "cfi-flash";
> +			reg =<0x0 0x0 0x8000000>;
> +			bank-width =<2>;
> +			device-width =<1>;
> +
> +			partition@0 {
> +				reg =<0x0 0x03000000>;
> +				label = "ramdisk-nor";
> +				read-only;
> +			};
> +
> +			partition@3000000 {
> +				reg =<0x03000000 0x00e00000>;
> +				label = "diagnostic-nor";
> +				read-only;
> +			};
> +
> +			partition@3e00000 {
> +				reg =<0x03e00000 0x00200000>;
> +				label = "dink-nor";
> +				read-only;
> +			};
> +
> +			partition@4000000 {
> +				reg =<0x04000000 0x00400000>;
> +				label = "kernel-nor";
> +				read-only;
> +			};
> +
> +			partition@4400000 {
> +				reg =<0x04400000 0x03b00000>;
> +				label = "jffs2-nor";
> +			};
> +
> +			partition@7f00000 {
> +				reg =<0x07f00000 0x00080000>;
> +				label = "dtb-nor";
> +				read-only;
> +			};
> +
> +			partition@7f80000 {
> +				reg =<0x07f80000 0x00080000>;
> +				label = "u-boot-nor";
> +				read-only;
> +			};
> +		};
> +
> +		nand@2,0 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			compatible = "fsl,elbc-fcm-nand";
> +			reg =<0x2 0x0 0x40000>;
> +
> +			partition@0 {
> +				reg =<0x0 0x02000000>;
> +				label = "u-boot-nand";
> +				read-only;
> +			};
> +
> +			partition@2000000 {
> +				reg =<0x02000000 0x10000000>;
> +				label = "jffs2-nand";
> +			};
> +
> +			partition@12000000 {
> +				reg =<0x12000000 0x10000000>;
> +				label = "ramdisk-nand";
> +				read-only;
> +			};
> +
> +			partition@22000000 {
> +				reg =<0x22000000 0x04000000>;
> +				label = "kernel-nand";
> +			};
> +
> +			partition@26000000 {
> +				reg =<0x26000000 0x01000000>;
> +				label = "dtb-nand";
> +				read-only;
> +			};
> +
> +			partition@27000000 {
> +				reg =<0x27000000 0x19000000>;
> +				label = "reserved-nand";
> +			};
> +		};
> +	};
> +
> +	soc@fffe00000 {
> +		#address-cells =<1>;
> +		#size-cells =<1>;
> +		device_type = "soc";
> +		compatible = "fsl,p1022-immr", "simple-bus";
> +		ranges =<0x0 0xf 0xffe00000 0x100000>;
> +		bus-frequency =<0>;		// Filled out by uboot.
> +
> +		ecm-law@0 {
> +			compatible = "fsl,ecm-law";
> +			reg =<0x0 0x1000>;
> +			fsl,num-laws =<12>;
> +		};
> +
> +		ecm@1000 {
> +			compatible = "fsl,p1022-ecm", "fsl,ecm";
> +			reg =<0x1000 0x1000>;
> +			interrupts =<16 2>;
> +		};
> +
> +		memory-controller@2000 {
> +			compatible = "fsl,p1022-memory-controller";
> +			reg =<0x2000 0x1000>;
> +			interrupts =<16 2>;
> +		};
> +
> +		i2c@3000 {
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			cell-index =<0>;
> +			compatible = "fsl-i2c";
> +			reg =<0x3000 0x100>;
> +			interrupts =<43 2>;
> +			dfsrr;
> +		};
> +
> +		i2c@3100 {
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			cell-index =<1>;
> +			compatible = "fsl-i2c";
> +			reg =<0x3100 0x100>;
> +			interrupts =<43 2>;
> +			dfsrr;
> +
> +			wm8776:codec@1a {
> +				compatible = "wlf,wm8776";
> +				reg =<0x1a>;
> +				/* MCLK source is a stand-alone oscillator */
> +				clock-frequency =<12288000>;
> +			};
> +		};
> +
> +		serial0: serial@4500 {
> +			cell-index =<0>;
> +			device_type = "serial";
> +			compatible = "ns16550";
> +			reg =<0x4500 0x100>;
> +			clock-frequency =<0>;
> +			interrupts =<42 2>;
> +		};
> +
> +		serial1: serial@4600 {
> +			cell-index =<1>;
> +			device_type = "serial";
> +			compatible = "ns16550";
> +			reg =<0x4600 0x100>;
> +			clock-frequency =<0>;
> +			interrupts =<42 2>;
> +		};
> +
> +		spi@7000 {
> +			cell-index =<0>;
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			compatible = "fsl,espi";
> +			reg =<0x7000 0x1000>;
> +			interrupts =<59 0x2>;
> +			espi,num-ss-bits =<4>;
> +			mode = "cpu";
> +
> +			fsl_m25p80@0 {
> +				#address-cells =<1>;
> +				#size-cells =<1>;
> +				compatible = "fsl,espi-flash";
> +				reg =<0>;
> +				linux,modalias = "fsl_m25p80";
> +				spi-max-frequency =<40000000>; /* input clock */
> +				partition@0 {
> +					label = "u-boot-spi";
> +					reg =<0x00000000 0x00100000>;
> +					read-only;
> +				};
> +				partition@100000 {
> +					label = "kernel-spi";
> +					reg =<0x00100000 0x00500000>;
> +					read-only;
> +				};
> +				partition@600000 {
> +					label = "dtb-spi";
> +					reg =<0x00600000 0x00100000>;
> +					read-only;
> +				};
> +				partition@700000 {
> +					label = "file system-spi";
> +					reg =<0x00700000 0x00900000>;
> +				};
> +			};
> +		};
> +
> +		ssi@15000 {
> +			compatible = "fsl,mpc8610-ssi";
> +			cell-index =<0>;
> +			reg =<0x15000 0x100>;
> +			interrupts =<75 2>;
> +			fsl,mode = "i2s-slave";
> +			codec-handle =<&wm8776>;
> +			fsl,playback-dma =<&dma00>;
> +			fsl,capture-dma =<&dma01>;
> +			fsl,fifo-depth =<16>;
> +		};
> +
> +		dma@c300 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			compatible = "fsl,eloplus-dma";
> +			reg =<0xc300 0x4>;
> +			ranges =<0x0 0xc100 0x200>;
> +			cell-index =<1>;
> +			dma00: dma-channel@0 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x0 0x80>;
> +				cell-index =<0>;
> +				interrupts =<76 2>;
> +			};
> +			dma01: dma-channel@80 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x80 0x80>;
> +				cell-index =<1>;
> +				interrupts =<77 2>;
> +			};
> +			dma-channel@100 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x100 0x80>;
> +				cell-index =<2>;
> +				interrupts =<78 2>;
> +			};
> +			dma-channel@180 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x180 0x80>;
> +				cell-index =<3>;
> +				interrupts =<79 2>;
> +			};
> +		};
> +
> +		gpio: gpio-controller@f000 {
> +			#gpio-cells =<2>;
> +			compatible = "fsl,mpc8572-gpio";
> +			reg =<0xf000 0x100>;
> +			interrupts =<47 0x2>;
> +			gpio-controller;
> +		};
> +
> +		L2: l2-cache-controller@20000 {
> +			compatible = "fsl,p1022-l2-cache-controller";
> +			reg =<0x20000 0x1000>;
> +			cache-line-size =<32>;	// 32 bytes
> +			cache-size =<0x40000>; // L2, 256K
> +			interrupts =<16 2>;
> +		};
> +
> +		dma@21300 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			compatible = "fsl,eloplus-dma";
> +			reg =<0x21300 0x4>;
> +			ranges =<0x0 0x21100 0x200>;
> +			cell-index =<0>;
> +			dma-channel@0 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x0 0x80>;
> +				cell-index =<0>;
> +				interrupts =<20 2>;
> +			};
> +			dma-channel@80 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x80 0x80>;
> +				cell-index =<1>;
> +				interrupts =<21 2>;
> +			};
> +			dma-channel@100 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x100 0x80>;
> +				cell-index =<2>;
> +				interrupts =<22 2>;
> +			};
> +			dma-channel@180 {
> +				compatible = "fsl,eloplus-dma-channel";
> +				reg =<0x180 0x80>;
> +				cell-index =<3>;
> +				interrupts =<23 2>;
> +			};
> +		};
> +
> +		usb@22000 {
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			compatible = "fsl-usb2-dr";
> +			reg =<0x22000 0x1000>;
> +			interrupts =<28 0x2>;
> +			phy_type = "ulpi";
> +		};
> +
> +		mdio@24000 {
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			compatible = "fsl,etsec2-mdio";
> +			reg =<0x24000 0x1000 0xb0030 0x4>;
> +
> +			phy0: ethernet-phy@0 {
> +				interrupts =<3 1>;
> +				reg =<0x1>;
> +			};
> +			phy1: ethernet-phy@1 {
> +				interrupts =<9 1>;
> +				reg =<0x2>;
> +			};
> +		};
> +
> +		mdio@25000 {
> +			#address-cells =<1>;
> +			#size-cells =<0>;
> +			compatible = "fsl,etsec2-mdio";
> +			reg =<0x25000 0x1000 0xb1030 0x4>;
> +		};
> +
> +		enet0: ethernet@B0000 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			cell-index =<0>;
> +			device_type = "network";
> +			model = "eTSEC";
> +			compatible = "fsl,etsec2";
> +			fsl,num_rx_queues =<0x8>;
> +			fsl,num_tx_queues =<0x8>;
> +			fsl,magic-packet;
> +			fsl,wake-on-filer;
> +			local-mac-address = [ 00 00 00 00 00 00 ];
> +			fixed-link =<1 1 1000 0 0>;
> +			phy-handle =<&phy0>;
> +			phy-connection-type = "rgmii-id";
> +			queue-group@0{
> +				#address-cells =<1>;
> +				#size-cells =<1>;
> +				reg =<0xB0000 0x1000>;
> +				interrupts =<29 2 30 2 34 2>;
> +			};
> +			queue-group@1{
> +				#address-cells =<1>;
> +				#size-cells =<1>;
> +				reg =<0xB4000 0x1000>;
> +				interrupts =<17 2 18 2 24 2>;
> +			};
> +		};
> +
> +		enet1: ethernet@B1000 {
> +			#address-cells =<1>;
> +			#size-cells =<1>;
> +			cell-index =<0>;
> +			device_type = "network";
> +			model = "eTSEC";
> +			compatible = "fsl,etsec2";
> +			fsl,num_rx_queues =<0x8>;
> +			fsl,num_tx_queues =<0x8>;
> +			local-mac-address = [ 00 00 00 00 00 00 ];
> +			fixed-link =<1 1 1000 0 0>;
> +			phy-handle =<&phy1>;
> +			phy-connection-type = "rgmii-id";
> +			queue-group@0{
> +				#address-cells =<1>;
> +				#size-cells =<1>;
> +				reg =<0xB1000 0x1000>;
> +				interrupts =<35 2 36 2 40 2>;
> +			};
> +			queue-group@1{
> +				#address-cells =<1>;
> +				#size-cells =<1>;
> +				reg =<0xB5000 0x1000>;
> +				interrupts =<51 2 52 2 67 2>;
> +			};
> +		};
> +
> +		sdhci@2e000 {
> +			compatible = "fsl,p1022-esdhc", "fsl,esdhc";
> +			reg =<0x2e000 0x1000>;
> +			interrupts =<72 0x2>;
> +			fsl,sdhci-auto-cmd12;
> +			/* Filled in by U-Boot */
> +			clock-frequency =<0>;
> +		};
> +
> +		crypto@30000 {
> +			compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0",
> +				     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",
> +				     "fsl,sec2.0";
> +			reg =<0x30000 0x10000>;
> +			interrupts =<45 2 58 2>;
> +			fsl,num-channels =<4>;
> +			fsl,channel-fifo-len =<24>;
> +			fsl,exec-units-mask =<0x97c>;
> +			fsl,descriptor-types-mask =<0x3a30abf>;
> +		};
> +
> +		sata@18000 {
> +			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";
> +			reg =<0x18000 0x1000>;
> +			cell-index =<1>;
> +			interrupts =<74 0x2>;
> +		};
> +
> +		sata@19000 {
> +			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";
> +			reg =<0x19000 0x1000>;
> +			cell-index =<2>;
> +			interrupts =<41 0x2>;
> +		};
> +
> +		power@e0070{
> +			compatible = "fsl,mpc8536-pmc", "fsl,mpc8548-pmc";
> +			reg =<0xe0070 0x20>;
> +		};
> +
> +		display@10000 {
> +			compatible = "fsl,diu", "fsl,p1022-diu";
> +			reg =<0x10000 1000>;
> +			interrupts =<64 2>;
> +		};
> +
> +		timer@41100 {
> +			compatible = "fsl,mpic-global-timer";
> +			reg =<0x41100 0x204>;
> +			interrupts =<0xf7 0x2>;
> +		};
> +
> +		mpic: pic@40000 {
> +			interrupt-controller;
> +			#address-cells =<0>;
> +			#interrupt-cells =<2>;
> +			reg =<0x40000 0x40000>;
> +			compatible = "chrp,open-pic";
> +			device_type = "open-pic";
> +		};
> +
> +		msi@41600 {
> +			compatible = "fsl,p1022-msi", "fsl,mpic-msi";
> +			reg =<0x41600 0x80>;
> +			msi-available-ranges =<0 0x100>;
> +			interrupts =<
> +				0xe0 0
> +				0xe1 0
> +				0xe2 0
> +				0xe3 0
> +				0xe4 0
> +				0xe5 0
> +				0xe6 0
> +				0xe7 0>;
> +		};
> +
> +		global-utilities@e0000 {	//global utilities block
> +			compatible = "fsl,p1022-guts";
> +			reg =<0xe0000 0x1000>;
> +			fsl,has-rstcr;
> +		};
> +	};
> +
> +	pci0: pcie@fffe09000 {
> +		compatible = "fsl,p1022-pcie";
> +		device_type = "pci";
> +		#interrupt-cells =<1>;
> +		#size-cells =<2>;
> +		#address-cells =<3>;
> +		reg =<0xf 0xffe09000 0 0x1000>;
> +		bus-range =<0 255>;
> +		ranges =<0x2000000 0x0 0xa0000000 0xc 0x20000000 0x0 0x20000000
> +			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>;
> +		clock-frequency =<33333333>;
> +		interrupts =<16 2>;
> +		interrupt-map-mask =<0xf800 0 0 7>;
> +		interrupt-map =<
> +			/* IDSEL 0x0 */
> +			0000 0 0 1&mpic 4 1
> +			0000 0 0 2&mpic 5 1
> +			0000 0 0 3&mpic 6 1
> +			0000 0 0 4&mpic 7 1
> +			>;
> +		pcie@0 {
> +			reg =<0x0 0x0 0x0 0x0 0x0>;
> +			#size-cells =<2>;
> +			#address-cells =<3>;
> +			device_type = "pci";
> +			ranges =<0x2000000 0x0 0xe0000000
> +				  0x2000000 0x0 0xe0000000
> +				  0x0 0x20000000
> +
> +				  0x1000000 0x0 0x0
> +				  0x1000000 0x0 0x0
> +				  0x0 0x100000>;
> +		};
> +	};
> +
> +	pci1: pcie@fffe0a000 {
> +		compatible = "fsl,p1022-pcie";
> +		device_type = "pci";
> +		#interrupt-cells =<1>;
> +		#size-cells =<2>;
> +		#address-cells =<3>;
> +		reg =<0xf 0xffe0a000 0 0x1000>;
> +		bus-range =<0 255>;
> +		ranges =<0x2000000 0x0 0xc0000000 0xc 0x40000000 0x0 0x20000000
> +			  0x1000000 0x0 0x00000000 0xf 0xffc20000 0x0 0x10000>;
> +		clock-frequency =<33333333>;
> +		interrupts =<16 2>;
> +		interrupt-map-mask =<0xf800 0 0 7>;
> +		interrupt-map =<
> +			/* IDSEL 0x0 */
> +			0000 0 0 1&mpic 0 1
> +			0000 0 0 2&mpic 1 1
> +			0000 0 0 3&mpic 2 1
> +			0000 0 0 4&mpic 3 1
> +			>;
> +		pcie@0 {
> +			reg =<0x0 0x0 0x0 0x0 0x0>;
> +			#size-cells =<2>;
> +			#address-cells =<3>;
> +			device_type = "pci";
> +			ranges =<0x2000000 0x0 0xe0000000
> +				  0x2000000 0x0 0xe0000000
> +				  0x0 0x20000000
> +
> +				  0x1000000 0x0 0x0
> +				  0x1000000 0x0 0x0
> +				  0x0 0x100000>;
> +		};
> +	};
> +
> +
> +	pci2: pcie@fffe0b000 {
> +		compatible = "fsl,p1022-pcie";
> +		device_type = "pci";
> +		#interrupt-cells =<1>;
> +		#size-cells =<2>;
> +		#address-cells =<3>;
> +		reg =<0xf 0xffe0b000 0 0x1000>;
> +		bus-range =<0 255>;
> +		ranges =<0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000
> +			  0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
> +		clock-frequency =<33333333>;
> +		interrupts =<16 2>;
> +		interrupt-map-mask =<0xf800 0 0 7>;
> +		interrupt-map =<
> +			/* IDSEL 0x0 */
> +			0000 0 0 1&mpic 8 1
> +			0000 0 0 2&mpic 9 1
> +			0000 0 0 3&mpic 10 1
> +			0000 0 0 4&mpic 11 1
> +			>;
> +		pcie@0 {
> +			reg =<0x0 0x0 0x0 0x0 0x0>;
> +			#size-cells =<2>;
> +			#address-cells =<3>;
> +			device_type = "pci";
> +			ranges =<0x2000000 0x0 0xe0000000
> +				  0x2000000 0x0 0xe0000000
> +				  0x0 0x20000000
> +
> +				  0x1000000 0x0 0x0
> +				  0x1000000 0x0 0x0
> +				  0x0 0x100000>;
> +		};
> +	};
> +};
> diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
> index cfebef9..d32f31a 100644
> --- a/arch/powerpc/configs/mpc85xx_defconfig
> +++ b/arch/powerpc/configs/mpc85xx_defconfig
> @@ -19,7 +19,8 @@ CONFIG_E500=y
>   CONFIG_FSL_EMB_PERFMON=y
>   CONFIG_BOOKE=y
>   CONFIG_FSL_BOOKE=y
> -# CONFIG_PHYS_64BIT is not set
> +CONFIG_PTE_64BIT=y
> +CONFIG_PHYS_64BIT=y
>   CONFIG_SPE=y
>   CONFIG_PPC_MMU_NOHASH=y
>   CONFIG_PPC_MMU_NOHASH_32=y
> @@ -28,7 +29,7 @@ CONFIG_PPC_BOOK3E_MMU=y
>   # CONFIG_SMP is not set
>   CONFIG_PPC32=y
>   CONFIG_WORD_SIZE=32
> -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
> +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
>   CONFIG_MMU=y
>   CONFIG_GENERIC_CMOS_UPDATE=y
>   CONFIG_GENERIC_TIME=y
> @@ -239,6 +240,7 @@ CONFIG_MPC85xx_MDS=y
>   CONFIG_MPC8536_DS=y
>   CONFIG_MPC85xx_DS=y
>   CONFIG_MPC85xx_RDB=y
> +CONFIG_P1022_DS=y
>   CONFIG_SOCRATES=y
>   CONFIG_KSI8560=y
>   CONFIG_XES_MPC85xx=y
> @@ -311,7 +313,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
>   CONFIG_PAGEFLAGS_EXTENDED=y
>   CONFIG_SPLIT_PTLOCK_CPUS=4
>   CONFIG_MIGRATION=y
> -# CONFIG_PHYS_ADDR_T_64BIT is not set
> +CONFIG_PHYS_ADDR_T_64BIT=y
>   CONFIG_ZONE_DMA_FLAG=1
>   CONFIG_BOUNCE=y
>   CONFIG_VIRT_TO_BUS=y
> @@ -321,7 +323,7 @@ CONFIG_PPC_4K_PAGES=y
>   # CONFIG_PPC_16K_PAGES is not set
>   # CONFIG_PPC_64K_PAGES is not set
>   # CONFIG_PPC_256K_PAGES is not set
> -CONFIG_FORCE_MAX_ZONEORDER=11
> +CONFIG_FORCE_MAX_ZONEORDER=12
>   CONFIG_PROC_DEVICETREE=y
>   # CONFIG_CMDLINE_BOOL is not set
>   CONFIG_EXTRA_TARGETS=""
> @@ -1122,16 +1124,13 @@ CONFIG_VGA_CONSOLE=y
>   # CONFIG_VGACON_SOFT_SCROLLBACK is not set
>   CONFIG_DUMMY_CONSOLE=y
>   CONFIG_SOUND=y
> -CONFIG_SOUND_OSS_CORE=y
> -CONFIG_SOUND_OSS_CORE_PRECLAIM=y
> +# CONFIG_SOUND_OSS_CORE is not set
>   CONFIG_SND=y
>   CONFIG_SND_TIMER=y
>   CONFIG_SND_PCM=y
>   # CONFIG_SND_SEQUENCER is not set
> -CONFIG_SND_OSSEMUL=y
> -CONFIG_SND_MIXER_OSS=y
> -CONFIG_SND_PCM_OSS=y
> -CONFIG_SND_PCM_OSS_PLUGINS=y
> +# CONFIG_SND_MIXER_OSS is not set
> +# CONFIG_SND_PCM_OSS is not set
>   # CONFIG_SND_HRTIMER is not set
>   # CONFIG_SND_DYNAMIC_MINORS is not set
>   # CONFIG_SND_SUPPORT_OLD_API is not set
> @@ -1145,12 +1144,7 @@ CONFIG_SND_VMASTER=y
>   # CONFIG_SND_SBAWE_SEQ is not set
>   # CONFIG_SND_EMU10K1_SEQ is not set
>   CONFIG_SND_AC97_CODEC=y
> -CONFIG_SND_DRIVERS=y
> -# CONFIG_SND_DUMMY is not set
> -# CONFIG_SND_MTPAV is not set
> -# CONFIG_SND_SERIAL_U16550 is not set
> -# CONFIG_SND_MPU401 is not set
> -# CONFIG_SND_AC97_POWER_SAVE is not set
> +# CONFIG_SND_DRIVERS is not set
>   CONFIG_SND_PCI=y
>   # CONFIG_SND_AD1889 is not set
>   # CONFIG_SND_ALS300 is not set
> @@ -1218,12 +1212,8 @@ CONFIG_SND_INTEL8X0=y
>   # CONFIG_SND_VIRTUOSO is not set
>   # CONFIG_SND_VX222 is not set
>   # CONFIG_SND_YMFPCI is not set
> -CONFIG_SND_PPC=y
> -CONFIG_SND_USB=y
> -# CONFIG_SND_USB_AUDIO is not set
> -# CONFIG_SND_USB_UA101 is not set
> -# CONFIG_SND_USB_USX2Y is not set
> -# CONFIG_SND_USB_CAIAQ is not set
> +# CONFIG_SND_PPC is not set
> +# CONFIG_SND_USB is not set
>   # CONFIG_SND_SOC is not set
>   # CONFIG_SOUND_PRIME is not set
>   CONFIG_AC97_BUS=y
> diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
> index f5451d8..f93de10 100644
> --- a/arch/powerpc/configs/mpc85xx_smp_defconfig
> +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
> @@ -19,7 +19,8 @@ CONFIG_E500=y
>   CONFIG_FSL_EMB_PERFMON=y
>   CONFIG_BOOKE=y
>   CONFIG_FSL_BOOKE=y
> -# CONFIG_PHYS_64BIT is not set
> +CONFIG_PTE_64BIT=y
> +CONFIG_PHYS_64BIT=y
>   CONFIG_SPE=y
>   CONFIG_PPC_MMU_NOHASH=y
>   CONFIG_PPC_MMU_NOHASH_32=y
> @@ -29,7 +30,7 @@ CONFIG_SMP=y
>   CONFIG_NR_CPUS=8
>   CONFIG_PPC32=y
>   CONFIG_WORD_SIZE=32
> -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
> +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
>   CONFIG_MMU=y
>   CONFIG_GENERIC_CMOS_UPDATE=y
>   CONFIG_GENERIC_TIME=y
> @@ -243,6 +244,7 @@ CONFIG_MPC85xx_MDS=y
>   CONFIG_MPC8536_DS=y
>   CONFIG_MPC85xx_DS=y
>   CONFIG_MPC85xx_RDB=y
> +CONFIG_P1022_DS=y
>   CONFIG_SOCRATES=y
>   CONFIG_KSI8560=y
>   CONFIG_XES_MPC85xx=y
> @@ -316,7 +318,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
>   CONFIG_PAGEFLAGS_EXTENDED=y
>   CONFIG_SPLIT_PTLOCK_CPUS=4
>   CONFIG_MIGRATION=y
> -# CONFIG_PHYS_ADDR_T_64BIT is not set
> +CONFIG_PHYS_ADDR_T_64BIT=y
>   CONFIG_ZONE_DMA_FLAG=1
>   CONFIG_BOUNCE=y
>   CONFIG_VIRT_TO_BUS=y
> @@ -326,7 +328,7 @@ CONFIG_PPC_4K_PAGES=y
>   # CONFIG_PPC_16K_PAGES is not set
>   # CONFIG_PPC_64K_PAGES is not set
>   # CONFIG_PPC_256K_PAGES is not set
> -CONFIG_FORCE_MAX_ZONEORDER=11
> +CONFIG_FORCE_MAX_ZONEORDER=12
>   CONFIG_PROC_DEVICETREE=y
>   # CONFIG_CMDLINE_BOOL is not set
>   CONFIG_EXTRA_TARGETS=""
> @@ -1127,16 +1129,13 @@ CONFIG_VGA_CONSOLE=y
>   # CONFIG_VGACON_SOFT_SCROLLBACK is not set
>   CONFIG_DUMMY_CONSOLE=y
>   CONFIG_SOUND=y
> -CONFIG_SOUND_OSS_CORE=y
> -CONFIG_SOUND_OSS_CORE_PRECLAIM=y
> +# CONFIG_SOUND_OSS_CORE is not set
>   CONFIG_SND=y
>   CONFIG_SND_TIMER=y
>   CONFIG_SND_PCM=y
>   # CONFIG_SND_SEQUENCER is not set
> -CONFIG_SND_OSSEMUL=y
> -CONFIG_SND_MIXER_OSS=y
> -CONFIG_SND_PCM_OSS=y
> -CONFIG_SND_PCM_OSS_PLUGINS=y
> +# CONFIG_SND_MIXER_OSS is not set
> +# CONFIG_SND_PCM_OSS is not set
>   # CONFIG_SND_HRTIMER is not set
>   # CONFIG_SND_DYNAMIC_MINORS is not set
>   # CONFIG_SND_SUPPORT_OLD_API is not set
> @@ -1150,12 +1149,7 @@ CONFIG_SND_VMASTER=y
>   # CONFIG_SND_SBAWE_SEQ is not set
>   # CONFIG_SND_EMU10K1_SEQ is not set
>   CONFIG_SND_AC97_CODEC=y
> -CONFIG_SND_DRIVERS=y
> -# CONFIG_SND_DUMMY is not set
> -# CONFIG_SND_MTPAV is not set
> -# CONFIG_SND_SERIAL_U16550 is not set
> -# CONFIG_SND_MPU401 is not set
> -# CONFIG_SND_AC97_POWER_SAVE is not set
> +# CONFIG_SND_DRIVERS is not set
>   CONFIG_SND_PCI=y
>   # CONFIG_SND_AD1889 is not set
>   # CONFIG_SND_ALS300 is not set
> @@ -1223,12 +1217,8 @@ CONFIG_SND_INTEL8X0=y
>   # CONFIG_SND_VIRTUOSO is not set
>   # CONFIG_SND_VX222 is not set
>   # CONFIG_SND_YMFPCI is not set
> -CONFIG_SND_PPC=y
> -CONFIG_SND_USB=y
> -# CONFIG_SND_USB_AUDIO is not set
> -# CONFIG_SND_USB_UA101 is not set
> -# CONFIG_SND_USB_USX2Y is not set
> -# CONFIG_SND_USB_CAIAQ is not set
> +# CONFIG_SND_PPC is not set
> +# CONFIG_SND_USB is not set
>   # CONFIG_SND_SOC is not set
>   # CONFIG_SOUND_PRIME is not set
>   CONFIG_AC97_BUS=y
> diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
> index 3a2ade2..bea1f59 100644
> --- a/arch/powerpc/platforms/85xx/Kconfig
> +++ b/arch/powerpc/platforms/85xx/Kconfig
> @@ -65,6 +65,14 @@ config MPC85xx_RDB
>   	help
>   	  This option enables support for the MPC85xx RDB (P2020 RDB) board
>
> +config P1022_DS
> +	bool "Freescale P1022 DS"
> +	select DEFAULT_UIMAGE
> +	select CONFIG_PHYS_64BIT	# The DTS has 36-bit addresses
> +	select SWIOTLB
> +	help
> +	  This option enables support for the Freescale P1022DS reference board.
> +
>   config SOCRATES
>   	bool "Socrates"
>   	select DEFAULT_UIMAGE
> diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
> index 387c128..a2ec3f8 100644
> --- a/arch/powerpc/platforms/85xx/Makefile
> +++ b/arch/powerpc/platforms/85xx/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o
>   obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
>   obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
>   obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
> +obj-$(CONFIG_P1022_DS)    += p1022_ds.o
>   obj-$(CONFIG_P4080_DS)    += p4080_ds.o corenet_ds.o
>   obj-$(CONFIG_STX_GP3)	  += stx_gp3.o
>   obj-$(CONFIG_TQM85xx)	  += tqm85xx.o
> diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
> new file mode 100644
> index 0000000..e1467c9
> --- /dev/null
> +++ b/arch/powerpc/platforms/85xx/p1022_ds.c
> @@ -0,0 +1,148 @@
> +/*
> + * P1022DS board specific routines
> + *
> + * Authors: Travis Wheatley<[email-masked]>
> + *          Dave Liu<[email-masked]>
> + *          Timur Tabi<[email-masked]>
> + *
> + * Copyright 2010 Freescale Semiconductor, Inc.
> + *
> + * This file is taken from the Freescale P1022DS BSP, with modifications:
> + * 1) No DIU support (pending rewrite of DIU code)
> + * 2) No AMP support
> + * 3) No PCI endpoint support
> + *
> + * This file is licensed under the terms of the GNU General Public License
> + * version 2.  This program is licensed "as is" without any warranty of any
> + * kind, whether express or implied.
> + */
> +
> +#include<linux/pci.h>
> +#include<linux/of_platform.h>
> +#include<linux/lmb.h>
> +
> +#include<asm/mpic.h>
> +#include<asm/swiotlb.h>
> +
> +#include<sysdev/fsl_soc.h>
> +#include<sysdev/fsl_pci.h>
> +
> +void __init p1022_ds_pic_init(void)
> +{
> +	struct mpic *mpic;
> +	struct resource r;
> +	struct device_node *np;
> +
> +	np = of_find_node_by_type(NULL, "open-pic");
> +	if (!np) {
> +		pr_err("Could not find open-pic node\n");
> +		return;
> +	}
> +
> +	if (of_address_to_resource(np, 0,&r)) {
> +		pr_err("Failed to map mpic register space\n");
> +		of_node_put(np);
> +		return;
> +	}
> +
> +	mpic = mpic_alloc(np, r.start,
> +		MPIC_PRIMARY | MPIC_WANTS_RESET |
> +		MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
> +		MPIC_SINGLE_DEST_CPU,
> +		0, 256, " OpenPIC  ");
> +
> +	BUG_ON(mpic == NULL);
> +	of_node_put(np);
> +
> +	mpic_init(mpic);
> +}
> +
> +#ifdef CONFIG_SMP
> +void __init mpc85xx_smp_init(void);
> +#endif
> +
> +/*
> + * Setup the architecture
> + */
> +static void __init p1022_ds_setup_arch(void)
> +{
> +#ifdef CONFIG_PCI
> +	struct device_node *np;
> +#endif
> +	dma_addr_t max = 0xffffffff;
> +
> +	if (ppc_md.progress)
> +		ppc_md.progress("p1022_ds_setup_arch()", 0);
> +
> +#ifdef CONFIG_PCI
> +	for_each_compatible_node(np, "pci", "fsl,p1022-pcie") {
> +		struct resource rsrc;
> +		struct pci_controller *hose;
> +
> +		of_address_to_resource(np, 0,&rsrc);
> +
> +		if ((rsrc.start&  0xfffff) == 0x8000)
> +			fsl_add_bridge(np, 1);
> +		else
> +			fsl_add_bridge(np, 0);
> +
> +		hose = pci_find_hose_for_OF_device(np);
> +		max = min(max, hose->dma_window_base_cur +
> +			  hose->dma_window_size);
> +	}
> +#endif
> +
> +#ifdef CONFIG_SMP
> +	mpc85xx_smp_init();
> +#endif
> +
> +#ifdef CONFIG_SWIOTLB
> +	if (lmb_end_of_DRAM()>  max) {
> +		ppc_swiotlb_enable = 1;
> +		set_pci_dma_ops(&swiotlb_dma_ops);
> +		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
> +	}
> +#endif
> +
> +	pr_info("Freescale P1022 DS reference board\n");
> +}
> +
> +static struct of_device_id __initdata p1022_ds_ids[] = {
> +	{ .type = "soc", },
> +	{ .compatible = "soc", },
> +	{ .compatible = "simple-bus", },
> +	{ .compatible = "gianfar", },
> +	{},
> +};
> +
> +static int __init p1022_ds_publish_devices(void)
> +{
> +	return of_platform_bus_probe(NULL, p1022_ds_ids, NULL);
> +}
> +machine_device_initcall(p1022_ds, p1022_ds_publish_devices);
> +
> +machine_arch_initcall(p1022_ds, swiotlb_setup_bus_notifier);
> +
> +/*
> + * Called very early, device-tree isn't unflattened
> + */
> +static int __init p1022_ds_probe(void)
> +{
> +	unsigned long root = of_get_flat_dt_root();
> +
> +	return of_flat_dt_is_compatible(root, "fsl,p1022ds");
> +}
> +
> +define_machine(p1022_ds) {
> +	.name			= "P1022 DS",
> +	.probe			= p1022_ds_probe,
> +	.setup_arch		= p1022_ds_setup_arch,
> +	.init_IRQ		= p1022_ds_pic_init,
> +#ifdef CONFIG_PCI
> +	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
> +#endif
> +	.get_irq		= mpic_get_irq,
> +	.restart		= fsl_rstcr_restart,
> +	.calibrate_decr		= generic_calibrate_decr,
> +	.progress		= udbg_progress,
> +};