aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-05-14 11:18:46 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-05-14 11:22:05 -0400
commit6a53bc750004fdab11494e9e6c864b4a425fc1a1 (patch)
tree678cbb004e6f688499dc8d72328965dea83f8e9b
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
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>
-rw-r--r--arch/arm/boot/dts/exynos5260-xyref5260.dts2
-rw-r--r--arch/arm/boot/dts/omap3-cm-t3517.dts2
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h2
-rw-r--r--arch/arm/mach-imx/clk-imx6sx.c4
-rw-r--r--arch/arm/mach-iop13xx/include/mach/time.h2
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/platform.h2
-rw-r--r--arch/arm/mach-ks8695/include/mach/hardware.h2
-rw-r--r--arch/arm/mach-omap2/gpmc-onenand.c4
-rw-r--r--arch/arm/mach-omap2/hsmmc.c2
-rw-r--r--arch/arm/mach-omap2/opp2430_data.c4
-rw-r--r--arch/arm/mach-omap2/sdrc2xxx.c2
-rw-r--r--arch/arm/mach-omap2/sram242x.S2
-rw-r--r--arch/arm/mach-omap2/sram243x.S2
-rw-r--r--arch/arm/mach-pxa/mp900.c2
14 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index a803b605051b..3daef94bee38 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -70,7 +70,7 @@
70 broken-cd; 70 broken-cd;
71 bypass-smu; 71 bypass-smu;
72 cap-mmc-highspeed; 72 cap-mmc-highspeed;
73 supports-hs200-mode; /* 200 Mhz */ 73 supports-hs200-mode; /* 200 MHz */
74 card-detect-delay = <200>; 74 card-detect-delay = <200>;
75 samsung,dw-mshc-ciu-div = <3>; 75 samsung,dw-mshc-ciu-div = <3>;
76 samsung,dw-mshc-sdr-timing = <0 4>; 76 samsung,dw-mshc-sdr-timing = <0 4>;
diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts
index f5b5a1d96cd7..53ae04f9104d 100644
--- a/arch/arm/boot/dts/omap3-cm-t3517.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3517.dts
@@ -66,7 +66,7 @@
66 66
67 otg_drv_vbus: pinmux_otg_drv_vbus { 67 otg_drv_vbus: pinmux_otg_drv_vbus {
68 pinctrl-single,pins = < 68 pinctrl-single,pins = <
69 OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50Mhz_clk.usb0_drvvbus */ 69 OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50MHz_clk.usb0_drvvbus */
70 >; 70 >;
71 }; 71 };
72 72
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 39e58b48e826..f9f9713aacdd 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -36,7 +36,7 @@ extern void __iomem *da8xx_syscfg1_base;
36 36
37/* 37/*
38 * If the DA850/OMAP-L138/AM18x SoC on board is of a higher speed grade 38 * If the DA850/OMAP-L138/AM18x SoC on board is of a higher speed grade
39 * (than the regular 300Mhz variant), the board code should set this up 39 * (than the regular 300MHz variant), the board code should set this up
40 * with the supported speed before calling da850_register_cpufreq(). 40 * with the supported speed before calling da850_register_cpufreq().
41 */ 41 */
42extern unsigned int da850_max_speed; 42extern unsigned int da850_max_speed;
diff --git a/arch/arm/mach-imx/clk-imx6sx.c b/arch/arm/mach-imx/clk-imx6sx.c
index 5a3e5a159e70..87c5b0911ddd 100644
--- a/arch/arm/mach-imx/clk-imx6sx.c
+++ b/arch/arm/mach-imx/clk-imx6sx.c
@@ -216,7 +216,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
216 clks[IMX6SX_CLK_USBPHY1_GATE] = imx_clk_gate("usbphy1_gate", "dummy", base + 0x10, 6); 216 clks[IMX6SX_CLK_USBPHY1_GATE] = imx_clk_gate("usbphy1_gate", "dummy", base + 0x10, 6);
217 clks[IMX6SX_CLK_USBPHY2_GATE] = imx_clk_gate("usbphy2_gate", "dummy", base + 0x20, 6); 217 clks[IMX6SX_CLK_USBPHY2_GATE] = imx_clk_gate("usbphy2_gate", "dummy", base + 0x20, 6);
218 218
219 /* FIXME 100Mhz is used for pcie ref for all imx6 pcie, excepted imx6q */ 219 /* FIXME 100MHz is used for pcie ref for all imx6 pcie, excepted imx6q */
220 clks[IMX6SX_CLK_PCIE_REF] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 5); 220 clks[IMX6SX_CLK_PCIE_REF] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 5);
221 clks[IMX6SX_CLK_PCIE_REF_125M] = imx_clk_gate("pcie_ref_125m", "pcie_ref", base + 0xe0, 19); 221 clks[IMX6SX_CLK_PCIE_REF_125M] = imx_clk_gate("pcie_ref_125m", "pcie_ref", base + 0xe0, 19);
222 222
@@ -520,7 +520,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
520 pr_err("Failed to set pcie parent clk.\n"); 520 pr_err("Failed to set pcie parent clk.\n");
521 521
522 /* 522 /*
523 * Init enet system AHB clock, set to 200Mhz 523 * Init enet system AHB clock, set to 200MHz
524 * pll2_pfd2_396m-> ENET_PODF-> ENET_AHB 524 * pll2_pfd2_396m-> ENET_PODF-> ENET_AHB
525 */ 525 */
526 clk_set_parent(clks[IMX6SX_CLK_ENET_PRE_SEL], clks[IMX6SX_CLK_PLL2_PFD2]); 526 clk_set_parent(clks[IMX6SX_CLK_ENET_PRE_SEL], clks[IMX6SX_CLK_PLL2_PFD2]);
diff --git a/arch/arm/mach-iop13xx/include/mach/time.h b/arch/arm/mach-iop13xx/include/mach/time.h
index 15bc9bb78a6b..c871e6874594 100644
--- a/arch/arm/mach-iop13xx/include/mach/time.h
+++ b/arch/arm/mach-iop13xx/include/mach/time.h
@@ -42,7 +42,7 @@ static inline unsigned long iop13xx_core_freq(void)
42 case IOP13XX_CORE_FREQ_1200: 42 case IOP13XX_CORE_FREQ_1200:
43 return 1200000000; 43 return 1200000000;
44 default: 44 default:
45 printk("%s: warning unknown frequency, defaulting to 800Mhz\n", 45 printk("%s: warning unknown frequency, defaulting to 800MHz\n",
46 __func__); 46 __func__);
47 } 47 }
48 48
diff --git a/arch/arm/mach-ixp4xx/include/mach/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h
index 75c4c6572ad0..34b3d3f3f131 100644
--- a/arch/arm/mach-ixp4xx/include/mach/platform.h
+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
@@ -74,7 +74,7 @@ extern unsigned long ixp4xx_exp_bus_size;
74/* 74/*
75 * Clock Speed Definitions. 75 * Clock Speed Definitions.
76 */ 76 */
77#define IXP4XX_PERIPHERAL_BUS_CLOCK (66) /* 66Mhzi APB BUS */ 77#define IXP4XX_PERIPHERAL_BUS_CLOCK (66) /* 66MHzi APB BUS */
78#define IXP4XX_UART_XTAL 14745600 78#define IXP4XX_UART_XTAL 14745600
79 79
80/* 80/*
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h
index 5090338c0db2..959c748ee8bb 100644
--- a/arch/arm/mach-ks8695/include/mach/hardware.h
+++ b/arch/arm/mach-ks8695/include/mach/hardware.h
@@ -17,7 +17,7 @@
17#include <asm/sizes.h> 17#include <asm/sizes.h>
18 18
19/* 19/*
20 * Clocks are derived from MCLK, which is 25Mhz 20 * Clocks are derived from MCLK, which is 25MHz
21 */ 21 */
22#define KS8695_CLOCK_RATE 25000000 22#define KS8695_CLOCK_RATE 25000000
23 23
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c
index f899e77ff5e6..17a6f752a436 100644
--- a/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@ -216,11 +216,11 @@ static void omap2_onenand_calc_sync_timings(struct gpmc_timings *t,
216 216
217 div = gpmc_calc_divider(min_gpmc_clk_period); 217 div = gpmc_calc_divider(min_gpmc_clk_period);
218 gpmc_clk_ns = gpmc_ticks_to_ns(div); 218 gpmc_clk_ns = gpmc_ticks_to_ns(div);
219 if (gpmc_clk_ns < 15) /* >66Mhz */ 219 if (gpmc_clk_ns < 15) /* >66MHz */
220 onenand_flags |= ONENAND_FLAG_HF; 220 onenand_flags |= ONENAND_FLAG_HF;
221 else 221 else
222 onenand_flags &= ~ONENAND_FLAG_HF; 222 onenand_flags &= ~ONENAND_FLAG_HF;
223 if (gpmc_clk_ns < 12) /* >83Mhz */ 223 if (gpmc_clk_ns < 12) /* >83MHz */
224 onenand_flags |= ONENAND_FLAG_VHF; 224 onenand_flags |= ONENAND_FLAG_VHF;
225 else 225 else
226 onenand_flags &= ~ONENAND_FLAG_VHF; 226 onenand_flags &= ~ONENAND_FLAG_VHF;
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 9a8611ab5dfa..cff079e563f4 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -70,7 +70,7 @@ static void omap_hsmmc1_before_set_reg(struct device *dev,
70 70
71 reg = omap_ctrl_readl(control_pbias_offset); 71 reg = omap_ctrl_readl(control_pbias_offset);
72 if (cpu_is_omap3630()) { 72 if (cpu_is_omap3630()) {
73 /* Set MMC I/O to 52Mhz */ 73 /* Set MMC I/O to 52MHz */
74 prog_io = omap_ctrl_readl(OMAP343X_CONTROL_PROG_IO1); 74 prog_io = omap_ctrl_readl(OMAP343X_CONTROL_PROG_IO1);
75 prog_io |= OMAP3630_PRG_SDMMC1_SPEEDCTRL; 75 prog_io |= OMAP3630_PRG_SDMMC1_SPEEDCTRL;
76 omap_ctrl_writel(prog_io, OMAP343X_CONTROL_PROG_IO1); 76 omap_ctrl_writel(prog_io, OMAP343X_CONTROL_PROG_IO1);
diff --git a/arch/arm/mach-omap2/opp2430_data.c b/arch/arm/mach-omap2/opp2430_data.c
index 0e75ec3e114b..b2233b72b24d 100644
--- a/arch/arm/mach-omap2/opp2430_data.c
+++ b/arch/arm/mach-omap2/opp2430_data.c
@@ -116,7 +116,7 @@ const struct prcm_config omap2430_rate_table[] = {
116 RATE_IN_243X}, 116 RATE_IN_243X},
117 117
118 /* PRCM-boot/bypass */ 118 /* PRCM-boot/bypass */
119 {S13M, S13M, S13M, RB_CM_CLKSEL_MPU_VAL, /* 13Mhz */ 119 {S13M, S13M, S13M, RB_CM_CLKSEL_MPU_VAL, /* 13MHz */
120 RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL, 120 RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
121 RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_13_VAL, 121 RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_13_VAL,
122 MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL, 122 MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
@@ -124,7 +124,7 @@ const struct prcm_config omap2430_rate_table[] = {
124 RATE_IN_243X}, 124 RATE_IN_243X},
125 125
126 /* PRCM-boot/bypass */ 126 /* PRCM-boot/bypass */
127 {S12M, S12M, S12M, RB_CM_CLKSEL_MPU_VAL, /* 12Mhz */ 127 {S12M, S12M, S12M, RB_CM_CLKSEL_MPU_VAL, /* 12MHz */
128 RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL, 128 RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
129 RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_12_VAL, 129 RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_12_VAL,
130 MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL, 130 MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c
index ae3f1553158d..339b0ecb7c32 100644
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -164,6 +164,6 @@ void omap2xxx_sdrc_init_params(u32 force_lock_to_unlock_mode)
164 mem_timings.slow_dll_ctrl |= 164 mem_timings.slow_dll_ctrl |=
165 ((mem_timings.fast_dll_ctrl & 0xF) | (1 << 2)); 165 ((mem_timings.fast_dll_ctrl & 0xF) | (1 << 2));
166 166
167 /* 90 degree phase for anything below 133Mhz + disable DLL filter */ 167 /* 90 degree phase for anything below 133MHz + disable DLL filter */
168 mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8)); 168 mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8));
169} 169}
diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S
index 2c88ff2d0236..53a2537cd75a 100644
--- a/arch/arm/mach-omap2/sram242x.S
+++ b/arch/arm/mach-omap2/sram242x.S
@@ -64,7 +64,7 @@ ENTRY(omap242x_sram_ddr_init)
64 mvn r9, #0x4 @ mask to get clear bit2 64 mvn r9, #0x4 @ mask to get clear bit2
65 and r10, r10, r9 @ clear bit2 for lock mode. 65 and r10, r10, r9 @ clear bit2 for lock mode.
66 orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos) 66 orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos)
67 orr r10, r10, #0x2 @ 90 degree phase for all below 133Mhz 67 orr r10, r10, #0x2 @ 90 degree phase for all below 133MHz
68 str r10, [r11] @ commit to DLLA_CTRL 68 str r10, [r11] @ commit to DLLA_CTRL
69 bl i_dll_wait @ wait for dll to lock 69 bl i_dll_wait @ wait for dll to lock
70 70
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S
index d5deb9761fc7..b3edd6f7f7db 100644
--- a/arch/arm/mach-omap2/sram243x.S
+++ b/arch/arm/mach-omap2/sram243x.S
@@ -64,7 +64,7 @@ ENTRY(omap243x_sram_ddr_init)
64 mvn r9, #0x4 @ mask to get clear bit2 64 mvn r9, #0x4 @ mask to get clear bit2
65 and r10, r10, r9 @ clear bit2 for lock mode. 65 and r10, r10, r9 @ clear bit2 for lock mode.
66 orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos) 66 orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos)
67 orr r10, r10, #0x2 @ 90 degree phase for all below 133Mhz 67 orr r10, r10, #0x2 @ 90 degree phase for all below 133MHz
68 str r10, [r11] @ commit to DLLA_CTRL 68 str r10, [r11] @ commit to DLLA_CTRL
69 bl i_dll_wait @ wait for dll to lock 69 bl i_dll_wait @ wait for dll to lock
70 70
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c
index 854f1f562d6b..14f6aaf8fcc9 100644
--- a/arch/arm/mach-pxa/mp900.c
+++ b/arch/arm/mach-pxa/mp900.c
@@ -28,7 +28,7 @@
28static void isp116x_pfm_delay(struct device *dev, int delay) 28static void isp116x_pfm_delay(struct device *dev, int delay)
29{ 29{
30 30
31 /* 400Mhz PXA2 = 2.5ns / instruction */ 31 /* 400MHz PXA2 = 2.5ns / instruction */
32 32
33 int cyc = delay / 10; 33 int cyc = delay / 10;
34 34