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

Commit 38867a28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc 

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  mach-integrator: fix VGA base regression
  arm/dt: Tegra: Update SDHCI nodes to match bindings
  ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines
  ARM: SAMSUNG: fix to prevent declaring duplicated
  ARM: SAMSUNG: fix watchdog reset issue with clk_get()
  ARM: S3C64XX: Remove un-used code backlight code on SMDK6410
  ARM: EXYNOS4: restart clocksource while system resumes
  ARM: EXYNOS4: Fix routing timer interrupt to offline CPU
  ARM: EXYNOS4: Fix return type of local_timer_setup()
  ARM: EXYNOS4: Fix wrong pll type for vpll
  ARM: Dove: fix second SPI initialization call
parents 43a964a7 b71d8429

arch/arm/boot/dts/tegra-harmony.dts

+6 −6
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ 
	};



	sdhci@c8000200 {

		gpios = <&gpio 69 0>, /* cd, gpio PI5 */

			<&gpio 57 0>, /* wp, gpio PH1 */

			<&gpio 155 0>; /* power, gpio PT3 */

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000600 {

		gpios = <&gpio 58 0>, /* cd, gpio PH2 */

			<&gpio 59 0>, /* wp, gpio PH3 */

			<&gpio 70 0>; /* power, gpio PI6 */

		cd-gpios = <&gpio 58 0>; /* gpio PH2 */

		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};

};

arch/arm/boot/dts/tegra-seaboard.dts

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
	};



	sdhci@c8000400 {

		gpios = <&gpio 69 0>, /* cd, gpio PI5 */

			<&gpio 57 0>, /* wp, gpio PH1 */

			<&gpio 70 0>; /* power, gpio PI6 */

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};

};

arch/arm/mach-dove/common.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void __init dove_spi0_init(void) 


void __init dove_spi1_init(void)

{

	orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk());

	orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk());

}



/*****************************************************************************

arch/arm/mach-exynos4/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ void __init_or_cpufreq exynos4_setup_clocks(void) 


	vpllsrc = clk_get_rate(&clk_vpllsrc.clk);

	vpll = s5p_get_pll46xx(vpllsrc, __raw_readl(S5P_VPLL_CON0),

				__raw_readl(S5P_VPLL_CON1), pll_4650);

				__raw_readl(S5P_VPLL_CON1), pll_4650c);



	clk_fout_apll.ops = &exynos4_fout_apll_ops;

	clk_fout_mpll.rate = mpll;

arch/arm/mach-exynos4/mct.c

+9 −1
Original line number Diff line number Diff line
@@ -132,12 +132,18 @@ static cycle_t exynos4_frc_read(struct clocksource *cs) 
	return ((cycle_t)hi << 32) | lo;

}



static void exynos4_frc_resume(struct clocksource *cs)

{

	exynos4_mct_frc_start(0, 0);

}



struct clocksource mct_frc = {

	.name		= "mct-frc",

	.rating		= 400,

	.read		= exynos4_frc_read,

	.mask		= CLOCKSOURCE_MASK(64),

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

	.resume		= exynos4_frc_resume,

};



static void __init exynos4_clocksource_init(void)
@@ -389,9 +395,11 @@ static void exynos4_mct_tick_init(struct clock_event_device *evt) 
}



/* Setup the local clock events for a CPU */

void __cpuinit local_timer_setup(struct clock_event_device *evt)

int __cpuinit local_timer_setup(struct clock_event_device *evt)

{

	exynos4_mct_tick_init(evt);



	return 0;

}



int local_timer_ack(void)