[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Kukjin Kim]

This patch adds a configuration option for specifing the number
of additional GPIO pins to be used in addition to the GPIO pins
supported onchip.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
---
 arch/arm/plat-samsung/Kconfig |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 900b463..faec4b8 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -66,6 +66,14 @@ config S3C_GPIO_PULL_UP
 	help
 	  Internal configuration to enable the correct GPIO pull helper
 
+config SAMSUNG_GPIO_EXTRA
+	int "Number of additional GPIO pins"
+	default 0
+	help
+	  Use additional GPIO space in addition to the GPIO's the SOC
+	  provides. This allows expanding the GPIO space for use with
+	  GPIO expanders.
+
 # device definitions to compile in
 
 config S3C_DEV_HSMMC
-- 
1.6.2.5

[PATCH 2/3] ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible

[Kukjin Kim]

This patch makes clk_default_setrate and clk_ops_def_setrate available
to code outside plat-samsung clock code.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
---
 arch/arm/plat-samsung/clock.c              |    4 ++--
 arch/arm/plat-samsung/include/plat/clock.h |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 9194af9..0c746ae 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -225,13 +225,13 @@ EXPORT_SYMBOL(clk_set_parent);
 
 /* base clocks */
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
+int clk_default_setrate(struct clk *clk, unsigned long rate)
 {
 	clk->rate = rate;
 	return 0;
 }
 
-static struct clk_ops clk_ops_def_setrate = {
+struct clk_ops clk_ops_def_setrate = {
 	.set_rate	= clk_default_setrate,
 };
 
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index bd41f82..22e0114 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -75,6 +75,9 @@ extern struct clk clk_h2;
 extern struct clk clk_27m;
 extern struct clk clk_48m;
 
+extern int clk_default_setrate(struct clk *clk, unsigned long rate);
+extern struct clk_ops clk_ops_def_setrate;
+
 /* exports for arch/arm/mach-s3c2410
  *
  * Please DO NOT use these outside of arch/arm/mach-s3c2410
-- 
1.6.2.5

[PATCH 3/3] ARM: SAMSUNG: Add idle support

[Kukjin Kim]

This patch adds common idle functionality for all Samsung SoC's.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
---
 arch/arm/plat-samsung/include/mach/idle.h   |   18 +++++++++++++
 arch/arm/plat-samsung/include/mach/system.h |   36 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-samsung/include/mach/idle.h
 create mode 100644 arch/arm/plat-samsung/include/mach/system.h

diff --git a/arch/arm/plat-samsung/include/mach/idle.h b/arch/arm/plat-samsung/include/mach/idle.h
new file mode 100644
index 0000000..f3b5034
--- /dev/null
+++ b/arch/arm/plat-samsung/include/mach/idle.h
@@ -0,0 +1,18 @@
+/* linux/arch/arm/plat-samsung/include/mach/idle.h
+ *
+ * Copyright (c) 2009 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com/
+ *
+ * Idle support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_PLAT_IDLE_H
+#define __ASM_PLAT_IDLE_H __FILE__
+
+extern void (*s3c_idle_fn)(void);
+
+#endif /* __ASM_PLAT_IDLE_H */
diff --git a/arch/arm/plat-samsung/include/mach/system.h b/arch/arm/plat-samsung/include/mach/system.h
new file mode 100644
index 0000000..5377792
--- /dev/null
+++ b/arch/arm/plat-samsung/include/mach/system.h
@@ -0,0 +1,36 @@
+/* linux/arch/arm/plat-samsung/include/mach/idle.h
+ *
+ * Copyright (c) 2009 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com/
+ *
+ * Idle support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_PLAT_SYSTEM_H
+#define __ASM_PLAT_SYSTEM_H __FILE__
+
+void (*s3c_idle_fn)(void);
+
+static void s3c_default_idle(void)
+{
+	/* nothing here yet */
+}
+
+static void arch_idle(void)
+{
+	if (s3c_idle_fn != NULL)
+		(s3c_idle_fn)();
+	else
+		s3c_default_idle();
+}
+
+static void arch_reset(char mode, const char *cmd)
+{
+	/* nothing here yet */
+}
+
+#endif /* __ASM_PLAT_SYSTEM_H */
-- 
1.6.2.5

