Skip to content

L
linux
Commit 28d250c4 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'samsung-cleanup' of... 

Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Samsung cleanup for v4.3

- make the following headers local
  watchdog-reset, onenand-core, irq-uart, backlight,
  ata-core, regs-usb-hsotg-phy, spi-core, nand-core,
  fb-core and regs-srom headers
- make the following c file local
  s5p-dev-mfc, dev-backlight and setup-camif c file
- remove keypad-core.h file
- drop owner assignment in pmu.c
- remove duplicated define of SLEEP_MAGIC
- make exynos5420_powerdown_conf() staic

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: remove keypad-core header in plat-samsung
  ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
  ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
  ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
  ARM: SAMSUNG: local backlight header in mach-s3c64xx
  ARM: SAMSUNG: local ata-core header in mach-s3c64xx
  ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
  ARM: SAMSUNG: local spi-core header in mach-s3c24xx
  ARM: SAMSUNG: local nand-core header in mach-s3c24xx
  ARM: SAMSUNG: local fb-core header in mach-s3c24xx
  ARM: SAMSUNG: local regs-srom header in mach-exynos
  ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
  ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx
  ARM: SAMSUNG: make local setup-camif in mach-s3c24xx
  ARM: EXYNOS: Drop owner assignment in pmu.c
  ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC
  ARM: EXYNOS: Make local function static
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fc293f5f d306d08f
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 100 deletions
arch/arm/mach-exynos/Kconfig
View file @ 28d250c4
......@@ -30,6 +30,11 @@ menuconfig ARCH_EXYNOS
if ARCH_EXYNOS
config S5P_DEV_MFC
bool
help
Compile in setup memory (init) code for MFC
config ARCH_EXYNOS3
bool "SAMSUNG EXYNOS3"
select ARM_CPU_SUSPEND if PM
......
arch/arm/mach-exynos/Makefile
View file @ 28d250c4
......@@ -23,3 +23,5 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)
obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
CFLAGS_mcpm-exynos.o += -march=armv7-a
obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
arch/arm/mach-exynos/common.h
View file @ 28d250c4
......@@ -128,6 +128,12 @@ void exynos_firmware_init(void);
/* CPU BOOT mode flag for Exynos3250 SoC bootloader */
#define C2_STATE (1 << 3)
/*
* Magic values for bootloader indicating chosen low power mode.
* See also Documentation/arm/Samsung/Bootloader-interface.txt
*/
#define EXYNOS_SLEEP_MAGIC 0x00000bad
#define EXYNOS_AFTR_MAGIC 0xfcba0d10
void exynos_set_boot_flag(unsigned int cpu, unsigned int mode);
void exynos_clear_boot_flag(unsigned int cpu, unsigned int mode);
......
arch/arm/mach-exynos/firmware.c
View file @ 28d250c4
......@@ -25,8 +25,6 @@
#include "common.h"
#include "smc.h"
#define EXYNOS_SLEEP_MAGIC 0x00000bad
#define EXYNOS_AFTR_MAGIC 0xfcba0d10
#define EXYNOS_BOOT_ADDR 0x8
#define EXYNOS_BOOT_FLAG 0xc
......
arch/arm/mach-exynos/pmu.c
View file @ 28d250c4
......@@ -698,7 +698,7 @@ static void exynos_power_off(void)
;
}
void exynos5420_powerdown_conf(enum sys_powerdown mode)
static void exynos5420_powerdown_conf(enum sys_powerdown mode)
{
u32 this_cluster;
......@@ -991,7 +991,6 @@ static int exynos_pmu_probe(struct platform_device *pdev)
static struct platform_driver exynos_pmu_driver = {
.driver = {
.name = "exynos-pmu",
.owner = THIS_MODULE,
.of_match_table = exynos_pmu_of_device_ids,
},
.probe = exynos_pmu_probe,
......
arch/arm/plat-samsung/include/plat/regs-srom.h → arch/arm/mach-exynos/regs-srom.h
View file @ 28d250c4
/* linux/arch/arm/plat-samsung/include/plat/regs-srom.h
*
/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
......
arch/arm/mach-exynos/suspend.c
View file @ 28d250c4
......@@ -32,13 +32,11 @@
#include <asm/suspend.h>
#include <plat/pm-common.h>
#include <plat/regs-srom.h>
#include "common.h"
#include "regs-pmu.h"
#include "exynos-pmu.h"
#define S5P_CHECK_SLEEP 0x00000BAD
#include "regs-pmu.h"
#include "regs-srom.h"
#define REG_TABLE_END (-1U)
......@@ -331,7 +329,7 @@ static void exynos_pm_enter_sleep_mode(void)
{
/* Set value of power down register for sleep mode */
exynos_sys_powerdown_conf(SYS_SLEEP);
pmu_raw_writel(S5P_CHECK_SLEEP, S5P_INFORM1);
pmu_raw_writel(EXYNOS_SLEEP_MAGIC, S5P_INFORM1);
}
static void exynos_pm_prepare(void)
......
arch/arm/mach-s3c24xx/Kconfig
View file @ 28d250c4
......@@ -124,6 +124,11 @@ config S3C24XX_PLL
This also means that the PLL tables for the selected CPU(s) will
be built which may increase the size of the kernel image.
config S3C_SETUP_CAMIF
bool
help
Compile in common setup code for S3C CAMIF devices
# cpu frequency items common between s3c2410 and s3c2440/s3c2442
config S3C2410_IOTIMING
......
arch/arm/mach-s3c24xx/Makefile
View file @ 28d250c4
......@@ -99,3 +99,4 @@ obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o
obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o
obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o
obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o
arch/arm/plat-samsung/include/plat/fb-core.h → arch/arm/mach-s3c24xx/fb-core.h
View file @ 28d250c4
/*
* arch/arm/plat-samsung/include/plat/fb-core.h
*
* Copyright 2010 Samsung Electronics Co., Ltd.
* Pawel Osciak <p.osciak@samsung.com>
*
......
arch/arm/plat-samsung/include/plat/nand-core.h → arch/arm/mach-s3c24xx/nand-core.h
View file @ 28d250c4
/* arch/arm/plat-samsung/include/plat/nand-core.h
*
/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
......
arch/arm/mach-s3c24xx/s3c2412.c
View file @ 28d250c4
......@@ -40,11 +40,11 @@
#include <plat/cpu.h>
#include <plat/cpu-freq.h>
#include <plat/devs.h>
#include <plat/nand-core.h>
#include <plat/pm.h>
#include <plat/regs-spi.h>
#include "common.h"
#include "nand-core.h"
#include "regs-dsc.h"
#include "s3c2412-power.h"
......
arch/arm/mach-s3c24xx/s3c2416.c
View file @ 28d250c4
......@@ -59,12 +59,12 @@
#include <plat/pm.h>
#include <plat/iic-core.h>
#include <plat/fb-core.h>
#include <plat/nand-core.h>
#include <plat/adc-core.h>
#include <plat/spi-core.h>
#include "common.h"
#include "fb-core.h"
#include "nand-core.h"
#include "spi-core.h"
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
......
arch/arm/mach-s3c24xx/s3c2443.c
View file @ 28d250c4
......@@ -41,10 +41,11 @@
#include <plat/gpio-cfg-helpers.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/fb-core.h>
#include <plat/nand-core.h>
#include <plat/adc-core.h>
#include <plat/spi-core.h>
#include "fb-core.h"
#include "nand-core.h"
#include "spi-core.h"
static struct map_desc s3c2443_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
......
arch/arm/mach-s3c24xx/s3c244x.c
View file @ 28d250c4
......@@ -41,9 +41,9 @@
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/nand-core.h>
#include "common.h"
#include "nand-core.h"
#include "regs-dsc.h"
static struct map_desc s3c244x_iodesc[] __initdata = {
......
arch/arm/mach-s3c64xx/Kconfig
View file @ 28d250c4
......@@ -34,6 +34,12 @@ config S3C64XX_DEV_ONENAND1
help
Compile in platform device definition for OneNAND1 controller
config SAMSUNG_DEV_BACKLIGHT
bool
depends on SAMSUNG_DEV_PWM
help
Compile in platform device definition LCD backlight with PWM Timer
# platform specific device setup
config S3C64XX_SETUP_I2C0
......
arch/arm/mach-s3c64xx/Makefile
View file @ 28d250c4
......@@ -40,6 +40,8 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
obj-$(CONFIG_S3C64XX_SETUP_USB_PHY) += setup-usb-phy.o
obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight.o
# Machine support
obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o
......
arch/arm/plat-samsung/include/plat/ata-core.h → arch/arm/mach-s3c64xx/ata-core.h
View file @ 28d250c4
/* linux/arch/arm/plat-samsung/include/plat/ata-core.h
*
/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
......
arch/arm/plat-samsung/include/plat/backlight.h → arch/arm/mach-s3c64xx/backlight.h
View file @ 28d250c4
/* linux/arch/arm/plat-samsung/include/plat/backlight.h
*
/*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
......
arch/arm/mach-s3c64xx/common.c
View file @ 28d250c4
......@@ -48,12 +48,12 @@
#include <plat/devs.h>
#include <plat/pm.h>
#include <plat/gpio-cfg.h>
#include <plat/irq-uart.h>
#include <plat/pwm-core.h>
#include <plat/regs-irqtype.h>
#include <plat/watchdog-reset.h>
#include "common.h"
#include "irq-uart.h"
#include "watchdog-reset.h"
/* External clock frequency */
static unsigned long xtal_f = 12000000, xusbxti_f = 48000000;
......
arch/arm/plat-samsung/dev-backlight.c → arch/arm/mach-s3c64xx/dev-backlight.c
View file @ 28d250c4
/* linux/arch/arm/plat-samsung/dev-backlight.c
*
/*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
......@@ -18,7 +17,8 @@
#include <plat/devs.h>
#include <plat/gpio-cfg.h>
#include <plat/backlight.h>
#include "backlight.h"
struct samsung_bl_drvdata {
struct platform_pwm_backlight_data plat_data;
......
arch/arm/plat-samsung/include/plat/irq-uart.h → arch/arm/mach-s3c64xx/irq-uart.h
View file @ 28d250c4
/* arch/arm/plat-samsung/include/plat/irq-uart.h
*
/*
* Copyright (c) 2010 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
......
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
View file @ 28d250c4
......@@ -15,11 +15,10 @@
#include <asm/system_misc.h>
#include <plat/cpu.h>
#include <plat/watchdog-reset.h>
#include <mach/map.h>
#include "common.h"
#include "watchdog-reset.h"
/*
* IO mapping for shared system controller IP.
......
arch/arm/mach-s3c64xx/mach-smdk6410.c
View file @ 28d250c4
......@@ -68,9 +68,9 @@
#include <plat/adc.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <plat/keypad.h>
#include <plat/backlight.h>
#include <plat/samsung-time.h>
#include "backlight.h"
#include "common.h"
#include "regs-modem.h"
#include "regs-srom.h"
......
arch/arm/plat-samsung/include/plat/onenand-core.h → arch/arm/mach-s3c64xx/onenand-core.h
View file @ 28d250c4
/*
* linux/arch/arm/plat-samsung/onenand-core.h
*
* Copyright (c) 2010 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
* Marek Szyprowski <m.szyprowski@samsung.com>
......
arch/arm/plat-samsung/include/plat/regs-usb-hsotg-phy.h → arch/arm/mach-s3c64xx/regs-usb-hsotg-phy.h
View file @ 28d250c4
/* arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h
*
/*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
* http://armlinux.simtec.co.uk/
......
arch/arm/mach-s3c64xx/s3c6400.c
View file @ 28d250c4
......@@ -41,9 +41,9 @@
#include <plat/devs.h>
#include <plat/sdhci.h>
#include <plat/iic-core.h>
#include <plat/onenand-core.h>
#include "common.h"
#include "onenand-core.h"
void __init s3c6400_map_io(void)
{
......
arch/arm/mach-s3c64xx/s3c6410.c
View file @ 28d250c4
......@@ -41,12 +41,12 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/sdhci.h>
#include <plat/ata-core.h>
#include <plat/adc-core.h>
#include <plat/iic-core.h>
#include <plat/onenand-core.h>
#include "ata-core.h"
#include "common.h"
#include "onenand-core.h"
void __init s3c6410_map_io(void)
{
......
arch/arm/mach-s3c64xx/setup-usb-phy.c
View file @ 28d250c4
......@@ -16,10 +16,10 @@
#include <linux/platform_device.h>
#include <mach/map.h>
#include <plat/cpu.h>
#include <plat/regs-usb-hsotg-phy.h>
#include <plat/usb-phy.h>
#include "regs-sys.h"
#include "regs-usb-hsotg-phy.h"
static int s3c_usb_otgphy_init(struct platform_device *pdev)
{
......
arch/arm/plat-samsung/include/plat/watchdog-reset.h → arch/arm/mach-s3c64xx/watchdog-reset.h
View file @ 28d250c4
/* arch/arm/plat-s3c/include/plat/watchdog-reset.h
*
/*
* Copyright (c) 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
......
arch/arm/plat-samsung/Kconfig
View file @ 28d250c4
......@@ -217,12 +217,6 @@ config SAMSUNG_DEV_PWM
help
Compile in platform device definition for PWM Timer
config SAMSUNG_DEV_BACKLIGHT
bool
depends on SAMSUNG_DEV_PWM
help
Compile in platform device definition LCD backlight with PWM Timer
config S3C24XX_PWM
bool "PWM device support"
select PWM
......@@ -231,25 +225,14 @@ config S3C24XX_PWM
Support for exporting the PWM timer blocks via the pwm device
system
config S3C_SETUP_CAMIF
bool
help
Compile in common setup code for S3C CAMIF devices
config SAMSUNG_PM_GPIO
bool
default y if GPIO_SAMSUNG && PM
help
Include legacy GPIO power management code for platforms not using
pinctrl-samsung driver.
endif
config S5P_DEV_MFC
bool
help
Compile in setup memory (init) code for MFC
comment "Power management"
config SAMSUNG_PM_DEBUG
......
arch/arm/plat-samsung/Makefile
View file @ 28d250c4
......@@ -20,11 +20,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o
obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o
obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o
obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight.o
obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o
# PM support
......
arch/arm/plat-samsung/include/plat/keypad-core.h deleted 100644 → 0
View file @ fc293f5f
/*
* linux/arch/arm/plat-samsung/include/plat/keypad-core.h
*
* Copyright (C) 2010 Samsung Electronics Co.Ltd
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
*
* Samsung keypad controller core function
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
*/
#ifndef __ASM_ARCH_KEYPAD_CORE_H
#define __ASM_ARCH_KEYPAD_CORE_H
/* These function are only for use with the core support code, such as
* the cpu specific initialisation code
*/
/* re-define device name depending on support. */
static inline void samsung_keypad_setname(char *name)
{
#ifdef CONFIG_SAMSUNG_DEV_KEYPAD
samsung_device_keypad.name = name;
#endif
}
#endif /* __ASM_ARCH_KEYPAD_CORE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7