ARM: Show proper respect for Heinrich Hertz by using the correct unit for frequency
The SI unit of frequency is Hertz, named after Heinrich Hertz, and is given the symbol "Hz" to denote this. "hz" is not the unit of frequency, and is in fact meaningless. Fix arch/arm to correctly use "Hz", thereby acknowledging Heinrich Hertz' contribution to the modern world. Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
b787f68c36
commit
6a53bc7500
|
@ -70,7 +70,7 @@
|
|||
broken-cd;
|
||||
bypass-smu;
|
||||
cap-mmc-highspeed;
|
||||
supports-hs200-mode; /* 200 Mhz */
|
||||
supports-hs200-mode; /* 200 MHz */
|
||||
card-detect-delay = <200>;
|
||||
samsung,dw-mshc-ciu-div = <3>;
|
||||
samsung,dw-mshc-sdr-timing = <0 4>;
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
otg_drv_vbus: pinmux_otg_drv_vbus {
|
||||
pinctrl-single,pins = <
|
||||
OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50Mhz_clk.usb0_drvvbus */
|
||||
OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50MHz_clk.usb0_drvvbus */
|
||||
>;
|
||||
};
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ extern void __iomem *da8xx_syscfg1_base;
|
|||
|
||||
/*
|
||||
* If the DA850/OMAP-L138/AM18x SoC on board is of a higher speed grade
|
||||
* (than the regular 300Mhz variant), the board code should set this up
|
||||
* (than the regular 300MHz variant), the board code should set this up
|
||||
* with the supported speed before calling da850_register_cpufreq().
|
||||
*/
|
||||
extern unsigned int da850_max_speed;
|
||||
|
|
|
@ -216,7 +216,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
|
|||
clks[IMX6SX_CLK_USBPHY1_GATE] = imx_clk_gate("usbphy1_gate", "dummy", base + 0x10, 6);
|
||||
clks[IMX6SX_CLK_USBPHY2_GATE] = imx_clk_gate("usbphy2_gate", "dummy", base + 0x20, 6);
|
||||
|
||||
/* FIXME 100Mhz is used for pcie ref for all imx6 pcie, excepted imx6q */
|
||||
/* FIXME 100MHz is used for pcie ref for all imx6 pcie, excepted imx6q */
|
||||
clks[IMX6SX_CLK_PCIE_REF] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 5);
|
||||
clks[IMX6SX_CLK_PCIE_REF_125M] = imx_clk_gate("pcie_ref_125m", "pcie_ref", base + 0xe0, 19);
|
||||
|
||||
|
@ -520,7 +520,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
|
|||
pr_err("Failed to set pcie parent clk.\n");
|
||||
|
||||
/*
|
||||
* Init enet system AHB clock, set to 200Mhz
|
||||
* Init enet system AHB clock, set to 200MHz
|
||||
* pll2_pfd2_396m-> ENET_PODF-> ENET_AHB
|
||||
*/
|
||||
clk_set_parent(clks[IMX6SX_CLK_ENET_PRE_SEL], clks[IMX6SX_CLK_PLL2_PFD2]);
|
||||
|
|
|
@ -42,7 +42,7 @@ static inline unsigned long iop13xx_core_freq(void)
|
|||
case IOP13XX_CORE_FREQ_1200:
|
||||
return 1200000000;
|
||||
default:
|
||||
printk("%s: warning unknown frequency, defaulting to 800Mhz\n",
|
||||
printk("%s: warning unknown frequency, defaulting to 800MHz\n",
|
||||
__func__);
|
||||
}
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ extern unsigned long ixp4xx_exp_bus_size;
|
|||
/*
|
||||
* Clock Speed Definitions.
|
||||
*/
|
||||
#define IXP4XX_PERIPHERAL_BUS_CLOCK (66) /* 66Mhzi APB BUS */
|
||||
#define IXP4XX_PERIPHERAL_BUS_CLOCK (66) /* 66MHzi APB BUS */
|
||||
#define IXP4XX_UART_XTAL 14745600
|
||||
|
||||
/*
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <asm/sizes.h>
|
||||
|
||||
/*
|
||||
* Clocks are derived from MCLK, which is 25Mhz
|
||||
* Clocks are derived from MCLK, which is 25MHz
|
||||
*/
|
||||
#define KS8695_CLOCK_RATE 25000000
|
||||
|
||||
|
|
|
@ -216,11 +216,11 @@ static void omap2_onenand_calc_sync_timings(struct gpmc_timings *t,
|
|||
|
||||
div = gpmc_calc_divider(min_gpmc_clk_period);
|
||||
gpmc_clk_ns = gpmc_ticks_to_ns(div);
|
||||
if (gpmc_clk_ns < 15) /* >66Mhz */
|
||||
if (gpmc_clk_ns < 15) /* >66MHz */
|
||||
onenand_flags |= ONENAND_FLAG_HF;
|
||||
else
|
||||
onenand_flags &= ~ONENAND_FLAG_HF;
|
||||
if (gpmc_clk_ns < 12) /* >83Mhz */
|
||||
if (gpmc_clk_ns < 12) /* >83MHz */
|
||||
onenand_flags |= ONENAND_FLAG_VHF;
|
||||
else
|
||||
onenand_flags &= ~ONENAND_FLAG_VHF;
|
||||
|
|
|
@ -70,7 +70,7 @@ static void omap_hsmmc1_before_set_reg(struct device *dev,
|
|||
|
||||
reg = omap_ctrl_readl(control_pbias_offset);
|
||||
if (cpu_is_omap3630()) {
|
||||
/* Set MMC I/O to 52Mhz */
|
||||
/* Set MMC I/O to 52MHz */
|
||||
prog_io = omap_ctrl_readl(OMAP343X_CONTROL_PROG_IO1);
|
||||
prog_io |= OMAP3630_PRG_SDMMC1_SPEEDCTRL;
|
||||
omap_ctrl_writel(prog_io, OMAP343X_CONTROL_PROG_IO1);
|
||||
|
|
|
@ -116,7 +116,7 @@ const struct prcm_config omap2430_rate_table[] = {
|
|||
RATE_IN_243X},
|
||||
|
||||
/* PRCM-boot/bypass */
|
||||
{S13M, S13M, S13M, RB_CM_CLKSEL_MPU_VAL, /* 13Mhz */
|
||||
{S13M, S13M, S13M, RB_CM_CLKSEL_MPU_VAL, /* 13MHz */
|
||||
RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
|
||||
RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_13_VAL,
|
||||
MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
|
||||
|
@ -124,7 +124,7 @@ const struct prcm_config omap2430_rate_table[] = {
|
|||
RATE_IN_243X},
|
||||
|
||||
/* PRCM-boot/bypass */
|
||||
{S12M, S12M, S12M, RB_CM_CLKSEL_MPU_VAL, /* 12Mhz */
|
||||
{S12M, S12M, S12M, RB_CM_CLKSEL_MPU_VAL, /* 12MHz */
|
||||
RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
|
||||
RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_12_VAL,
|
||||
MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
|
||||
|
|
|
@ -164,6 +164,6 @@ void omap2xxx_sdrc_init_params(u32 force_lock_to_unlock_mode)
|
|||
mem_timings.slow_dll_ctrl |=
|
||||
((mem_timings.fast_dll_ctrl & 0xF) | (1 << 2));
|
||||
|
||||
/* 90 degree phase for anything below 133Mhz + disable DLL filter */
|
||||
/* 90 degree phase for anything below 133MHz + disable DLL filter */
|
||||
mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8));
|
||||
}
|
||||
|
|
|
@ -64,7 +64,7 @@ ENTRY(omap242x_sram_ddr_init)
|
|||
mvn r9, #0x4 @ mask to get clear bit2
|
||||
and r10, r10, r9 @ clear bit2 for lock mode.
|
||||
orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos)
|
||||
orr r10, r10, #0x2 @ 90 degree phase for all below 133Mhz
|
||||
orr r10, r10, #0x2 @ 90 degree phase for all below 133MHz
|
||||
str r10, [r11] @ commit to DLLA_CTRL
|
||||
bl i_dll_wait @ wait for dll to lock
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ ENTRY(omap243x_sram_ddr_init)
|
|||
mvn r9, #0x4 @ mask to get clear bit2
|
||||
and r10, r10, r9 @ clear bit2 for lock mode.
|
||||
orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos)
|
||||
orr r10, r10, #0x2 @ 90 degree phase for all below 133Mhz
|
||||
orr r10, r10, #0x2 @ 90 degree phase for all below 133MHz
|
||||
str r10, [r11] @ commit to DLLA_CTRL
|
||||
bl i_dll_wait @ wait for dll to lock
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
static void isp116x_pfm_delay(struct device *dev, int delay)
|
||||
{
|
||||
|
||||
/* 400Mhz PXA2 = 2.5ns / instruction */
|
||||
/* 400MHz PXA2 = 2.5ns / instruction */
|
||||
|
||||
int cyc = delay / 10;
|
||||
|
||||
|
|
Loading…
Reference in a new issue