[PATCH 0/7] Various Samsung updates

This is a patch series I've got built up for the Samsung platforms, some
of which has been pending for the entire release cycle.  I know Ben's
said he's extremely busy right now (as you can see some of these patches
are from him), perhaps it would make sense to apply these via Kukjin's
tree for the time being?

Ben Dooks (2):
      ARM: S3C64XX: Add clock for i2c1
      ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()

Mark Brown (5):
      ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
      ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
      ARM: S3C64XX: Tone down SDHCI debugging
      ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled
      ARM: SMDK6410: Update regulator names for debugfs compatiblity

 arch/arm/mach-s3c64xx/clock.c         |    6 ++++++
 arch/arm/mach-s3c64xx/dma.c           |   11 ++++++-----
 arch/arm/mach-s3c64xx/gpiolib.c       |    4 ++--
 arch/arm/mach-s3c64xx/mach-smdk6410.c |   13 +++++++------
 arch/arm/mach-s3c64xx/setup-sdhci.c   |    2 +-
 arch/arm/plat-samsung/dev-uart.c      |    2 ++
 6 files changed, 24 insertions(+), 14 deletions(-)

Ensures that the declaration agrees with the definition and makes sparse
happy.

Signed-off-by: Mark Brown <redacted>
---
 arch/arm/plat-samsung/dev-uart.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-samsung/dev-uart.c b/arch/arm/plat-samsung/dev-uart.c
index 3776cd9..5928105 100644
--- a/arch/arm/plat-samsung/dev-uart.c
+++ b/arch/arm/plat-samsung/dev-uart.c

@@ -15,6 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
+#include <plat/devs.h>
+
 /* uart devices */
 
 static struct platform_device s3c24xx_uart_device0 = {

-- 
1.7.2.3

No need to put these in the global namespace and sparse gets upset.

Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/gpiolib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/gpiolib.c b/arch/arm/mach-s3c64xx/gpiolib.c
index fd99a82..92b0908 100644
--- a/arch/arm/mach-s3c64xx/gpiolib.c
+++ b/arch/arm/mach-s3c64xx/gpiolib.c

@@ -72,7 +72,7 @@ static struct s3c_gpio_cfg gpio_4bit_cfg_eint0011 = {
 	.get_pull	= s3c_gpio_getpull_updown,
 };
 
-int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin)
+static int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin)
 {
 	return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO;
 }

@@ -138,7 +138,7 @@ static struct s3c_gpio_chip gpio_4bit[] = {
 	},
 };
 
-int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin)
+static int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin)
 {
 	return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO;
 }

-- 
1.7.2.3

From: Ben Dooks <ben-linux@fluff.org>

The clock for i2c1 has been missing for a while, add it to the list of
clocks for the system and ensure it is initialised at startup.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/clock.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index dd37820..fdfc4d5 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c

