Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

		clock-names = "usbhost";

	};

	usbphy@12130000 {

		compatible = "samsung,exynos5250-usb2phy";

		reg = <0x12130000 0x100>;

		clocks = <&clock 1>, <&clock 285>;

		clock-names = "ext_xtal", "usbhost";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		usbphy-sys {

			reg = <0x10040704 0x8>,

			      <0x10050230 0x4>;

		};

	};

	amba {

		#address-cells = <1>;

		#size-cells = <1>;

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

CONFIG_ARCH_EXYNOS=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_S3C_LOWLEVEL_UART_PORT=3

CONFIG_S3C24XX_PWM=y

CONFIG_ARCH_EXYNOS5=y

CONFIG_MACH_EXYNOS4_DT=y

CONFIG_MACH_EXYNOS5_DT=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_INET=y

CONFIG_RFKILL_REGULATOR=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_KEYBOARD_CROS_EC=y

# CONFIG_MOUSE_PS2 is not set

CONFIG_MOUSE_CYAPA=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C_INFINEON=y

CONFIG_I2C=y

CONFIG_I2C_MUX=y

CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_I2C_S3C2410=y

CONFIG_DEBUG_GPIO=y

# CONFIG_HWMON is not set

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_I2C=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX8997=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_TPS65090=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_MAX8997=y

CONFIG_REGULATOR_MAX77686=y

CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS65090=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_SIMPLE=y

CONFIG_EXYNOS_VIDEO=y

CONFIG_EXYNOS_MIPI_DSI=y

CONFIG_EXYNOS_DP=y

CONFIG_FONT_7x14=y

CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_S5P=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_PHY=y

CONFIG_SAMSUNG_USB2PHY=y

CONFIG_SAMSUNG_USB3PHY=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_S3C=y

CONFIG_MMC_DW=y

CONFIG_MMC_DW_IDMAC=y

CONFIG_MMC_DW_EXYNOS=y

CONFIG_COMMON_CLK_MAX77686=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRC_CCITT=y

config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_EXYNOS4210

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0

	select S5P_DEV_TV

	select S5P_GPIO_INT

	select S5P_SETUP_MIPIPHY

	select SAMSUNG_HRT

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

	  Board.

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select CLKSRC_OF

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select PINCTRL

 */

#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/io.h>

#include <linux/device.h>

#include <linux/gpio.h>

#include <clocksource/samsung_pwm.h>

#include <linux/sched.h>

#include <linux/serial_core.h>

#include <linux/of.h>

	},

};

static struct samsung_pwm_variant exynos4_pwm_variant = {

	.bits		= 32,

	.div_base	= 0,

	.has_tint_cstat	= true,

	.tclk_mask	= 0,

};

void exynos4_restart(char mode, const char *cmd)

{

	__raw_writel(0x1, S5P_SWRESET);

		val = 0x1;

		addr = EXYNOS_SWRESET;

	} else if (of_machine_is_compatible("samsung,exynos5440")) {

		u32 status;

		np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");

		addr = of_iomap(np, 0) + 0xbc;

		status = __raw_readl(addr);

		addr = of_iomap(np, 0) + 0xcc;

		val = (0xfff << 20) | (0x1 << 16);

		val = __raw_readl(addr);

		val = (val & 0xffff0000) | (status & 0xffff);

	} else {

		pr_err("%s: cannot support non-DT\n", __func__);

		return;

	iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0));

}

void __init exynos_set_timer_source(u8 channels)

{

	exynos4_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;

	exynos4_pwm_variant.output_mask &= ~channels;

}

void __init exynos_init_time(void)

{

	unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {

		EXYNOS4_IRQ_TIMER0_VIC, EXYNOS4_IRQ_TIMER1_VIC,

		EXYNOS4_IRQ_TIMER2_VIC, EXYNOS4_IRQ_TIMER3_VIC,

		EXYNOS4_IRQ_TIMER4_VIC,

	};

	if (of_have_populated_dt()) {

#ifdef CONFIG_OF

		of_clk_init(NULL);

		exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1);

		exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f);

#endif

		mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1);

#ifdef CONFIG_CLKSRC_SAMSUNG_PWM

		if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0)

			samsung_pwm_clocksource_init(S3C_VA_TIMER,

					timer_irqs, &exynos4_pwm_variant);

		else

#endif

			mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0,

					EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1);

	}

}

void exynos_firmware_init(void);

void exynos_set_timer_source(u8 channels);

#ifdef CONFIG_PM_GENERIC_DOMAINS

int exynos_pm_late_initcall(void);

#else