Re: [PATCH 3/3] ARM: SAMSUNG: Add idle support

[Ben Dooks]

On Mon, Jan 11, 2010 at 12:21:53PM +0900, Kukjin Kim wrote:
> This patch adds common idle functionality for all Samsung SoC's.

ok, merged.
 
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
> ---
>  arch/arm/plat-samsung/include/mach/idle.h   |   18 +++++++++++++
>  arch/arm/plat-samsung/include/mach/system.h |   36 +++++++++++++++++++++++++++
>  2 files changed, 54 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/plat-samsung/include/mach/idle.h
>  create mode 100644 arch/arm/plat-samsung/include/mach/system.h
> 
> diff --git a/arch/arm/plat-samsung/include/mach/idle.h b/arch/arm/plat-samsung/include/mach/idle.h
> new file mode 100644
> index 0000000..f3b5034
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/mach/idle.h
> @@ -0,0 +1,18 @@
> +/* linux/arch/arm/plat-samsung/include/mach/idle.h
> + *
> + * Copyright (c) 2009 Samsung Electronics Co., Ltd.
> + *		http://www.samsung.com/
> + *
> + * Idle support
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#ifndef __ASM_PLAT_IDLE_H
> +#define __ASM_PLAT_IDLE_H __FILE__
> +
> +extern void (*s3c_idle_fn)(void);
> +
> +#endif /* __ASM_PLAT_IDLE_H */
> diff --git a/arch/arm/plat-samsung/include/mach/system.h b/arch/arm/plat-samsung/include/mach/system.h
> new file mode 100644
> index 0000000..5377792
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/mach/system.h
> @@ -0,0 +1,36 @@
> +/* linux/arch/arm/plat-samsung/include/mach/idle.h
> + *
> + * Copyright (c) 2009 Samsung Electronics Co., Ltd.
> + *		http://www.samsung.com/
> + *
> + * Idle support
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#ifndef __ASM_PLAT_SYSTEM_H
> +#define __ASM_PLAT_SYSTEM_H __FILE__
> +
> +void (*s3c_idle_fn)(void);
> +
> +static void s3c_default_idle(void)
> +{
> +	/* nothing here yet */
> +}
> +
> +static void arch_idle(void)
> +{
> +	if (s3c_idle_fn != NULL)
> +		(s3c_idle_fn)();
> +	else
> +		s3c_default_idle();
> +}
> +
> +static void arch_reset(char mode, const char *cmd)
> +{
> +	/* nothing here yet */
> +}
> +
> +#endif /* __ASM_PLAT_SYSTEM_H */
> -- 
> 1.6.2.5
> 

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

Re: [PATCH 2/3] ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible

[Ben Dooks]