@@ -151,6 +151,12 @@ static struct clk init_clocks_off[] = {
 		.enable		= s3c64xx_pclk_ctrl,
 		.ctrlbit	= S3C_CLKCON_PCLK_IIC,
 	}, {
+		.name		= "i2c",
+		.id		= 1,
+		.parent		= &clk_p,
+		.enable		= s3c64xx_pclk_ctrl,
+		.ctrlbit	= S3C6410_CLKCON_PCLK_I2C1,
+	}, {
 		.name		= "iis",
 		.id		= 0,
 		.parent		= &clk_p,

-- 
1.7.2.3

The MMC core calls s3c6400_setup_sdhcp_cfg_card() very frequently, causing
the log message in there at KERN_INFO to be displayed a lot which is slow
and overly chatty. Convert the message into a pr_debug() to tone this down.

Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/setup-sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/setup-sdhci.c b/arch/arm/mach-s3c64xx/setup-sdhci.c
index 1a94203..f344a22 100644
--- a/arch/arm/mach-s3c64xx/setup-sdhci.c
+++ b/arch/arm/mach-s3c64xx/setup-sdhci.c

@@ -56,7 +56,7 @@ void s3c6400_setup_sdhci_cfg_card(struct platform_device *dev,
 	else
 		ctrl3 = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0);
 
-	printk(KERN_INFO "%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3);
+	pr_debug("%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3);
 	writel(ctrl2, r + S3C_SDHCI_CONTROL2);
 	writel(ctrl3, r + S3C_SDHCI_CONTROL3);
 }

-- 
1.7.2.3

From: Ben Dooks <ben-linux@fluff.org>

Reduce the logging output of s3c64xx_dma_init1() as it is not useful
for normal bootup (and we get an overall indication of the registration
of the PL180 DMA block).

This removes the following output from the log:

s3c64xx_dma_init1: registering DMA 0 (e0808100)
s3c64xx_dma_init1: registering DMA 1 (e0808120)
s3c64xx_dma_init1: registering DMA 2 (e0808140)
s3c64xx_dma_init1: registering DMA 3 (e0808160)
s3c64xx_dma_init1: registering DMA 4 (e0808180)
s3c64xx_dma_init1: registering DMA 5 (e08081a0)
s3c64xx_dma_init1: registering DMA 6 (e08081c0)
s3c64xx_dma_init1: registering DMA 7 (e08081e0)

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/dma.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index 135db1b..c35585c 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c

@@ -690,12 +690,12 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
 
 	regptr = regs + PL080_Cx_BASE(0);
 
-	for (ch = 0; ch < 8; ch++, chno++, chptr++) {
-		printk(KERN_INFO "%s: registering DMA %d (%p)\n",
-		       __func__, chno, regptr);
+	for (ch = 0; ch < 8; ch++, chptr++) {
+		pr_debug("%s: registering DMA %d (%p)\n",
+			 __func__, chno + ch, regptr);
 
 		chptr->bit = 1 << ch;
-		chptr->number = chno;
+		chptr->number = chno + ch;
 		chptr->dmac = dmac;
 		chptr->regs = regptr;
 		regptr += PL080_Cx_STRIDE;

@@ -704,7 +704,8 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
 	/* for the moment, permanently enable the controller */
 	writel(PL080_CONFIG_ENABLE, regs + PL080_CONFIG);
 
-	printk(KERN_INFO "PL080: IRQ %d, at %p\n", irq, regs);
+	printk(KERN_INFO "PL080: IRQ %d, at %p, channels %d..%d\n",
+	       irq, regs, chno, chno+8);
 
 	return 0;
 

-- 
1.7.2.3

Avoid relying on implicit inclusion of machine.h

Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 1cb4ab3..4094707 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c

@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/smsc911x.h>
 #include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 
 #ifdef CONFIG_SMDK6410_WM1190_EV1
 #include <linux/mfd/wm8350/core.h>

-- 
1.7.2.3

The debugfs support added to the regulator API (which has been merged
in during this merge window) creates directories for regulators named
after the display names for the regulators so replace / as a separator
for multiple supplies with + in the SMDK6410 machine.

Signed-off-by: Mark Brown <redacted>
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 4094707..2f30c79 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c

@@ -353,7 +353,7 @@ static struct regulator_init_data smdk6410_vddpll __initdata = {
 /* VDD_UH_MMC, LDO5 on J5 */
 static struct regulator_init_data smdk6410_vdduh_mmc __initdata = {
 	.constraints = {
-		.name = "PVDD_UH/PVDD_MMC",
+		.name = "PVDD_UH+PVDD_MMC",
 		.always_on = 1,
 	},
 };

@@ -419,7 +419,7 @@ static struct regulator_init_data smdk6410_vddaudio __initdata = {
 /* S3C64xx internal logic & PLL */
 static struct regulator_init_data wm8350_dcdc1_data __initdata = {
 	.constraints = {
-		.name = "PVDD_INT/PVDD_PLL",
+		.name = "PVDD_INT+PVDD_PLL",
 		.min_uV = 1200000,
 		.max_uV = 1200000,
 		.always_on = 1,

@@ -454,7 +454,7 @@ static struct regulator_consumer_supply wm8350_dcdc4_consumers[] __initdata = {
 
 static struct regulator_init_data wm8350_dcdc4_data __initdata = {
 	.constraints = {
-		.name = "PVDD_HI/PVDD_EXT/PVDD_SYS/PVCCM2MTV",
+		.name = "PVDD_HI+PVDD_EXT+PVDD_SYS+PVCCM2MTV",
 		.min_uV = 3000000,
 		.max_uV = 3000000,
 		.always_on = 1,

@@ -466,7 +466,7 @@ static struct regulator_init_data wm8350_dcdc4_data __initdata = {
 /* OTGi/1190-EV1 HPVDD & AVDD */
 static struct regulator_init_data wm8350_ldo4_data __initdata = {
 	.constraints = {
-		.name = "PVDD_OTGI/HPVDD/AVDD",
+		.name = "PVDD_OTGI+HPVDD+AVDD",
 		.min_uV = 1200000,
 		.max_uV = 1200000,
 		.apply_uV = 1,

@@ -557,7 +557,7 @@ static struct wm831x_backlight_pdata wm1192_backlight_pdata = {
 
 static struct regulator_init_data wm1192_dcdc3 = {
 	.constraints = {
-		.name = "PVDD_MEM/PVDD_GPS",
+		.name = "PVDD_MEM+PVDD_GPS",
 		.always_on = 1,
 	},
 };

@@ -568,7 +568,7 @@ static struct regulator_consumer_supply wm1192_ldo1_consumers[] = {
 
 static struct regulator_init_data wm1192_ldo1 = {
 	.constraints = {
-		.name = "PVDD_LCD/PVDD_EXT",
+		.name = "PVDD_LCD+PVDD_EXT",
 		.always_on = 1,
 	},
 	.consumer_supplies = wm1192_ldo1_consumers,

-- 
1.7.2.3

On Thu, Mar 03, 2011 at 02:57:11PM +0000, Mark Brown wrote:

This is a patch series I've got built up for the Samsung platforms, some
of which has been pending for the entire release cycle.  I know Ben's
said he's extremely busy right now (as you can see some of these patches
are from him), perhaps it would make sense to apply these via Kukjin's
tree for the time being?

I'm ok with these being sent upstream via whoever's tree. I do note
that there's a pile of s3c24xx I seem to have missed completely after
falling off linux-kernel a couple of months ago.
 

Ben Dooks (2):
      ARM: S3C64XX: Add clock for i2c1
      ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()

Mark Brown (5):
      ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
      ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
      ARM: S3C64XX: Tone down SDHCI debugging
      ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled
      ARM: SMDK6410: Update regulator names for debugfs compatiblity

 arch/arm/mach-s3c64xx/clock.c         |    6 ++++++
 arch/arm/mach-s3c64xx/dma.c           |   11 ++++++-----
 arch/arm/mach-s3c64xx/gpiolib.c       |    4 ++--
 arch/arm/mach-s3c64xx/mach-smdk6410.c |   13 +++++++------
 arch/arm/mach-s3c64xx/setup-sdhci.c   |    2 +-
 arch/arm/plat-samsung/dev-uart.c      |    2 ++
 6 files changed, 24 insertions(+), 14 deletions(-)

-- 
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

Ben Dooks wrote:

On Thu, Mar 03, 2011 at 02:57:11PM +0000, Mark Brown wrote:

quoted

This is a patch series I've got built up for the Samsung platforms, some
of which has been pending for the entire release cycle.  I know Ben's
said he's extremely busy right now (as you can see some of these patches
are from him), perhaps it would make sense to apply these via Kukjin's
tree for the time being?

I'm ok with these being sent upstream via whoever's tree. I do note
that there's a pile of s3c24xx I seem to have missed completely after
falling off linux-kernel a couple of months ago.

Ok, applied into my tree :)

As a note, they will be sent to upstream this weekend for 38.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim [off-list ref], Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

quoted

Ben Dooks (2):
      ARM: S3C64XX: Add clock for i2c1
      ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()

Mark Brown (5):
      ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
      ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
      ARM: S3C64XX: Tone down SDHCI debugging
      ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled
      ARM: SMDK6410: Update regulator names for debugfs compatiblity

 arch/arm/mach-s3c64xx/clock.c         |    6 ++++++
 arch/arm/mach-s3c64xx/dma.c           |   11 ++++++-----
 arch/arm/mach-s3c64xx/gpiolib.c       |    4 ++--
 arch/arm/mach-s3c64xx/mach-smdk6410.c |   13 +++++++------
 arch/arm/mach-s3c64xx/setup-sdhci.c   |    2 +-
 arch/arm/plat-samsung/dev-uart.c      |    2 ++
 6 files changed, 24 insertions(+), 14 deletions(-)

--
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe

disappear.

Mark Brown wrote:

Mark, there is no '__initdata' in my tree.
I just applied following changes (/ -> +).

If any updates/patches, please let me know :)

 	.constraints = {
-		.name = "PVDD_UH/PVDD_MMC",
+		.name = "PVDD_UH+PVDD_MMC",
 		.always_on = 1,
 	},
 };

(snip)

Thanks.

Best regards,
Kgene.
--
Kukjin Kim [off-list ref], Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

On Fri, Mar 04, 2011 at 10:39:32AM +0900, Kukjin Kim wrote:

quoted

 /* VDD_UH_MMC, LDO5 on J5 */
 static struct regulator_init_data smdk6410_vdduh_mmc __initdata = {

Mark, there is no '__initdata' in my tree.
I just applied following changes (/ -> +).

If any updates/patches, please let me know :)

That's fine, your resolution doesn't seem to have shown up in -next yet
but there's no actual dependency upon that for this change.