* [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC @ 2016-01-25 7:44 Teresa Remmet 2016-01-25 7:44 ` [PATCH v2 2/2] arm: am33xx: Master Osc clock speed handling Teresa Remmet 2016-01-26 7:01 ` [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Sascha Hauer 0 siblings, 2 replies; 3+ messages in thread From: Teresa Remmet @ 2016-01-25 7:44 UTC (permalink / raw) To: barebox From: Daniel Schultz <d.schultz@phytec.de> Move the function to read the Master OSC speed from the SYSBOOT Configuration Pin for reuse. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Teresa Remmet <t.remmet@phytec.de> --- Changes in v2: - Return kHz instead of Hz to be able to use a 32bit type arch/arm/mach-omap/am33xx_clock.c | 27 ++++++++++++++++++++++++++ arch/arm/mach-omap/dmtimer.c | 20 +++---------------- arch/arm/mach-omap/include/mach/am33xx-clock.h | 1 + 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-omap/am33xx_clock.c b/arch/arm/mach-omap/am33xx_clock.c index 6d8adde..3ed1d52 100644 --- a/arch/arm/mach-omap/am33xx_clock.c +++ b/arch/arm/mach-omap/am33xx_clock.c @@ -318,3 +318,30 @@ void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M) /* Enable the required peripherals */ am33xx_enable_per_clocks(); } + +/* + * Return the OSC clock value from SYSBOOT pins in kHz. + */ +int am33xx_get_osc_clock(void) +{ + int osc; + u32 sysboot; + + sysboot = (readl(AM33XX_CTRL_STATUS) >> 22) & 3; + switch (sysboot) { + case 0: + osc = 19200; + break; + case 1: + osc = 24000; + break; + case 2: + osc = 25000; + break; + case 3: + osc = 26000; + break; + } + + return osc; +} diff --git a/arch/arm/mach-omap/dmtimer.c b/arch/arm/mach-omap/dmtimer.c index 56adda0..e223b8c 100644 --- a/arch/arm/mach-omap/dmtimer.c +++ b/arch/arm/mach-omap/dmtimer.c @@ -31,6 +31,7 @@ #include <init.h> #include <io.h> #include <mach/am33xx-silicon.h> +#include <mach/am33xx-clock.h> #include <stdio.h> @@ -82,24 +83,9 @@ static struct clocksource dmtimer_cs = { static int dmtimer_init(void) { u64 clk_speed; - int sysboot; - - sysboot = (readl(AM33XX_CTRL_STATUS) >> 22) & 3; - switch (sysboot) { - case 0: - clk_speed = 19200000; - break; - case 1: - clk_speed = 24000000; - break; - case 2: - clk_speed = 25000000; - break; - case 3: - clk_speed = 26000000; - break; - } + clk_speed = am33xx_get_osc_clock(); + clk_speed *= 1000; dmtimer_cs.mult = clocksource_hz2mult(clk_speed, dmtimer_cs.shift); /* Enable counter */ diff --git a/arch/arm/mach-omap/include/mach/am33xx-clock.h b/arch/arm/mach-omap/include/mach/am33xx-clock.h index 2d6a727..b9dcebd 100644 --- a/arch/arm/mach-omap/include/mach/am33xx-clock.h +++ b/arch/arm/mach-omap/include/mach/am33xx-clock.h @@ -185,5 +185,6 @@ void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M); void am33xx_enable_ddr_clocks(void); +int am33xx_get_osc_clock(void); #endif /* endif _AM33XX_CLOCKS_H_ */ -- 1.9.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] arm: am33xx: Master Osc clock speed handling 2016-01-25 7:44 [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Teresa Remmet @ 2016-01-25 7:44 ` Teresa Remmet 2016-01-26 7:01 ` [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Sascha Hauer 1 sibling, 0 replies; 3+ messages in thread From: Teresa Remmet @ 2016-01-25 7:44 UTC (permalink / raw) To: barebox From: Daniel Schultz <d.schultz@phytec.de> Setup the plls with Master Osc. clock speed from the SYSBOOT Configuration Pin. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Teresa Remmet <t.remmet@phytec.de> --- Changes in v2: - Updated patch as am33xx_get_osc_clock() returns now kHz arch/arm/boards/afi-gf/lowlevel.c | 2 +- arch/arm/boards/beaglebone/lowlevel.c | 4 ++-- arch/arm/boards/phytec-som-am335x/lowlevel.c | 4 +--- arch/arm/mach-omap/am33xx_clock.c | 8 +++++++- arch/arm/mach-omap/include/mach/am33xx-clock.h | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm/boards/afi-gf/lowlevel.c b/arch/arm/boards/afi-gf/lowlevel.c index 4aaecb9..efe15ec 100644 --- a/arch/arm/boards/afi-gf/lowlevel.c +++ b/arch/arm/boards/afi-gf/lowlevel.c @@ -222,7 +222,7 @@ static noinline int gf_sram_init(void) while(__raw_readl(AM33XX_WDT_REG(WWPS)) != 0x0); /* Setup the PLLs and the clocks for the peripherals */ - am33xx_pll_init(MPUPLL_M_500, 24, DDRPLL_M_200); + am33xx_pll_init(MPUPLL_M_500, DDRPLL_M_200); board_config_ddr(); diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c index 05b3e5f..79d5985 100644 --- a/arch/arm/boards/beaglebone/lowlevel.c +++ b/arch/arm/boards/beaglebone/lowlevel.c @@ -138,11 +138,11 @@ static noinline int beaglebone_sram_init(void) /* Setup the PLLs and the clocks for the peripherals */ if (is_beaglebone_black()) { - am33xx_pll_init(MPUPLL_M_500, 24, DDRPLL_M_400); + am33xx_pll_init(MPUPLL_M_500, DDRPLL_M_400); am335x_sdram_init(0x18B, &ddr3_cmd_ctrl, &ddr3_regs, &ddr3_data); } else { - am33xx_pll_init(MPUPLL_M_500, 24, DDRPLL_M_266); + am33xx_pll_init(MPUPLL_M_500, DDRPLL_M_266); am335x_sdram_init(0x18B, &ddr2_cmd_ctrl, &ddr2_regs, &ddr2_data); } diff --git a/arch/arm/boards/phytec-som-am335x/lowlevel.c b/arch/arm/boards/phytec-som-am335x/lowlevel.c index 64c1c53..d7afbb6 100644 --- a/arch/arm/boards/phytec-som-am335x/lowlevel.c +++ b/arch/arm/boards/phytec-som-am335x/lowlevel.c @@ -32,7 +32,6 @@ #include "ram-timings.h" -#define CLK_M_OSC_MHZ 25 #define DDR_IOCTRL 0x18B static const struct am33xx_cmd_control physom_cmd = { @@ -67,11 +66,10 @@ static noinline void physom_board_init(int sdram, void *fdt) writel(WDT_DISABLE_CODE1, AM33XX_WDT_REG(WSPR)); while (readl(AM33XX_WDT_REG(WWPS)) != 0x0); - writel(WDT_DISABLE_CODE2, AM33XX_WDT_REG(WSPR)); while (readl(AM33XX_WDT_REG(WWPS)) != 0x0); - am33xx_pll_init(MPUPLL_M_600, CLK_M_OSC_MHZ, DDRPLL_M_400); + am33xx_pll_init(MPUPLL_M_600, DDRPLL_M_400); am335x_sdram_init(DDR_IOCTRL, &physom_cmd, &timing->regs, diff --git a/arch/arm/mach-omap/am33xx_clock.c b/arch/arm/mach-omap/am33xx_clock.c index 3ed1d52..ad735cb 100644 --- a/arch/arm/mach-omap/am33xx_clock.c +++ b/arch/arm/mach-omap/am33xx_clock.c @@ -15,6 +15,7 @@ #include <common.h> #include <asm/io.h> #include <mach/am33xx-clock.h> +#include <asm-generic/div64.h> #define PRCM_MOD_EN 0x2 #define PRCM_FORCE_WAKEUP 0x2 @@ -304,8 +305,13 @@ void am33xx_enable_ddr_clocks(void) /* * Configure the PLL/PRCM for necessary peripherals */ -void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M) +void am33xx_pll_init(int mpupll_M, int ddrpll_M) { + int osc; + + osc = am33xx_get_osc_clock(); + osc /= 1000; + mpu_pll_config(mpupll_M, osc); core_pll_config(osc); per_pll_config(osc); diff --git a/arch/arm/mach-omap/include/mach/am33xx-clock.h b/arch/arm/mach-omap/include/mach/am33xx-clock.h index b9dcebd..284d5f8 100644 --- a/arch/arm/mach-omap/include/mach/am33xx-clock.h +++ b/arch/arm/mach-omap/include/mach/am33xx-clock.h @@ -183,7 +183,7 @@ #define CM_ALWON_GPMC_CLKCTRL CM_PER_GPMC_CLKCTRL -void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M); +void am33xx_pll_init(int mpupll_M, int ddrpll_M); void am33xx_enable_ddr_clocks(void); int am33xx_get_osc_clock(void); -- 1.9.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC 2016-01-25 7:44 [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Teresa Remmet 2016-01-25 7:44 ` [PATCH v2 2/2] arm: am33xx: Master Osc clock speed handling Teresa Remmet @ 2016-01-26 7:01 ` Sascha Hauer 1 sibling, 0 replies; 3+ messages in thread From: Sascha Hauer @ 2016-01-26 7:01 UTC (permalink / raw) To: Teresa Remmet; +Cc: barebox On Mon, Jan 25, 2016 at 08:44:13AM +0100, Teresa Remmet wrote: > From: Daniel Schultz <d.schultz@phytec.de> > > Move the function to read the Master OSC speed from > the SYSBOOT Configuration Pin for reuse. > > Signed-off-by: Daniel Schultz <d.schultz@phytec.de> > Signed-off-by: Teresa Remmet <t.remmet@phytec.de> > --- > Changes in v2: > - Return kHz instead of Hz to be able to use a 32bit type > > arch/arm/mach-omap/am33xx_clock.c | 27 ++++++++++++++++++++++++++ > arch/arm/mach-omap/dmtimer.c | 20 +++---------------- > arch/arm/mach-omap/include/mach/am33xx-clock.h | 1 + > 3 files changed, 31 insertions(+), 17 deletions(-) Applied, thanks Sascha -- 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] 3+ messages in thread
end of thread, other threads:[~2016-01-26 7:01 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-01-25 7:44 [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Teresa Remmet 2016-01-25 7:44 ` [PATCH v2 2/2] arm: am33xx: Master Osc clock speed handling Teresa Remmet 2016-01-26 7:01 ` [PATCH v2 1/2] arm: am33xx: Move function to read from Master OSC Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox