From patchwork Sat Aug 24 01:07:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 269598 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 9A0B02C019B for ; Sat, 24 Aug 2013 11:08:54 +1000 (EST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe003.messaging.microsoft.com [216.32.181.183]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "MSIT Machine Auth CA 2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 66E392C0090 for ; Sat, 24 Aug 2013 11:08:27 +1000 (EST) Received: from mail149-ch1-R.bigfish.com (10.43.68.249) by CH1EHSOBE005.bigfish.com (10.43.70.55) with Microsoft SMTP Server id 14.1.225.22; Sat, 24 Aug 2013 01:08:21 +0000 Received: from mail149-ch1 (localhost [127.0.0.1]) by mail149-ch1-R.bigfish.com (Postfix) with ESMTP id CC3EE240295; Sat, 24 Aug 2013 01:08:21 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz936eIzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz8275dh1de097hz2dh2a8h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h14ddh1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1fe8h1ff5h1155h) Received: from mail149-ch1 (localhost.localdomain [127.0.0.1]) by mail149-ch1 (MessageSwitch) id 1377306455850215_23191; Sat, 24 Aug 2013 01:07:35 +0000 (UTC) Received: from CH1EHSMHS018.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.240]) by mail149-ch1.bigfish.com (Postfix) with ESMTP id C22852007A; Sat, 24 Aug 2013 01:07:35 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS018.bigfish.com (10.43.70.18) with Microsoft SMTP Server (TLS) id 14.16.227.3; Sat, 24 Aug 2013 01:07:35 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.3.146.2; Sat, 24 Aug 2013 01:07:34 +0000 Received: from home.buserror.net ([10.214.85.126]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r7O17X03008249; Fri, 23 Aug 2013 18:07:33 -0700 Date: Fri, 23 Aug 2013 20:07:33 -0500 From: Scott Wood To: Subject: Pull request: scottwood/linux.git next Message-ID: <20130824010733.GA6116@home.buserror.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The following changes since commit afbcdd97bf117bc2d01b865a32f78f662437a4d8: powerpc/wsp: Fix early debug build (2013-08-16 10:59:27 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git next for you to fetch changes up to 622e03eb3498c32ee29de5c1d6d381f443e58fad: powerpc/85xx: Add C293PCIE board support (2013-08-23 19:43:24 -0500) ---------------------------------------------------------------- Chunhe Lan (1): powerpc/85xx: Add P1023RDB board support Haijun.Zhang (1): powerpc/85xx: Add support for 85xx cpu type detection Mingkai Hu (3): powerpc/85xx: Add SEC6.0 device tree powerpc/85xx: Add silicon device tree for C293 powerpc/85xx: Add C293PCIE board support Scott Wood (5): powerpc/fsl-booke: Work around erratum A-006958 powerpc: Convert some mftb/mftbu into mfspr powerpc/85xx: Remove -Wa,-me500 powerpc/booke64: Use appropriate -mcpu powerpc/e500: Set -mcpu flag for 32-bit e500 Wang Dongsheng (1): powerpc: add Book E support to 64-bit hibernation .../devicetree/bindings/crypto/fsl-sec6.txt | 157 ++++++++++++++ arch/powerpc/Makefile | 18 +- arch/powerpc/boot/dts/c293pcie.dts | 223 ++++++++++++++++++++ arch/powerpc/boot/dts/fsl/c293si-post.dtsi | 193 +++++++++++++++++ arch/powerpc/boot/dts/fsl/c293si-pre.dtsi | 63 ++++++ arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi | 56 +++++ arch/powerpc/boot/dts/p1023rdb.dts | 234 +++++++++++++++++++++ arch/powerpc/boot/ppc_asm.h | 3 + arch/powerpc/boot/util.S | 10 +- .../85xx/{p1023rds_defconfig => p1023_defconfig} | 24 ++- arch/powerpc/configs/mpc85xx_defconfig | 1 + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + arch/powerpc/include/asm/cputable.h | 9 +- arch/powerpc/include/asm/mpc85xx.h | 92 ++++++++ arch/powerpc/include/asm/ppc_asm.h | 6 +- arch/powerpc/include/asm/reg.h | 17 +- arch/powerpc/include/asm/timex.h | 4 +- arch/powerpc/kernel/swsusp_asm64.S | 45 +++- arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- arch/powerpc/platforms/85xx/Kconfig | 10 +- arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/c293pcie.c | 75 +++++++ arch/powerpc/platforms/85xx/p1023_rds.c | 24 ++- arch/powerpc/platforms/85xx/smp.c | 25 +++ arch/powerpc/platforms/Kconfig.cputype | 13 ++ 25 files changed, 1280 insertions(+), 30 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec6.txt create mode 100644 arch/powerpc/boot/dts/c293pcie.dts create mode 100644 arch/powerpc/boot/dts/fsl/c293si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/c293si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi create mode 100644 arch/powerpc/boot/dts/p1023rdb.dts rename arch/powerpc/configs/85xx/{p1023rds_defconfig => p1023_defconfig} (88%) create mode 100644 arch/powerpc/include/asm/mpc85xx.h create mode 100644 arch/powerpc/platforms/85xx/c293pcie.c