On Mon, Jan 11, 2010 at 12:21:52PM +0900, Kukjin Kim wrote:
> This patch makes clk_default_setrate and clk_ops_def_setrate available
> to code outside plat-samsung clock code.
> 
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
> ---
>  arch/arm/plat-samsung/clock.c              |    4 ++--
>  arch/arm/plat-samsung/include/plat/clock.h |    3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
> index 9194af9..0c746ae 100644
> --- a/arch/arm/plat-samsung/clock.c
> +++ b/arch/arm/plat-samsung/clock.c
> @@ -225,13 +225,13 @@ EXPORT_SYMBOL(clk_set_parent);
>  
>  /* base clocks */
>  
> -static int clk_default_setrate(struct clk *clk, unsigned long rate)
> +int clk_default_setrate(struct clk *clk, unsigned long rate)
>  {
>  	clk->rate = rate;
>  	return 0;
>  }
>  
> -static struct clk_ops clk_ops_def_setrate = {
> +struct clk_ops clk_ops_def_setrate = {
>  	.set_rate	= clk_default_setrate,
>  };
>  
> diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
> index bd41f82..22e0114 100644
> --- a/arch/arm/plat-samsung/include/plat/clock.h
> +++ b/arch/arm/plat-samsung/include/plat/clock.h
> @@ -75,6 +75,9 @@ extern struct clk clk_h2;
>  extern struct clk clk_27m;
>  extern struct clk clk_48m;
>  
> +extern int clk_default_setrate(struct clk *clk, unsigned long rate);
> +extern struct clk_ops clk_ops_def_setrate;
> +
>  /* exports for arch/arm/mach-s3c2410
>   *
>   * Please DO NOT use these outside of arch/arm/mach-s3c2410
> -- 
> 1.6.2.5

ok, this looks fine, will apply.


-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

Re: [PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Ben Dooks]

On Mon, Jan 11, 2010 at 12:21:51PM +0900, Kukjin Kim wrote:
> This patch adds a configuration option for specifing the number
> of additional GPIO pins to be used in addition to the GPIO pins
> supported onchip.

looks fine, will apply. 

> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
> ---
>  arch/arm/plat-samsung/Kconfig |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 900b463..faec4b8 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -66,6 +66,14 @@ config S3C_GPIO_PULL_UP
>  	help
>  	  Internal configuration to enable the correct GPIO pull helper
>  
> +config SAMSUNG_GPIO_EXTRA
> +	int "Number of additional GPIO pins"
> +	default 0
> +	help
> +	  Use additional GPIO space in addition to the GPIO's the SOC
> +	  provides. This allows expanding the GPIO space for use with
> +	  GPIO expanders.
> +
>  # device definitions to compile in
>  
>  config S3C_DEV_HSMMC
> -- 
> 1.6.2.5
> 

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

Re: [PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Ben Dooks]

On Mon, Jan 11, 2010 at 12:21:51PM +0900, Kukjin Kim wrote:
> This patch adds a configuration option for specifing the number
> of additional GPIO pins to be used in addition to the GPIO pins
> supported onchip.

It would have been nice to get the S3C24XX_GPIO_EXTRA replaced as well,
but there's no currently good way for each board to set a minimum
value (unless there's something I've missed.)

I will apply this patch and then look at fixing upthe S3C24XX case myself.
 
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
> ---
>  arch/arm/plat-samsung/Kconfig |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 900b463..faec4b8 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -66,6 +66,14 @@ config S3C_GPIO_PULL_UP
>  	help
>  	  Internal configuration to enable the correct GPIO pull helper
>  
> +config SAMSUNG_GPIO_EXTRA
> +	int "Number of additional GPIO pins"
> +	default 0
> +	help
> +	  Use additional GPIO space in addition to the GPIO's the SOC
> +	  provides. This allows expanding the GPIO space for use with
> +	  GPIO expanders.
> +
>  # device definitions to compile in
>  
>  config S3C_DEV_HSMMC
> -- 
> 1.6.2.5
> 

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Kukjin Kim]

This patch adds a configuration option for specifing the number
of additional GPIO pins to be used in addition to the GPIO pins
supported onchip.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
 arch/arm/plat-samsung/Kconfig |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 900b463..faec4b8 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -66,6 +66,14 @@ config S3C_GPIO_PULL_UP
 	help
 	  Internal configuration to enable the correct GPIO pull helper
 
+config SAMSUNG_GPIO_EXTRA
+	int "Number of additional GPIO pins"
+	default 0
+	help
+	  Use additional GPIO space in addition to the GPIO's the SOC
+	  provides. This allows expanding the GPIO space for use with
+	  GPIO expanders.
+
 # device definitions to compile in
 
 config S3C_DEV_HSMMC
-- 
1.6.2.5

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Mark Brown]

On Mon, Jan 11, 2010 at 06:44:06PM +0900, Kukjin Kim wrote:

> +config SAMSUNG_GPIO_EXTRA
> +	int "Number of additional GPIO pins"
> +	default 0
> +	help
> +	  Use additional GPIO space in addition to the GPIO's the SOC
> +	  provides. This allows expanding the GPIO space for use with
> +	  GPIO expanders.
> +

The way this has been handled for previous Samsung variants is to make
it entirely hidden from users and provide selectable values for defining
the number so you end up with something like:

	config SAMSUNG_GPIO_EXTRA
	int
	default 64 if SAMSUNG_GPIO_64
	default 32 if SAMSUNG_GPIO_32
	default 0

The board drivers then select one of the numeric options.  They should
know how many GPIOs they need, while end users rebuilding their kernels
don't need to know this since at least code if not hardware changes will
be required to change it usefully.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Ben Dooks]

On Mon, Jan 11, 2010 at 10:33:39AM +0000, Mark Brown wrote:
> On Mon, Jan 11, 2010 at 06:44:06PM +0900, Kukjin Kim wrote:
> 
> > +config SAMSUNG_GPIO_EXTRA
> > +	int "Number of additional GPIO pins"
> > +	default 0
> > +	help
> > +	  Use additional GPIO space in addition to the GPIO's the SOC
> > +	  provides. This allows expanding the GPIO space for use with
> > +	  GPIO expanders.
> > +
> 
> The way this has been handled for previous Samsung variants is to make
> it entirely hidden from users and provide selectable values for defining
> the number so you end up with something like:
> 
> 	config SAMSUNG_GPIO_EXTRA
> 	int
> 	default 64 if SAMSUNG_GPIO_64
> 	default 32 if SAMSUNG_GPIO_32
> 	default 0
> 
> The board drivers then select one of the numeric options.  They should
> know how many GPIOs they need, while end users rebuilding their kernels
> don't need to know this since at least code if not hardware changes will
> be required to change it usefully.

I've put a question out about trying to change Kconfig to allow
a configuration like this to be set to a minimum value from other
config variables.

Having this as a user settable field might be useful if plugging on
GPIO expanders at runtime.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Mark Brown]

On Mon, Jan 11, 2010 at 12:27:15PM +0000, Ben Dooks wrote:

> Having this as a user settable field might be useful if plugging on
> GPIO expanders at runtime.

If that gets to be anything other than an extremely niche use case the
GPIO allocation would need to have a dynamic limit anyway, though.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Ben Dooks]

On Mon, Jan 11, 2010 at 12:49:27PM +0000, Mark Brown wrote:
> On Mon, Jan 11, 2010 at 12:27:15PM +0000, Ben Dooks wrote:
> 
> > Having this as a user settable field might be useful if plugging on
> > GPIO expanders at runtime.
> 
> If that gets to be anything other than an extremely niche use case the
> GPIO allocation would need to have a dynamic limit anyway, though.

Yes, however a kconfig case where you can set the minimum value of an
integer would make the whole extra-gpio configuration much cleaner and
avoid having toadd further configuration symbols when someone wants an
extra 256 or whatever GPIOS.

Having a dynamic GPIO range would also be nice, someone should look at
adding it to the GPIO code.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 1/3] ARM: SAMSUNG: Add config option for number of additional GPIO pins.

[Mark Brown]

On Tue, Jan 12, 2010 at 12:15:26AM +0000, Ben Dooks wrote:
> On Mon, Jan 11, 2010 at 12:49:27PM +0000, Mark Brown wrote:

> > If that gets to be anything other than an extremely niche use case the
> > GPIO allocation would need to have a dynamic limit anyway, though.

> Yes, however a kconfig case where you can set the minimum value of an
> integer would make the whole extra-gpio configuration much cleaner and
> avoid having toadd further configuration symbols when someone wants an
> extra 256 or whatever GPIOS.

Yes, it'd be very much nicer if Kconfig supported that sort of
dependency but without that the hack with selects does seem about as
good as it gets if you want to do it via Kconfig.  I rather suspect this
is why it's common to have an ifdef tree for these things rather than
trying to push them through Kconfig.