Exynos5422/5800: set cpu id to 0x5422

The proper CPU ID for those Exynos variants is 0x5422,
but before the 0x5800 was set. This commit fix this back.

Changes:
- set cpu id to 0x5422 instead of 0x5800
- remove macro proid_is_exynos5800()
- add macro proid_is_exynos5422()
- change the calls to proid_is_exynos5800() with new macro

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Tested-by: Anand Moon <linux.amoon@gmail.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
master
Przemyslaw Marczak 9 years ago committed by Minkyu Kang
parent 3b72b60099
commit d64c8adedc
  1. 16
      arch/arm/mach-exynos/clock.c
  2. 2
      arch/arm/mach-exynos/clock_init_exynos5.c
  3. 4
      arch/arm/mach-exynos/common_setup.h
  4. 6
      arch/arm/mach-exynos/include/mach/cpu.h
  5. 4
      arch/arm/mach-exynos/include/mach/gpio.h
  6. 2
      arch/arm/mach-exynos/pinmux.c
  7. 2
      arch/arm/mach-exynos/power.c

@ -159,8 +159,8 @@ static int exynos_get_pll_clk(int pllreg, unsigned int r, unsigned int k)
div = PLL_DIV_1024; div = PLL_DIV_1024;
else if (proid_is_exynos4412()) else if (proid_is_exynos4412())
div = PLL_DIV_65535; div = PLL_DIV_65535;
else if (proid_is_exynos5250() || proid_is_exynos5420() else if (proid_is_exynos5250() || proid_is_exynos5420() ||
|| proid_is_exynos5800()) proid_is_exynos5422())
div = PLL_DIV_65536; div = PLL_DIV_65536;
else else
return 0; return 0;
@ -346,7 +346,7 @@ static struct clk_bit_info *get_clk_bit_info(int peripheral)
int i; int i;
struct clk_bit_info *info; struct clk_bit_info *info;
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
info = exynos542x_bit_info; info = exynos542x_bit_info;
else else
info = exynos5_bit_info; info = exynos5_bit_info;
@ -558,7 +558,7 @@ static unsigned long exynos542x_get_periph_rate(int peripheral)
unsigned long clock_get_periph_rate(int peripheral) unsigned long clock_get_periph_rate(int peripheral)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return exynos542x_get_periph_rate(peripheral); return exynos542x_get_periph_rate(peripheral);
return exynos5_get_periph_rate(peripheral); return exynos5_get_periph_rate(peripheral);
} else { } else {
@ -1576,7 +1576,7 @@ static unsigned long exynos4_get_i2c_clk(void)
unsigned long get_pll_clk(int pllreg) unsigned long get_pll_clk(int pllreg)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return exynos542x_get_pll_clk(pllreg); return exynos542x_get_pll_clk(pllreg);
return exynos5_get_pll_clk(pllreg); return exynos5_get_pll_clk(pllreg);
} else if (cpu_is_exynos4()) { } else if (cpu_is_exynos4()) {
@ -1692,7 +1692,7 @@ void set_mmc_clk(int dev_index, unsigned int div)
div -= 1; div -= 1;
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
exynos5420_set_mmc_clk(dev_index, div); exynos5420_set_mmc_clk(dev_index, div);
else else
exynos5_set_mmc_clk(dev_index, div); exynos5_set_mmc_clk(dev_index, div);
@ -1708,7 +1708,7 @@ unsigned long get_lcd_clk(void)
} else if (cpu_is_exynos5()) { } else if (cpu_is_exynos5()) {
if (proid_is_exynos5420()) if (proid_is_exynos5420())
return exynos5420_get_lcd_clk(); return exynos5420_get_lcd_clk();
else if (proid_is_exynos5800()) else if (proid_is_exynos5422())
return exynos5800_get_lcd_clk(); return exynos5800_get_lcd_clk();
else else
return exynos5_get_lcd_clk(); return exynos5_get_lcd_clk();
@ -1740,7 +1740,7 @@ void set_mipi_clk(void)
int set_spi_clk(int periph_id, unsigned int rate) int set_spi_clk(int periph_id, unsigned int rate)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return exynos5420_set_spi_clk(periph_id, rate); return exynos5420_set_spi_clk(periph_id, rate);
return exynos5_set_spi_clk(periph_id, rate); return exynos5_set_spi_clk(periph_id, rate);
} }

