linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7
@ 2012-09-05  8:20 Simon Horman
  2012-09-05  8:20 ` [PATCH 1/5] r8a7779: add SDHI clock support Simon Horman
                   ` (5 more replies)
  0 siblings, 6 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Arnd,

please consider the following enhancements to the Marzen board
and r8a7779 SoC by Phil Edworthy, Morimoto-san and myself for 3.7.

This pull-request differs from v2 in that USB-related changes
have been omitted and the pull-request is no longer based on usb-next.

----------------------------------------------------------------------
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:

  Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen

for you to fetch changes up to 978792e04b58985eda62aa8cc97c6d46433103f2:

  ARM: shmobile: marzen: enable thermal sensor (2012-09-05 10:22:48 +0900)

----------------------------------------------------------------
Kuninori Morimoto (2):
      ARM: shmobile: marzen: fixup regulator id for smsc911x
      ARM: shmobile: marzen: enable thermal sensor

Phil Edworthy (2):
      r8a7779: add SDHI clock support
      marzen: add SDHI0 support

Simon Horman (1):
      ARM: mach-shmobile: marzen: defconfig update

 arch/arm/configs/marzen_defconfig      |   19 +++++----
 arch/arm/mach-shmobile/board-marzen.c  |   68 +++++++++++++++++++++++++++++++-
 arch/arm/mach-shmobile/clock-r8a7779.c |   11 +++++-
 3 files changed, 89 insertions(+), 9 deletions(-)

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/5] r8a7779: add SDHI clock support
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
@ 2012-09-05  8:20 ` Simon Horman
  2012-09-05  8:20 ` [PATCH 2/5] marzen: add SDHI0 support Simon Horman
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

From: Phil Edworthy <phil.edworthy@renesas.com>

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r8a7779.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 339c62c..3cafb6a 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -86,11 +86,16 @@ static struct clk div4_clks[DIV4_NR] = {
 				      0x0300, CLK_ENABLE_ON_INIT),
 };
 
