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

Merge remote-tracking branch 'scott/next' into next 

Freescale updates from Scott:

<<
Highlights include 32-bit booke relocatable support, e6500 hardware
tablewalk support, various e500 SPE fixes, some new/revived boards, and
e6500 deeper idle and altivec powerdown modes.
>>
parents 3ac8ff1c d064f30e

Documentation/devicetree/bindings/video/ssd1289fb.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Solomon SSD1289 Framebuffer Driver



Required properties:

  - compatible: Should be "solomon,ssd1289fb". The only supported bus for

    now is lbc.

  - reg: Should contain address of the controller on the LBC bus. The detail

    was described in Documentation/devicetree/bindings/powerpc/fsl/lbc.txt



Examples:

display@2,0 {

	compatible = "solomon,ssd1289fb";

	reg = <0x2 0x0000 0x0004>;

};

arch/powerpc/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -402,8 +402,7 @@ config KEXEC 
config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)

	select RELOCATABLE if PPC64 || 44x

	select DYNAMIC_MEMSTART if FSL_BOOKE

	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The same kernel binary can be used as production kernel and dump
@@ -884,7 +883,7 @@ config DYNAMIC_MEMSTART 


config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on ADVANCED_OPTIONS && FLATMEM && 44x

	depends on ADVANCED_OPTIONS && FLATMEM && (44x || FSL_BOOKE)

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running at the

arch/powerpc/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \ 
		uartlite.c mpc52xx-psc.c

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c



src-plat-y := of.c epapr.c

src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \
@@ -95,7 +95,7 @@ src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c 
src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \

					cuboot-c2k.c gamecube-head.S \

					gamecube.c wii-head.S wii.c holly.c \

					prpmc2800.c

					prpmc2800.c fixed-head.S mvme5100.c

src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c

src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c

src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
@@ -286,6 +286,7 @@ image-$(CONFIG_MPC7448HPC2) += cuImage.mpc7448hpc2 
image-$(CONFIG_PPC_C2K)			+= cuImage.c2k

image-$(CONFIG_GAMECUBE)		+= dtbImage.gamecube

image-$(CONFIG_WII)			+= dtbImage.wii

image-$(CONFIG_MVME5100)		+= dtbImage.mvme5100



# Board port in arch/powerpc/platform/amigaone/Kconfig

image-$(CONFIG_AMIGAONE)		+= cuImage.amigaone

arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi

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

 * QorIQ Elo3 DMA device tree stub [ controller @ offset 0x102300 ]

 *

 * Copyright 2013 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



dma2: dma@102300 {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "fsl,elo3-dma";

	reg = <0x102300 0x4>,

	      <0x102600 0x4>;

	ranges = <0x0 0x102100 0x500>;

	dma-channel@0 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x0 0x80>;

		interrupts = <464 2 0 0>;

	};

	dma-channel@80 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x80 0x80>;

		interrupts = <465 2 0 0>;

	};

	dma-channel@100 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x100 0x80>;

		interrupts = <466 2 0 0>;

	};

	dma-channel@180 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x180 0x80>;

		interrupts = <467 2 0 0>;

	};

	dma-channel@300 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x300 0x80>;

		interrupts = <468 2 0 0>;

	};

	dma-channel@380 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x380 0x80>;

		interrupts = <469 2 0 0>;

	};

	dma-channel@400 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x400 0x80>;

		interrupts = <470 2 0 0>;

	};

	dma-channel@480 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x480 0x80>;

		interrupts = <471 2 0 0>;

	};

};

arch/powerpc/boot/dts/fsl/p1020si-post.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ 
	#address-cells = <2>;

	#size-cells = <1>;

	compatible = "fsl,p1020-elbc", "fsl,elbc", "simple-bus";

	interrupts = <19 2 0 0>;

	interrupts = <19 2 0 0>,

		     <16 2 0 0>;

};



/* controller at 0x9000 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE