linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Loic Pallardy <loic.pallardy-ext@stericsson.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Linus Walleij <linus.walleij@linaro.com>
Cc: Lee Jones <lee.jones@linaro.org>,
	Loic Pallardy <loic.pallardy@gmail.com>,
	LT ST-Ericsson <st-ericsson@lists.linaro.org>,
	STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com>,
	Loic Pallardy <loic.pallardy-ext@stericsson.com>,
	Loic Pallardy <loic.pallardy@stericsson.com>
Subject: [PATCH 02/17] arm: ux500: add ccu9540 board support
Date: Wed, 5 Sep 2012 11:58:58 +0200	[thread overview]
Message-ID: <1346839153-6465-3-git-send-email-loic.pallardy-ext@stericsson.com> (raw)
In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com>

Upgrade existing mop500 definition to support new ccu9540
board.

Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-ux500/board-mop500-sdi.c | 12 ++++++++++++
 arch/arm/mach-ux500/board-mop500.c     | 35 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-ux500/board-mop500.h     |  1 +
 3 files changed, 48 insertions(+)

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 18ff781..4fd21fe 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -255,6 +255,18 @@ void __init mop500_sdi_init(struct device *parent)
 	 */
 }
 
+void __init ccu9540_sdi_init(struct device *parent)
+{
+	/* On-board eMMC */
+	db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
+
+	/*
+	 * On boards with the TC35892 GPIO expander, sdi0 will finally
+	 * be added when the TC35892 initializes and calls
+	 * mop500_sdi_tc35892_init() above.
+	 */
+}
+
 void __init snowball_sdi_init(struct device *parent)
 {
 	/* On Snowball MMC_CAP_SD_HIGHSPEED isn't supported (Hardware issue?) */
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index fe1ff85..fa75f95 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -691,6 +691,30 @@ static void __init hrefv60_init_machine(void)
 	mop500_uib_init();
 }
 
+
+static void __init u9540_init_machine(void)
+{
+	struct device *parent;
+	int i;
+
+	ccu9540_pins_init();
+
+	parent = u8500_init_devices(&ab8500_platdata);
+
+	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
+		mop500_platform_devs[i]->dev.parent = parent;
+
+	platform_add_devices(mop500_platform_devs,
+				ARRAY_SIZE(mop500_platform_devs));
+	mop500_i2c_init(parent);
+	ccu9540_sdi_init(parent);
+	mop500_msp_init(parent);
+	mop500_uart_init(parent);
+
+	/* This board has full regulator constraints */
+	regulator_has_full_constraints();
+}
+
 MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
 	/* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */
 	.atag_offset	= 0x100,
@@ -727,6 +751,17 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
 	.init_late	= ux500_init_late,
 MACHINE_END
 
+MACHINE_START(U9540, "ST-Ericsson 9540 platform")
+	.atag_offset	= 0x100,
+	.map_io		= u8500_map_io,
+	.nr_irqs	= UX500_NR_IRQS,
+	.init_irq	= ux500_init_irq,
+	.timer		= &ux500_timer,
+	.handle_irq	= gic_handle_irq,
+	.init_machine	= u9540_init_machine,
+	.init_late	= ux500_init_late,
+MACHINE_END
+
 #ifdef CONFIG_MACH_UX500_DT
 
 struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index b696ab0..e5b2d3c 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -84,6 +84,7 @@ extern struct mmci_platform_data mop500_sdi4_data;
 extern struct arm_pmu_platdata db8500_pmu_platdata;
 
 extern void mop500_sdi_init(struct device *parent);
+extern void ccu9540_sdi_init(struct device *parent);
 extern void snowball_sdi_init(struct device *parent);
 extern void hrefv60_sdi_init(struct device *parent);
 extern void mop500_sdi_tc35892_init(struct device *parent);
-- 
1.7.11.1


  parent reply	other threads:[~2012-09-05  9:59 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-05  9:58 [PATCH 00/17] Add ST-Ericsson U9540 support Loic Pallardy
2012-09-05  9:58 ` [PATCH 01/17] arm: ux500: add u9540 pin configuration Loic Pallardy
2012-09-05  9:58 ` Loic Pallardy [this message]
2012-09-05 10:42   ` [PATCH 02/17] arm: ux500: add ccu9540 board support Arnd Bergmann
2012-09-05 11:38     ` Loic PALLARDY
2012-09-05 12:08       ` Linus Walleij
2012-09-05 12:11       ` Arnd Bergmann
2012-09-05 12:41         ` [st-ericsson] " Linus Walleij
2012-09-05  9:58 ` [PATCH 03/17] arm: ux500: Create board-specific IRQ init callback Loic Pallardy
2012-09-05  9:59 ` [PATCH 04/17] mfd: dbx500-prcmu: Introduce TCDM mapping struct Loic Pallardy
2012-09-05  9:59 ` [PATCH 05/17] mfd: dbx500-prcmu: Handle TCDM mapping Loic Pallardy
2012-09-05  9:59 ` [PATCH 06/17] arm: ux500: Add u9540 PRCMU TCDM configuration Loic Pallardy
2012-09-05  9:59 ` [PATCH 07/17] mfd: prcmu: configurable tcdm base address Loic Pallardy
2012-09-05  9:59 ` [PATCH 08/17] arm: ux500: update DB internal irq nb Loic Pallardy
2012-09-05  9:59 ` [PATCH 09/17] mfd: prcmu: add db9540 support Loic Pallardy
2012-09-05  9:59 ` [PATCH 10/17] mfd: prcmu: dbx500-prmcu creation Loic Pallardy
2012-09-05  9:59 ` [PATCH 11/17] mfd: pcrmu: create common header file for legacy mailbox Loic Pallardy
2012-09-05  9:59 ` [PATCH 12/17] mfd: prcmu: make fw_project_name generic Loic Pallardy
2012-09-05  9:59 ` [PATCH 13/17] mfd: prcmu: make legacy mailbox services configurable Loic Pallardy
2012-09-05  9:59 ` [PATCH 14/17] mfd: db8500-prcmu: use db8500 legacy services Loic Pallardy
2012-09-05 11:01   ` Arnd Bergmann
2012-09-05  9:59 ` [PATCH 15/17] mfd: dbx540-prcmu creation Loic Pallardy
2012-09-05 12:10   ` Arnd Bergmann
2012-09-05 12:39     ` [st-ericsson] " Linus Walleij
2012-09-05 12:52       ` Arnd Bergmann
2012-09-05  9:59 ` [PATCH 16/17] arm: ux500: add dbx540 prcmu platform data Loic Pallardy
2012-09-05  9:59 ` [PATCH 17/17] mfd: db8500-prcmu: activate dbx540-prcmu driver Loic Pallardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346839153-6465-3-git-send-email-loic.pallardy-ext@stericsson.com \
    --to=loic.pallardy-ext@stericsson.com \
    --cc=STEricsson_nomadik_linux@list.st.com \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=loic.pallardy@gmail.com \
    --cc=loic.pallardy@stericsson.com \
    --cc=sameo@linux.intel.com \
    --cc=st-ericsson@lists.linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).