-enum { MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
+enum { MSTP323, MSTP322, MSTP321, MSTP320,
+	MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
 	MSTP016, MSTP015, MSTP014,
 	MSTP_NR };
 
 static struct clk mstp_clks[MSTP_NR] = {
+	[MSTP323] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 23, 0), /* SDHI0 */
+	[MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */
+	[MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */
+	[MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */
 	[MSTP026] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 26, 0), /* SCIF0 */
 	[MSTP025] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 25, 0), /* SCIF1 */
 	[MSTP024] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 24, 0), /* SCIF2 */
@@ -149,6 +154,10 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
+	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
+	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
+	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
+	CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */
 };
 
 void __init r8a7779_clock_init(void)
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/5] marzen: add SDHI0 support
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
  2012-09-05  8:20 ` [PATCH 1/5] r8a7779: add SDHI clock support Simon Horman
@ 2012-09-05  8:20 ` Simon Horman
  2012-09-05  8:20 ` [PATCH 3/5] ARM: mach-shmobile: marzen: defconfig update Simon Horman
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

From: Phil Edworthy <phil.edworthy@renesas.com>

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/configs/marzen_defconfig     |    4 +--
 arch/arm/mach-shmobile/board-marzen.c |   52 ++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 864f9a5..bf42ad2 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -71,12 +71,12 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_SSB=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
+CONFIG_MMC=y
+CONFIG_MMC_SDHI=y
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_MAGIC_SYSRQ=y
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 3a528cf..dec3ffc 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -30,6 +30,8 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mfd/tmio.h>
 #include <mach/hardware.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
@@ -39,6 +41,12 @@
 #include <asm/hardware/gic.h>
 #include <asm/traps.h>
 
+/* Fixed 3.3V regulator to be used by SDHI0 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
+	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+};
+
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
 	REGULATOR_SUPPLY("vddvario", "smsc911x"),
@@ -75,13 +83,45 @@ static struct platform_device eth_device = {
 	.num_resources	= ARRAY_SIZE(smsc911x_resources),
 };
 
+static struct resource sdhi0_resources[] = {
+	[0] = {
+		.name	= "sdhi0",
+		.start	= 0xffe4c000,
+		.end	= 0xffe4c0ff,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= gic_spi(104),
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static struct sh_mobile_sdhi_info sdhi0_platform_data = {
+	.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
+	.tmio_caps = MMC_CAP_SD_HIGHSPEED,
+};
+
+static struct platform_device sdhi0_device = {
+	.name = "sh_mobile_sdhi",
+	.num_resources = ARRAY_SIZE(sdhi0_resources),
+	.resource = sdhi0_resources,
+	.id = 0,
+	.dev = {
+		.platform_data = &sdhi0_platform_data,
+	}
+};
+
 static struct platform_device *marzen_devices[] __initdata = {
 	&eth_device,
+	&sdhi0_device,
 };
 
 static void __init marzen_init(void)
 {
-	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+				ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+	regulator_register_fixed(0, dummy_supplies,
+				ARRAY_SIZE(dummy_supplies));
 
 	r8a7779_pinmux_init();
 
@@ -97,6 +137,16 @@ static void __init marzen_init(void)
 	gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */
 	gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */
 
+	/* SD0 (CN20) */
+	gpio_request(GPIO_FN_SD0_CLK, NULL);
+	gpio_request(GPIO_FN_SD0_CMD, NULL);
+	gpio_request(GPIO_FN_SD0_DAT0, NULL);
+	gpio_request(GPIO_FN_SD0_DAT1, NULL);
+	gpio_request(GPIO_FN_SD0_DAT2, NULL);
+	gpio_request(GPIO_FN_SD0_DAT3, NULL);
+	gpio_request(GPIO_FN_SD0_CD, NULL);
+	gpio_request(GPIO_FN_SD0_WP, NULL);
+
 	r8a7779_add_standard_devices();
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/5] ARM: mach-shmobile: marzen: defconfig update
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
  2012-09-05  8:20 ` [PATCH 1/5] r8a7779: add SDHI clock support Simon Horman
  2012-09-05  8:20 ` [PATCH 2/5] marzen: add SDHI0 support Simon Horman
@ 2012-09-05  8:20 ` Simon Horman
  2012-09-05  8:20 ` [PATCH 4/5] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

Update marzen defconfig
* Enable MMC Block device as SDHI hw is now supported.
* Default to NFS root, this is consistent with many other
  shmobile boards
* Enable UNIX which is required by udevd

Other changes are noise due to using make savedefconfig
to create the new defconfig.

Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/configs/marzen_defconfig |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index bf42ad2..cd2dc21 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -1,13 +1,14 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_KERNEL_LZMA=y
+CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT\x16
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
-# CONFIG_BLOCK is not set
+# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_SHMOBILE=y
 CONFIG_ARCH_R8A7779=y
 CONFIG_MACH_MARZEN=y
@@ -21,7 +22,6 @@ CONFIG_ARM_ERRATA_458693=y
 CONFIG_ARM_ERRATA_460075=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_754322=y
-CONFIG_NO_HZ=y
 CONFIG_SMP=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_AEABI=y
@@ -29,13 +29,16 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"
+CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
+CONFIG_UNIX=y
 CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -69,16 +72,16 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_SSB=y
-# CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_FILE_LOCKING is not set
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_REDUCED=y
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/5] ARM: shmobile: marzen: fixup regulator id for smsc911x
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
                   ` (2 preceding siblings ...)
  2012-09-05  8:20 ` [PATCH 3/5] ARM: mach-shmobile: marzen: defconfig update Simon Horman
@ 2012-09-05  8:20 ` Simon Horman
  2012-09-05  8:20 ` [PATCH 5/5] ARM: shmobile: marzen: enable thermal sensor Simon Horman
  2012-09-05 23:13 ` [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Olof Johansson
  5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

regulator id = 0 is used for sh_mobile_sdhi.
smsc911x's regulator can use id = 1

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/board-marzen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index dec3ffc..cbf9f25 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -120,7 +120,7 @@ static void __init marzen_init(void)
 {
 	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
 				ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
-	regulator_register_fixed(0, dummy_supplies,
+	regulator_register_fixed(1, dummy_supplies,
 				ARRAY_SIZE(dummy_supplies));
 
 	r8a7779_pinmux_init();
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 5/5] ARM: shmobile: marzen: enable thermal sensor
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
                   ` (3 preceding siblings ...)
  2012-09-05  8:20 ` [PATCH 4/5] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman
@ 2012-09-05  8:20 ` Simon Horman
  2012-09-05 23:13 ` [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Olof Johansson
  5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-05  8:20 UTC (permalink / raw)
  To: linux-arm-kernel

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Marzen board can measure its thermal by this patch.
	cat /sys/class/thermal/thermal_zoneX/temp

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/configs/marzen_defconfig     |    2 ++
 arch/arm/mach-shmobile/board-marzen.c |   16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index cd2dc21..b46914f 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -71,6 +71,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_RCAR_THERMAL=y
 CONFIG_SSB=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index cbf9f25..2e884b6 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -111,9 +111,25 @@ static struct platform_device sdhi0_device = {
 	}
 };
 
+/* Thermal */
+static struct resource thermal_resources[] = {
+	[0] = {
+		.start		= 0xFFC48000,
+		.end		= 0xFFC48038 - 1,
+		.flags		= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device thermal_device = {
+	.name		= "rcar_thermal",
+	.resource	= thermal_resources,
+	.num_resources	= ARRAY_SIZE(thermal_resources),
+};
+
 static struct platform_device *marzen_devices[] __initdata = {
 	&eth_device,
 	&sdhi0_device,
+	&thermal_device,
 };
 
 static void __init marzen_init(void)
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7
  2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
                   ` (4 preceding siblings ...)
  2012-09-05  8:20 ` [PATCH 5/5] ARM: shmobile: marzen: enable thermal sensor Simon Horman
@ 2012-09-05 23:13 ` Olof Johansson
  2012-09-06  0:02   ` Simon Horman
  5 siblings, 1 reply; 8+ messages in thread
From: Olof Johansson @ 2012-09-05 23:13 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Sep 05, 2012 at 05:20:39PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following enhancements to the Marzen board
> and r8a7779 SoC by Phil Edworthy, Morimoto-san and myself for 3.7.
> 
> This pull-request differs from v2 in that USB-related changes
> have been omitted and the pull-request is no longer based on usb-next.
> 
> ----------------------------------------------------------------------
> The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
> 
>   Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen
> 
> for you to fetch changes up to 978792e04b58985eda62aa8cc97c6d46433103f2:
> 
>   ARM: shmobile: marzen: enable thermal sensor (2012-09-05 10:22:48 +0900)
> 
Hi,

This is the first pull request that has a few patches on the same branch,
so while it's something I was thinking about on previous pull request,
for this one it's more obvious. So here we go :-)

For background, we tend to organize the arm-soc tree a little different from
how some other maintainer trees are organized, to aggregate work across vendor
branches and make it more obvious which kind of patches are adding and removing
cod ein the tree.

Our organization of the arm-soc tree is in a few broad topics that cut across
all platforms. They tend to be, in rough order:

* Fixes that weren't critical for the previous release (fixes-non-critical)
* Cleanups that removes or refactors code
* New SoC support or major updates
* SoC drivers updates
* board support / changes
* defconfigs
* device tree

+ sometimes other special topic branches depending on what's going on that
merge window, like pinctrl updates (SoC side) or clock updates.

You can have one branch depend/build on top of another, we can normally resolve
those dependencies. We prefer them in the same rough order as above to avoid
cyclical dependencies between different vendors though.


So, on your branch:

You seem to be organizing your branches more along the topics of which chip
they relate to, for example Marzen and r8a7779 above. That worked out well when
there were only one or two patches per branch since we could just file them
into the area where we consider they fit (i.e. see my replies to those emails
about where they fit in).

This is the first larger branch, and I think you should split it up to:


> ----------------------------------------------------------------
> Kuninori Morimoto (2):
>       ARM: shmobile: marzen: fixup regulator id for smsc911x
>       ARM: shmobile: marzen: enable thermal sensor

Those are board updates

> 
> Phil Edworthy (2):
>       r8a7779: add SDHI clock support

SoC update since it seems to mostly be clock related.

>       marzen: add SDHI0 support

defconfig for part of the change, board for the other. Why was I/DNOTIFY
updated in the defconfig, by the way?


> Simon Horman (1):
>       ARM: mach-shmobile: marzen: defconfig update

This would fit on a defconfig branch as well.


For future pull request as well, feel free to think about how the patches
would fit into similar topics to above as well and organize them as such
at your level too. If you want several branches of the same kind, that's
no problem, but it's by far preferrably if they're organized along the
rouch topics above.


-Olof

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7
  2012-09-05 23:13 ` [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Olof Johansson
@ 2012-09-06  0:02   ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-09-06  0:02 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Sep 05, 2012 at 04:13:57PM -0700, Olof Johansson wrote:
> On Wed, Sep 05, 2012 at 05:20:39PM +0900, Simon Horman wrote:
> > Hi Olof, Hi Arnd,
> > 
> > please consider the following enhancements to the Marzen board
> > and r8a7779 SoC by Phil Edworthy, Morimoto-san and myself for 3.7.
> > 
> > This pull-request differs from v2 in that USB-related changes
> > have been omitted and the pull-request is no longer based on usb-next.
> > 
> > ----------------------------------------------------------------------
> > The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
> > 
> >   Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen
> > 
> > for you to fetch changes up to 978792e04b58985eda62aa8cc97c6d46433103f2:
> > 
> >   ARM: shmobile: marzen: enable thermal sensor (2012-09-05 10:22:48 +0900)
> > 
> Hi,
> 
> This is the first pull request that has a few patches on the same branch,
> so while it's something I was thinking about on previous pull request,
> for this one it's more obvious. So here we go :-)
> 
> For background, we tend to organize the arm-soc tree a little different from
> how some other maintainer trees are organized, to aggregate work across vendor
> branches and make it more obvious which kind of patches are adding and removing
> cod ein the tree.
> 
> Our organization of the arm-soc tree is in a few broad topics that cut across
> all platforms. They tend to be, in rough order:
> 
> * Fixes that weren't critical for the previous release (fixes-non-critical)
> * Cleanups that removes or refactors code
> * New SoC support or major updates
> * SoC drivers updates
> * board support / changes
> * defconfigs
> * device tree
> 
> + sometimes other special topic branches depending on what's going on that
> merge window, like pinctrl updates (SoC side) or clock updates.
> 
> You can have one branch depend/build on top of another, we can normally resolve
> those dependencies. We prefer them in the same rough order as above to avoid
> cyclical dependencies between different vendors though.
> 
> 
> So, on your branch:
> 
> You seem to be organizing your branches more along the topics of which chip
> they relate to, for example Marzen and r8a7779 above. That worked out well when
> there were only one or two patches per branch since we could just file them
> into the area where we consider they fit (i.e. see my replies to those emails
> about where they fit in).
> 
> This is the first larger branch, and I think you should split it up to:
> 
> 
> > ----------------------------------------------------------------
> > Kuninori Morimoto (2):
> >       ARM: shmobile: marzen: fixup regulator id for smsc911x
> >       ARM: shmobile: marzen: enable thermal sensor
> 
> Those are board updates
> 
> > 
> > Phil Edworthy (2):
> >       r8a7779: add SDHI clock support
> 
> SoC update since it seems to mostly be clock related.
> 
> >       marzen: add SDHI0 support
> 
> defconfig for part of the change, board for the other. Why was I/DNOTIFY
> updated in the defconfig, by the way?
> 
> 
> > Simon Horman (1):
> >       ARM: mach-shmobile: marzen: defconfig update
> 
> This would fit on a defconfig branch as well.
> 
> 
> For future pull request as well, feel free to think about how the patches
> would fit into similar topics to above as well and organize them as such
> at your level too. If you want several branches of the same kind, that's
> no problem, but it's by far preferrably if they're organized along the
> rouch topics above.

Hi Olof,

thanks for the advice. I'll split up this series as you suggest and
try to align my branches with those in the arm-soc tree.

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-09-06  0:02 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05  8:20 [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
2012-09-05  8:20 ` [PATCH 1/5] r8a7779: add SDHI clock support Simon Horman
2012-09-05  8:20 ` [PATCH 2/5] marzen: add SDHI0 support Simon Horman
2012-09-05  8:20 ` [PATCH 3/5] ARM: mach-shmobile: marzen: defconfig update Simon Horman
2012-09-05  8:20 ` [PATCH 4/5] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman
2012-09-05  8:20 ` [PATCH 5/5] ARM: shmobile: marzen: enable thermal sensor Simon Horman
2012-09-05 23:13 ` [GIT PULL v3] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Olof Johansson
2012-09-06  0:02   ` Simon Horman

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).