Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77e77e1b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/devel-samsung' of... 

Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim <kgene.kim@samsung.com>:

This is general development for Samsung stuff for v3.6

* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
  ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
  ARM: EXYNOS: Make combiner_init function static
  ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
  ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ff609143 2aa1ecf7

arch/arm/mach-exynos/common.c

+2 −1
Original line number Diff line number Diff line
@@ -540,7 +540,8 @@ static struct irq_domain_ops combiner_irq_domain_ops = { 
	.map	= combiner_irq_domain_map,

};



void __init combiner_init(void __iomem *combiner_base, struct device_node *np)

static void __init combiner_init(void __iomem *combiner_base,

				 struct device_node *np)

{

	int i, irq, irq_base;

	unsigned int max_nr, nr_irq;

arch/arm/mach-exynos/include/mach/regs-pmu.h

+5 −0
Original line number Diff line number Diff line
@@ -232,6 +232,11 @@ 


#define EXYNOS5_USB_CFG						S5P_PMUREG(0x0230)



#define EXYNOS5_AUTO_WDTRESET_DISABLE				S5P_PMUREG(0x0408)

#define EXYNOS5_MASK_WDTRESET_REQUEST				S5P_PMUREG(0x040C)



#define EXYNOS5_SYS_WDTRESET					(1 << 20)



#define EXYNOS5_ARM_CORE0_SYS_PWR_REG				S5P_PMUREG(0x1000)

#define EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG		S5P_PMUREG(0x1004)

#define EXYNOS5_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG		S5P_PMUREG(0x1008)

arch/arm/mach-exynos/include/mach/regs-usb-phy.h

+15 −5
Original line number Diff line number Diff line
@@ -35,11 +35,21 @@ 
#define PHY1_COMMON_ON_N		(1 << 7)

#define PHY0_COMMON_ON_N		(1 << 4)

#define PHY0_ID_PULLUP			(1 << 2)

#define CLKSEL_MASK			(0x3 << 0)

#define CLKSEL_SHIFT			(0)

#define CLKSEL_48M			(0x0 << 0)

#define CLKSEL_12M			(0x2 << 0)

#define CLKSEL_24M			(0x3 << 0)



#define EXYNOS4_CLKSEL_SHIFT		(0)



#define EXYNOS4210_CLKSEL_MASK		(0x3 << 0)

#define EXYNOS4210_CLKSEL_48M		(0x0 << 0)

#define EXYNOS4210_CLKSEL_12M		(0x2 << 0)

#define EXYNOS4210_CLKSEL_24M		(0x3 << 0)



#define EXYNOS4X12_CLKSEL_MASK		(0x7 << 0)

#define EXYNOS4X12_CLKSEL_9600K		(0x0 << 0)

#define EXYNOS4X12_CLKSEL_10M		(0x1 << 0)

#define EXYNOS4X12_CLKSEL_12M		(0x2 << 0)

#define EXYNOS4X12_CLKSEL_19200K	(0x3 << 0)

#define EXYNOS4X12_CLKSEL_20M		(0x4 << 0)

#define EXYNOS4X12_CLKSEL_24M		(0x5 << 0)



#define EXYNOS4_RSTCON			EXYNOS4_HSOTG_PHYREG(0x08)

#define HOST_LINK_PORT_SWRST_MASK	(0xf << 6)

arch/arm/mach-exynos/pmu.c

+16 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static struct exynos_pmu_conf exynos5250_pmu_config[] = { 
	{ PMU_TABLE_END,},

};



void __iomem *exynos5_list_both_cnt_feed[] = {

static void __iomem *exynos5_list_both_cnt_feed[] = {

	EXYNOS5_ARM_CORE0_OPTION,

	EXYNOS5_ARM_CORE1_OPTION,

	EXYNOS5_ARM_COMMON_OPTION,
@@ -329,7 +329,7 @@ void __iomem *exynos5_list_both_cnt_feed[] = { 
	EXYNOS5_TOP_PWR_SYSMEM_OPTION,

};



void __iomem *exynos5_list_diable_wfi_wfe[] = {

static void __iomem *exynos5_list_diable_wfi_wfe[] = {

	EXYNOS5_ARM_CORE1_OPTION,

	EXYNOS5_FSYS_ARM_OPTION,

	EXYNOS5_ISP_ARM_OPTION,
@@ -390,6 +390,8 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode) 


static int __init exynos_pmu_init(void)

{

	unsigned int value;



	exynos_pmu_config = exynos4210_pmu_config;



	if (soc_is_exynos4210()) {
@@ -399,6 +401,18 @@ static int __init exynos_pmu_init(void) 
		exynos_pmu_config = exynos4x12_pmu_config;

		pr_info("EXYNOS4x12 PMU Initialize\n");

	} else if (soc_is_exynos5250()) {

		/*

		 * When SYS_WDTRESET is set, watchdog timer reset request

		 * is ignored by power management unit.

		 */

		value = __raw_readl(EXYNOS5_AUTO_WDTRESET_DISABLE);

		value &= ~EXYNOS5_SYS_WDTRESET;

		__raw_writel(value, EXYNOS5_AUTO_WDTRESET_DISABLE);



		value = __raw_readl(EXYNOS5_MASK_WDTRESET_REQUEST);

		value &= ~EXYNOS5_SYS_WDTRESET;

		__raw_writel(value, EXYNOS5_MASK_WDTRESET_REQUEST);



		exynos_pmu_config = exynos5250_pmu_config;

		pr_info("EXYNOS5250 PMU Initialize\n");

	} else {

arch/arm/mach-exynos/setup-usb-phy.c

+44 −16
Original line number Diff line number Diff line
@@ -31,27 +31,55 @@ static void exynos4210_usb_phy_clkset(struct platform_device *pdev) 
	struct clk *xusbxti_clk;

	u32 phyclk;



	/* set clock frequency for PLL */

	phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;



	xusbxti_clk = clk_get(&pdev->dev, "xusbxti");

	if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {

		if (soc_is_exynos4210()) {

			/* set clock frequency for PLL */

			phyclk = readl(EXYNOS4_PHYCLK) & ~EXYNOS4210_CLKSEL_MASK;



			switch (clk_get_rate(xusbxti_clk)) {

			case 12 * MHZ:

			phyclk |= CLKSEL_12M;

				phyclk |= EXYNOS4210_CLKSEL_12M;

				break;

			case 48 * MHZ:

				phyclk |= EXYNOS4210_CLKSEL_48M;

				break;

			default:

			case 24 * MHZ:

			phyclk |= CLKSEL_24M;

				phyclk |= EXYNOS4210_CLKSEL_24M;

				break;

			}

			writel(phyclk, EXYNOS4_PHYCLK);

		} else if (soc_is_exynos4212() || soc_is_exynos4412()) {

			/* set clock frequency for PLL */

			phyclk = readl(EXYNOS4_PHYCLK) & ~EXYNOS4X12_CLKSEL_MASK;



			switch (clk_get_rate(xusbxti_clk)) {

			case 9600 * KHZ:

				phyclk |= EXYNOS4X12_CLKSEL_9600K;

				break;

			case 10 * MHZ:

				phyclk |= EXYNOS4X12_CLKSEL_10M;

				break;

			case 12 * MHZ:

				phyclk |= EXYNOS4X12_CLKSEL_12M;

				break;

			case 19200 * KHZ:

				phyclk |= EXYNOS4X12_CLKSEL_19200K;

				break;

			case 20 * MHZ:

				phyclk |= EXYNOS4X12_CLKSEL_20M;

				break;

			default:

		case 48 * MHZ:

			case 24 * MHZ:

				/* default reference clock */

				phyclk |= EXYNOS4X12_CLKSEL_24M;

				break;

			}

			writel(phyclk, EXYNOS4_PHYCLK);

		}

		clk_put(xusbxti_clk);

	}



	writel(phyclk, EXYNOS4_PHYCLK);

}



static int exynos4210_usb_phy0_init(struct platform_device *pdev)