[PATCH 1/2] MIPS: lantiq: adds missing clk.h functions

[PATCH 1/2] MIPS: lantiq: adds missing clk.h functions

[John Crispin]

The 2 functions clk_enable() and clk_disable were missing.

Signed-of-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
---
 arch/mips/lantiq/clk.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
index 9456089..aba91db 100644
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
@@ -100,6 +100,17 @@ void clk_put(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_put);
 
+int clk_enable(struct clk *clk)
+{
+	/* not used */
+	return 0;
+}
+
+void clk_disable(struct clk *clk)
+{
+	/* not used */
+}
+
 static inline u32 ltq_get_counter_resolution(void)
 {
 	u32 res;
-- 
1.7.2.3

[PATCH 2/2] MIPS: lantiq: fixes mtd registration of nor device

[John Crispin]

The 2 functions add_mtd_partitions and del_mtd_partitions were renamed to
mtd_device_register and mtd_device_unregister.

Signed-of-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
---
 drivers/mtd/maps/lantiq-flash.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index a90cabd..7e50896 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -182,7 +182,7 @@ ltq_mtd_probe(struct platform_device *pdev)
 		parts = ltq_mtd_data->parts;
 	}
 
-	err = add_mtd_partitions(ltq_mtd->mtd, parts, nr_parts);
+	err = mtd_device_register(ltq_mtd->mtd, parts, nr_parts);
 	if (err) {
 		dev_err(&pdev->dev, "failed to add partitions\n");
 		goto err_destroy;
@@ -208,7 +208,7 @@ ltq_mtd_remove(struct platform_device *pdev)
 
 	if (ltq_mtd) {
 		if (ltq_mtd->mtd) {
-			del_mtd_partitions(ltq_mtd->mtd);
+			mtd_device_unregister(ltq_mtd->mtd);
 			map_destroy(ltq_mtd->mtd);
 		}
 		if (ltq_mtd->map->virt)
-- 
1.7.2.3

Re: [PATCH 2/2] MIPS: lantiq: fixes mtd registration of nor device

[Ralf Baechle]

Thanks, applied as well.

  Ralf

Re: [PATCH 1/2] MIPS: lantiq: adds missing clk.h functions

[Manuel Lauss]

On Thu, Jun 9, 2011 at 7:57 PM, John Crispin <blogic@openwrt.org> wrote:
> The 2 functions clk_enable() and clk_disable were missing.
>
> Signed-of-by: John Crispin <blogic@openwrt.org>
> Cc: linux-mips@linux-mips.org
> ---
>  arch/mips/lantiq/clk.c |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
> index 9456089..aba91db 100644
> --- a/arch/mips/lantiq/clk.c
> +++ b/arch/mips/lantiq/clk.c
> @@ -100,6 +100,17 @@ void clk_put(struct clk *clk)
>  }
>  EXPORT_SYMBOL(clk_put);
>
> +int clk_enable(struct clk *clk)
> +{
> +       /* not used */
> +       return 0;
> +}
> +
> +void clk_disable(struct clk *clk)
> +{
> +       /* not used */
> +}
> +

Shouldn't those be exported as well?

Manuel

Re: [PATCH 1/2] MIPS: lantiq: adds missing clk.h functions

[John Crispin]

On 09/06/11 20:06, Manuel Lauss wrote:
> On Thu, Jun 9, 2011 at 7:57 PM, John Crispin <blogic@openwrt.org> wrote:
>   
>> The 2 functions clk_enable() and clk_disable were missing.
>>
>> Signed-of-by: John Crispin <blogic@openwrt.org>
>> Cc: linux-mips@linux-mips.org
>> ---
>>  arch/mips/lantiq/clk.c |   11 +++++++++++
>>  1 files changed, 11 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
>> index 9456089..aba91db 100644
>> --- a/arch/mips/lantiq/clk.c
>> +++ b/arch/mips/lantiq/clk.c
>> @@ -100,6 +100,17 @@ void clk_put(struct clk *clk)
>>  }
>>  EXPORT_SYMBOL(clk_put);
>>
>> +int clk_enable(struct clk *clk)
>> +{
>> +       /* not used */
>> +       return 0;
>> +}
>> +
>> +void clk_disable(struct clk *clk)
>> +{
>> +       /* not used */
>> +}
>> +
>>     
> Shouldn't those be exported as well?
>
> Manuel
>   

you are right they should be.

will resend in a sec, thx !

John