Merge tag 'samsung-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/cleanup
Samsung mach/soc update for v4.8: 1. Minor cleanups. * tag 'samsung-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c24xx: Sort cpufreq tables ARM: SAMSUNG: Fix typos Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
@@ -520,7 +520,7 @@
|
||||
#define S3C24XX_EXTINT1 S3C24XX_GPIOREG2(0x8C)
|
||||
#define S3C24XX_EXTINT2 S3C24XX_GPIOREG2(0x90)
|
||||
|
||||
/* interrupt filtering conrrol for EINT16..EINT23 */
|
||||
/* interrupt filtering control for EINT16..EINT23 */
|
||||
#define S3C2410_EINFLT0 S3C2410_GPIOREG(0x94)
|
||||
#define S3C2410_EINFLT1 S3C2410_GPIOREG(0x98)
|
||||
#define S3C2410_EINFLT2 S3C2410_GPIOREG(0x9C)
|
||||
|
@@ -423,7 +423,7 @@ void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
|
||||
* @timings: The IO timing information to fill out.
|
||||
*
|
||||
* Calculate the @timings timing information from the current frequency
|
||||
* information in @cfg, and the new frequency configur
|
||||
* information in @cfg, and the new frequency configuration
|
||||
* through all the IO banks, reading the state and then updating @iot
|
||||
* as necessary.
|
||||
*
|
||||
|
@@ -522,7 +522,7 @@ static void __init n30_hwinit(void)
|
||||
*
|
||||
* The pull ups for H6/H7 are enabled on N30 but not on the
|
||||
* N35/PiN. I suppose is useful for a budget model of the N30
|
||||
* with no bluetooh. It doesn't hurt to have the pull ups
|
||||
* with no bluetooth. It doesn't hurt to have the pull ups
|
||||
* enabled on the N35, so leave them enabled for all models.
|
||||
*/
|
||||
__raw_writel(0x0028aaaa, S3C2410_GPHCON);
|
||||
|
@@ -143,7 +143,7 @@ static int osiris_dvs_remove(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* the CONFIG_PM block is so small, it isn't worth actaully compiling it
|
||||
/* the CONFIG_PM block is so small, it isn't worth actually compiling it
|
||||
* out if the configuration isn't set. */
|
||||
|
||||
static int osiris_dvs_suspend(struct device *dev)
|
||||
|
@@ -32,11 +32,12 @@
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/cpu-freq-core.h>
|
||||
|
||||
/* This array should be sorted in ascending order of the frequencies */
|
||||
static struct cpufreq_frequency_table pll_vals_12MHz[] = {
|
||||
{ .frequency = 34000000, .driver_data = PLLVAL(82, 2, 3), },
|
||||
{ .frequency = 45000000, .driver_data = PLLVAL(82, 1, 3), },
|
||||
{ .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), },
|
||||
{ .frequency = 48000000, .driver_data = PLLVAL(120, 2, 3), },
|
||||
{ .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), },
|
||||
{ .frequency = 56000000, .driver_data = PLLVAL(142, 2, 3), },
|
||||
{ .frequency = 68000000, .driver_data = PLLVAL(82, 2, 2), },
|
||||
{ .frequency = 79000000, .driver_data = PLLVAL(71, 1, 2), },
|
||||
|
@@ -20,6 +20,7 @@
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/cpu-freq-core.h>
|
||||
|
||||
/* This array should be sorted in ascending order of the frequencies */
|
||||
static struct cpufreq_frequency_table s3c2440_plls_12[] = {
|
||||
{ .frequency = 75000000, .driver_data = PLLVAL(0x75, 3, 3), }, /* FVco 600.000000 */
|
||||
{ .frequency = 80000000, .driver_data = PLLVAL(0x98, 4, 3), }, /* FVco 640.000000 */
|
||||
|
@@ -20,6 +20,7 @@
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/cpu-freq-core.h>
|
||||
|
||||
/* This array should be sorted in ascending order of the frequencies */
|
||||
static struct cpufreq_frequency_table s3c2440_plls_169344[] = {
|
||||
{ .frequency = 78019200, .driver_data = PLLVAL(121, 5, 3), }, /* FVco 624.153600 */
|
||||
{ .frequency = 84067200, .driver_data = PLLVAL(131, 5, 3), }, /* FVco 672.537600 */
|
||||
|
Viittaa uudesa ongelmassa
Block a user