@ -971,7 +971,7 @@ static void exynos5420_system_clock_init(void)
void system_clock_init(void) void system_clock_init(void)
{ {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
exynos5420_system_clock_init(); exynos5420_system_clock_init();
else else
exynos5250_system_clock_init(); exynos5250_system_clock_init();

@ -78,7 +78,7 @@ static inline void configure_l2_ctlr(void)
CACHE_TAG_RAM_LATENCY_2_CYCLES | CACHE_TAG_RAM_LATENCY_2_CYCLES |
CACHE_DATA_RAM_LATENCY_2_CYCLES; CACHE_DATA_RAM_LATENCY_2_CYCLES;
if (proid_is_exynos5420() || proid_is_exynos5800()) { if (proid_is_exynos5420() || proid_is_exynos5422()) {
val |= CACHE_ECC_AND_PARITY | val |= CACHE_ECC_AND_PARITY |
CACHE_TAG_RAM_LATENCY_3_CYCLES | CACHE_TAG_RAM_LATENCY_3_CYCLES |
CACHE_DATA_RAM_LATENCY_3_CYCLES; CACHE_DATA_RAM_LATENCY_3_CYCLES;
@ -97,7 +97,7 @@ static inline void configure_l2_actlr(void)
{ {
uint32_t val; uint32_t val;
if (proid_is_exynos5420() || proid_is_exynos5800()) { if (proid_is_exynos5420() || proid_is_exynos5422()) {
mrc_l2_aux_ctlr(val); mrc_l2_aux_ctlr(val);
val |= CACHE_ENABLE_FORCE_L2_LOGIC | val |= CACHE_ENABLE_FORCE_L2_LOGIC |
CACHE_DISABLE_CLEAN_EVICT; CACHE_DISABLE_CLEAN_EVICT;

@ -237,7 +237,7 @@ static inline void s5p_set_cpu_id(void)
* Exynos5800 is a variant of Exynos5420 * Exynos5800 is a variant of Exynos5420
* and has product id 0x5422 * and has product id 0x5422
*/ */
s5p_cpu_id = 0x5800; s5p_cpu_id = 0x5422;
break; break;
} }
} }
@ -267,7 +267,7 @@ IS_EXYNOS_TYPE(exynos4210, 0x4210)
IS_EXYNOS_TYPE(exynos4412, 0x4412) IS_EXYNOS_TYPE(exynos4412, 0x4412)
IS_EXYNOS_TYPE(exynos5250, 0x5250) IS_EXYNOS_TYPE(exynos5250, 0x5250)
IS_EXYNOS_TYPE(exynos5420, 0x5420) IS_EXYNOS_TYPE(exynos5420, 0x5420)
IS_EXYNOS_TYPE(exynos5800, 0x5800) IS_EXYNOS_TYPE(exynos5422, 0x5422)
#define SAMSUNG_BASE(device, base) \ #define SAMSUNG_BASE(device, base) \
static inline unsigned int __attribute__((no_instrument_function)) \ static inline unsigned int __attribute__((no_instrument_function)) \
@ -278,7 +278,7 @@ static inline unsigned int __attribute__((no_instrument_function)) \
return EXYNOS4X12_##base; \ return EXYNOS4X12_##base; \
return EXYNOS4_##base; \ return EXYNOS4_##base; \
} else if (cpu_is_exynos5()) { \ } else if (cpu_is_exynos5()) { \
if (proid_is_exynos5420() || proid_is_exynos5800()) \ if (proid_is_exynos5420() || proid_is_exynos5422()) \
return EXYNOS5420_##base; \ return EXYNOS5420_##base; \
return EXYNOS5_##base; \ return EXYNOS5_##base; \
} \ } \

@ -1398,7 +1398,7 @@ static struct gpio_info exynos5420_gpio_data[EXYNOS5420_GPIO_NUM_PARTS] = {
static inline struct gpio_info *get_gpio_data(void) static inline struct gpio_info *get_gpio_data(void)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return exynos5420_gpio_data; return exynos5420_gpio_data;
else else
return exynos5_gpio_data; return exynos5_gpio_data;
@ -1415,7 +1415,7 @@ static inline struct gpio_info *get_gpio_data(void)
static inline unsigned int get_bank_num(void) static inline unsigned int get_bank_num(void)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return EXYNOS5420_GPIO_NUM_PARTS; return EXYNOS5420_GPIO_NUM_PARTS;
else else
return EXYNOS5_GPIO_NUM_PARTS; return EXYNOS5_GPIO_NUM_PARTS;

@ -858,7 +858,7 @@ static int exynos4x12_pinmux_config(int peripheral, int flags)
int exynos_pinmux_config(int peripheral, int flags) int exynos_pinmux_config(int peripheral, int flags)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
return exynos5420_pinmux_config(peripheral, flags); return exynos5420_pinmux_config(peripheral, flags);
else if (proid_is_exynos5250()) else if (proid_is_exynos5250())
return exynos5_pinmux_config(peripheral, flags); return exynos5_pinmux_config(peripheral, flags);

@ -125,7 +125,7 @@ static void exynos5420_set_usbdev_phy_ctrl(unsigned int enable)
void set_usbdrd_phy_ctrl(unsigned int enable) void set_usbdrd_phy_ctrl(unsigned int enable)
{ {
if (cpu_is_exynos5()) { if (cpu_is_exynos5()) {
if (proid_is_exynos5420() || proid_is_exynos5800()) if (proid_is_exynos5420() || proid_is_exynos5422())
exynos5420_set_usbdev_phy_ctrl(enable); exynos5420_set_usbdev_phy_ctrl(enable);
else else
exynos5_set_usbdrd_phy_ctrl(enable); exynos5_set_usbdrd_phy_ctrl(enable);

Loading…
Cancel
Save