From patchwork Fri Dec 14 22:05:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 206849 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4DB4E2C008F for ; Mon, 17 Dec 2012 23:23:18 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TkZfE-0004vI-3I; Mon, 17 Dec 2012 12:19:20 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TjdNh-0001sg-PV for linux-arm-kernel@lists.infradead.org; Fri, 14 Dec 2012 22:05:26 +0000 Received: by mail-da0-f49.google.com with SMTP id v40so1554328dad.36 for ; Fri, 14 Dec 2012 14:05:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=ezleJ7uMMrK3nfhAeZUebMSYQQBeZcwokxMIlV3j/cE=; b=S/5fGRo5hGV/RYz2dQWP//nkCAe9toM57iUiRrmkyke+MNUYbpM8BxrgpzekjwErdo Ea877lxhaHI62RFEpOO6d2CVc6uf15i328lA1rxM39EjqA+mvs7hJXdcIjMMyPoj5ZIX 9uH9TdznVNEg+Pr4uuSSmjMBY/9f61JEYrFMa5GkdVrMxonqL7rekMMC8TqgZ+WsmWrh 96PBM28w537JOoy2N4k8n0KSt5EfzTud/VPqk+yc3BzjNGjKlpjavo5nKuENt7qBvjSU M4LT+/tx1XF4QGZQTIVhi2VkqnDrzsxTkuM84S3pABMiwOgGwNi7aNOLg3RA31S4oG5D KYfw== Received: by 10.68.135.67 with SMTP id pq3mr19487433pbb.127.1355522720937; Fri, 14 Dec 2012 14:05:20 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id oi2sm3553842pbb.62.2012.12.14.14.05.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 14:05:19 -0800 (PST) Date: Fri, 14 Dec 2012 14:05:20 -0800 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL 1/3] ARM: arm-soc: SoC updates, take 2 Message-ID: <20121214220520.GB11363@quad.lixom.net> References: <20121214220441.GA11363@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121214220441.GA11363@quad.lixom.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmjEg8O4Q7i6HNcQLm6bHj2x+2VlbD1EQI5BP6s17WItjuX8LXetU3/BOPQooJ00UTDJlVj X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121214_170522_310699_F6ECA65C X-CRM114-Status: GOOD ( 16.55 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Mon, 17 Dec 2012 07:18:55 -0500 Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, This is the second batch of SoC updates for the 3.8 merge window, containing parts that had dependencies on earlier branches such that we couldn't include them with the first branch. These are general updates for Samsung Exynos, Renesas/shmobile and a topic branch that adds SMP support to Altera's socfpga platform. Conflicts seen with this merge: arch/arm/boot/dts/exynos5250.dtsi: First is add/add. Keep both sides. For the i2c node, keep the one with the label in front from the branch. arch/arm/mach-exynos/include/mach/regs-pmu.h: Add/remove. Keep the SYS_I2C_CFG one, drop USB_CFG. arch/arm/mach-exynos/mach-exynos5-dt.c: Include conflict: Keep and of_fdt.h and io.h Second conflict: Keep contents from branch, but replace last of_platform_populate with the chunk from HEAD. ---------------------------------------------------------------- The following changes since commit d42b3a2906a10b732ea7d7f849d49be79d242ef0: Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc2 for you to fetch changes up to c91321e8ff338a88a9272dcd938f085955cd5846: ARM: arm-soc: Merge branch 'next/smp' into next/soc2 ---------------------------------------------------------------- Abhilash Kesavan (4): ARM: EXYNOS: Setup legacy i2c controller interrupts ARM: EXYNOS: Add aliases for i2c controller ARM: EXYNOS: Fix i2c suspend/resume for legacy controller ARM: EXYNOS: Add ARM down clock support Arnd Bergmann (7): Merge branch 'socfpga/smp' into next/smp Merge branch 'vexpress-clk-soc' of git://git.linaro.org/people/pawelmoll/linux into next/soc2 ARM: socfpga: mark secondary_trampoline as cpuinit Merge branch 'next/boards2' into next/soc2 Merge branch 'soc2' of git://git.kernel.org/.../horms/renesas into next/soc2 Merge branches 'devel/debug_ll_init' and 'calxeda/ecx-2000' into next/soc2 Merge branch 'soc4' of git://git.kernel.org/.../horms/renesas into next/soc2 Colin Cross (2): ARM: SAMSUNG: add clock_tree debugfs file in clock ARM: SAMSUNG: call clk_get_rate for debugfs rate files Dinh Nguyen (1): ARM: socfpga: Enable SMP for socfpga Jingoo Han (1): ARM: EXYNOS: Add dp clock support for EXYNOS5 Kukjin Kim (1): Merge branch 'next/hdmi-samsung' into next/devel-samsung Kuninori Morimoto (3): ARM: shmobile: sh7372: remove fsidivx clock ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global sh: clkfwk: fixup unsed variable warning Olof Johansson (2): Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc2 ARM: arm-soc: Merge branch 'next/smp' into next/soc2 Pavel Machek (2): ARM: socfpga: fix build break for allyesconfig socfpga: map uart into virtual address space so that early_printk() works Rob Herring (1): ARM: highbank: use common debug_ll_io_init Simon Horman (3): Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" Vasanth Ananthan (1): ARM: EXYNOS: Clock settings for SATA and SATA PHY .../bindings/arm/altera/socfpga-reset.txt | 11 ++ .../bindings/arm/altera/socfpga-system.txt | 11 ++ arch/arm/boot/dts/exynos5250.dtsi | 27 +++-- arch/arm/boot/dts/socfpga.dtsi | 10 ++ arch/arm/configs/socfpga_defconfig | 3 +- arch/arm/mach-exynos/clock-exynos5.c | 28 ++++- arch/arm/mach-exynos/cpuidle.c | 36 ++++++ arch/arm/mach-exynos/include/mach/regs-clock.h | 19 +++ arch/arm/mach-exynos/include/mach/regs-pmu.h | 3 + arch/arm/mach-exynos/mach-exynos5-dt.c | 25 +++- arch/arm/mach-exynos/pm.c | 9 ++ arch/arm/mach-shmobile/clock-sh7372.c | 20 ++-- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 - arch/arm/mach-shmobile/smp-emev2.c | 22 +++- arch/arm/mach-shmobile/smp-r8a7779.c | 25 +++- arch/arm/mach-shmobile/smp-sh73a0.c | 23 +++- arch/arm/mach-socfpga/Kconfig | 1 + arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/core.h | 34 ++++++ arch/arm/mach-socfpga/headsmp.S | 25 ++++ arch/arm/mach-socfpga/platsmp.c | 116 +++++++++++++++++++ arch/arm/mach-socfpga/socfpga.c | 54 ++++++++- arch/arm/plat-samsung/clock.c | 75 +++++++++++- drivers/sh/clk/cpg.c | 1 - 24 files changed, 544 insertions(+), 37 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt create mode 100644 arch/arm/mach-socfpga/core.h create mode 100644 arch/arm/mach-socfpga/headsmp.S create mode 100644 arch/arm/mach-socfpga/platsmp.c