* [PATCH 1/2] mach-bcm283x/core: fix clkdev uarts for raspberry pi
@ 2018-11-27 8:51 Rouven Czerwinski
2018-11-27 8:51 ` [PATCH 2/2] rpi-common: fix sdhci clkdev " Rouven Czerwinski
2018-11-27 12:45 ` [PATCH v2] multiple/raspberry-pi: fix clkdevs " Rouven Czerwinski
0 siblings, 2 replies; 5+ messages in thread
From: Rouven Czerwinski @ 2018-11-27 8:51 UTC (permalink / raw)
To: barebox; +Cc: Rouven Czerwinski
Commit 7e497d48acbd1184e3f6bd23bd16dfae84dd1129 introduced a name change which
breaks support for the fixed clkdev uart for RPI3.
Use clkdev_add_physbase instead to be independant from the device tree names.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/mach-bcm283x/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c
index 26f0996b1c..f1dcda86f7 100644
--- a/arch/arm/mach-bcm283x/core.c
+++ b/arch/arm/mach-bcm283x/core.c
@@ -40,8 +40,8 @@ static int bcm2835_clk_init(void)
clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "uart0-pl0110");
- clk_register_clkdev(clk, NULL, "20201000.serial");
- clk_register_clkdev(clk, NULL, "3f201000.serial");
+ clkdev_add_physbase(clk, 0x20201000, NULL);
+ clkdev_add_physbase(clk, 0x3f201000, NULL);
clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "bcm2835-cs");
--
2.19.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] rpi-common: fix sdhci clkdev for raspberry pi
2018-11-27 8:51 [PATCH 1/2] mach-bcm283x/core: fix clkdev uarts for raspberry pi Rouven Czerwinski
@ 2018-11-27 8:51 ` Rouven Czerwinski
2018-11-27 8:56 ` Rouven Czerwinski
2018-11-27 12:45 ` [PATCH v2] multiple/raspberry-pi: fix clkdevs " Rouven Czerwinski
1 sibling, 1 reply; 5+ messages in thread
From: Rouven Czerwinski @ 2018-11-27 8:51 UTC (permalink / raw)
To: barebox; +Cc: Rouven Czerwinski
The clkdev here
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 3baed65255..b7ce0ad425 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -290,8 +290,8 @@ static int rpi_clock_init(void)
if (IS_ERR(clk))
return PTR_ERR(clk);
- clk_register_clkdev(clk, NULL, "20300000.sdhci");
- clk_register_clkdev(clk, NULL, "3f300000.sdhci");
+ clkdev_add_physbase(clk, 0x20300000, NULL);
+ clkdev_add_physbase(clk, 0x3f300000, NULL);
return 0;
}
--
2.19.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] rpi-common: fix sdhci clkdev for raspberry pi
2018-11-27 8:51 ` [PATCH 2/2] rpi-common: fix sdhci clkdev " Rouven Czerwinski
@ 2018-11-27 8:56 ` Rouven Czerwinski
0 siblings, 0 replies; 5+ messages in thread
From: Rouven Czerwinski @ 2018-11-27 8:56 UTC (permalink / raw)
To: Rouven Czerwinski; +Cc: barebox
Rouven Czerwinski <r.czerwinski@pengutronix.de> writes:
> The clkdev here
This commit message is insufficient, will fix in a V2.
That said I can also merge both commits into one.
- Rouven
>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
> arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
> index 3baed65255..b7ce0ad425 100644
> --- a/arch/arm/boards/raspberry-pi/rpi-common.c
> +++ b/arch/arm/boards/raspberry-pi/rpi-common.c
> @@ -290,8 +290,8 @@ static int rpi_clock_init(void)
> if (IS_ERR(clk))
> return PTR_ERR(clk);
>
> - clk_register_clkdev(clk, NULL, "20300000.sdhci");
> - clk_register_clkdev(clk, NULL, "3f300000.sdhci");
> + clkdev_add_physbase(clk, 0x20300000, NULL);
> + clkdev_add_physbase(clk, 0x3f300000, NULL);
>
> return 0;
> }
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] multiple/raspberry-pi: fix clkdevs for raspberry pi
2018-11-27 8:51 [PATCH 1/2] mach-bcm283x/core: fix clkdev uarts for raspberry pi Rouven Czerwinski
2018-11-27 8:51 ` [PATCH 2/2] rpi-common: fix sdhci clkdev " Rouven Czerwinski
@ 2018-11-27 12:45 ` Rouven Czerwinski
2018-11-29 7:50 ` Sascha Hauer
1 sibling, 1 reply; 5+ messages in thread
From: Rouven Czerwinski @ 2018-11-27 12:45 UTC (permalink / raw)
To: barebox; +Cc: Rouven Czerwinski
Commit 7e497d48acbd1184e3f6bd23bd16dfae84dd1129 introduced a name change which
breaks support for the fixed clkdev for uart and sdhci for RPI.
Use clkdev_add_physbase instead to be independant from the device tree names.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++--
arch/arm/mach-bcm283x/core.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 3baed65255..b7ce0ad425 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -290,8 +290,8 @@ static int rpi_clock_init(void)
if (IS_ERR(clk))
return PTR_ERR(clk);
- clk_register_clkdev(clk, NULL, "20300000.sdhci");
- clk_register_clkdev(clk, NULL, "3f300000.sdhci");
+ clkdev_add_physbase(clk, 0x20300000, NULL);
+ clkdev_add_physbase(clk, 0x3f300000, NULL);
return 0;
}
diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c
index 26f0996b1c..f1dcda86f7 100644
--- a/arch/arm/mach-bcm283x/core.c
+++ b/arch/arm/mach-bcm283x/core.c
@@ -40,8 +40,8 @@ static int bcm2835_clk_init(void)
clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "uart0-pl0110");
- clk_register_clkdev(clk, NULL, "20201000.serial");
- clk_register_clkdev(clk, NULL, "3f201000.serial");
+ clkdev_add_physbase(clk, 0x20201000, NULL);
+ clkdev_add_physbase(clk, 0x3f201000, NULL);
clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "bcm2835-cs");
--
2.19.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] multiple/raspberry-pi: fix clkdevs for raspberry pi
2018-11-27 12:45 ` [PATCH v2] multiple/raspberry-pi: fix clkdevs " Rouven Czerwinski
@ 2018-11-29 7:50 ` Sascha Hauer
0 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2018-11-29 7:50 UTC (permalink / raw)
To: Rouven Czerwinski; +Cc: barebox
On Tue, Nov 27, 2018 at 01:45:02PM +0100, Rouven Czerwinski wrote:
> Commit 7e497d48acbd1184e3f6bd23bd16dfae84dd1129 introduced a name change which
> breaks support for the fixed clkdev for uart and sdhci for RPI.
> Use clkdev_add_physbase instead to be independant from the device tree names.
>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
> arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++--
> arch/arm/mach-bcm283x/core.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks
Sascha
>
> diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
> index 3baed65255..b7ce0ad425 100644
> --- a/arch/arm/boards/raspberry-pi/rpi-common.c
> +++ b/arch/arm/boards/raspberry-pi/rpi-common.c
> @@ -290,8 +290,8 @@ static int rpi_clock_init(void)
> if (IS_ERR(clk))
> return PTR_ERR(clk);
>
> - clk_register_clkdev(clk, NULL, "20300000.sdhci");
> - clk_register_clkdev(clk, NULL, "3f300000.sdhci");
> + clkdev_add_physbase(clk, 0x20300000, NULL);
> + clkdev_add_physbase(clk, 0x3f300000, NULL);
>
> return 0;
> }
> diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c
> index 26f0996b1c..f1dcda86f7 100644
> --- a/arch/arm/mach-bcm283x/core.c
> +++ b/arch/arm/mach-bcm283x/core.c
> @@ -40,8 +40,8 @@ static int bcm2835_clk_init(void)
>
> clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000);
> clk_register_clkdev(clk, NULL, "uart0-pl0110");
> - clk_register_clkdev(clk, NULL, "20201000.serial");
> - clk_register_clkdev(clk, NULL, "3f201000.serial");
> + clkdev_add_physbase(clk, 0x20201000, NULL);
> + clkdev_add_physbase(clk, 0x3f201000, NULL);
>
> clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
> clk_register_clkdev(clk, NULL, "bcm2835-cs");
> --
> 2.19.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-29 7:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-27 8:51 [PATCH 1/2] mach-bcm283x/core: fix clkdev uarts for raspberry pi Rouven Czerwinski
2018-11-27 8:51 ` [PATCH 2/2] rpi-common: fix sdhci clkdev " Rouven Czerwinski
2018-11-27 8:56 ` Rouven Czerwinski
2018-11-27 12:45 ` [PATCH v2] multiple/raspberry-pi: fix clkdevs " Rouven Czerwinski
2018-11-29 7:50 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox