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

Commit 2e629ebc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'next/cleanup' and 'next/fixes-non-critical' into next/cleanups-fixes 

This is a merge of the cleanup and fixes-non-critical branches for the 4.7
merge window. It seems more appropriate to send a single pull request
for these than two separate ones, as both branches really contain both
fixes and cleanups.

* next/cleanup:
  ARM: debug: remove extraneous DEBUG_HI3716_UART option
  ARM: davinci: use IRQCHIP_DECLARE for cp_intc
  ARM: davinci: remove unused DA8XX_NUM_UARTS
  ARM: davinci: simplify call to of populate
  ARM: DaVinci USB: removed deprecated properties from MUSB config
  ARM: rockchip: Fix use of plain integer as NULL pointer
  ARM: realview: hide unused 'pmu_device' object
  soc: versatile: dynamically detect RealView HBI numbers

* next/fixes-non-critical:
  ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats
  ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats
  ARM: dts: exynos: Add MFC memory banks for Peach boards
  ARM: OMAP2+: n900 needs MMC slot names for legacy user space
  ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51
  ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
  ARM: OMAP2+: Simplify auxdata by using the generic match
  of/platform: Allow secondary compatible match in of_dev_lookup
parents 3b9d78a4 ff628a4d

arch/arm/boot/dts/exynos4210-trats.dts

+3 −1
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ 
		compatible = "maxim,max8997-pmic";



		reg = <0x66>;

		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;



		max8997,pmic-buck1-uses-gpio-dvs;

		max8997,pmic-buck2-uses-gpio-dvs;
@@ -359,7 +361,7 @@ 
			};



			vusbdac_reg: LDO8 {

			     regulator-name = "VUSB/VDAC_3.3V_C210";

			     regulator-name = "VUSB+VDAC_3.3V_C210";

			     regulator-min-microvolt = <3300000>;

			     regulator-max-microvolt = <3300000>;

			};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+5 −0
Original line number Diff line number Diff line
@@ -696,6 +696,11 @@ 
	status = "okay";

};



&mfc {

	samsung,mfc-r = <0x43000000 0x800000>;

	samsung,mfc-l = <0x51000000 0x800000>;

};



&mmc_0 {

	status = "okay";

	num-slots = <1>;

arch/arm/boot/dts/exynos5800-peach-pi.dts

+5 −0
Original line number Diff line number Diff line
@@ -671,6 +671,11 @@ 
	status = "okay";

};



&mfc {

	samsung,mfc-r = <0x43000000 0x800000>;

	samsung,mfc-l = <0x51000000 0x800000>;

};



&mmc_0 {

	status = "okay";

	num-slots = <1>;

arch/arm/mach-exynos/pm_domains.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on) 
			if (IS_ERR(pd->clk[i]))

				break;



			if (IS_ERR(pd->clk[i]))

			if (IS_ERR(pd->pclk[i]))

				continue; /* Skip on first power up */

			if (clk_set_parent(pd->clk[i], pd->pclk[i]))

				pr_err("%s: error setting parent to clock%d\n",

arch/arm/mach-omap2/board-rx51-peripherals.c

+33 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/mtd-onenand-omap2.h>



#include <plat/dmtimer.h>



#include <asm/system_info.h>



#include "common.h"
@@ -47,9 +49,8 @@ 


#include <video/omap-panel-data.h>



#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)

#include <linux/platform_data/pwm_omap_dmtimer.h>

#include <linux/platform_data/media/ir-rx51.h>

#endif



#include "mux.h"

#include "omap-pm.h"
@@ -1212,10 +1213,40 @@ static void __init rx51_init_tsc2005(void) 
				gpio_to_irq(RX51_TSC2005_IRQ_GPIO);

}



#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)

static struct pwm_omap_dmtimer_pdata __maybe_unused pwm_dmtimer_pdata = {

	.request_by_node = omap_dm_timer_request_by_node,

	.request_specific = omap_dm_timer_request_specific,

	.request = omap_dm_timer_request,

	.set_source = omap_dm_timer_set_source,

	.get_irq = omap_dm_timer_get_irq,

	.set_int_enable = omap_dm_timer_set_int_enable,

	.set_int_disable = omap_dm_timer_set_int_disable,

	.free = omap_dm_timer_free,

	.enable = omap_dm_timer_enable,

	.disable = omap_dm_timer_disable,

	.get_fclk = omap_dm_timer_get_fclk,

	.start = omap_dm_timer_start,

	.stop = omap_dm_timer_stop,

	.set_load = omap_dm_timer_set_load,

	.set_match = omap_dm_timer_set_match,

	.set_pwm = omap_dm_timer_set_pwm,

	.set_prescaler = omap_dm_timer_set_prescaler,

	.read_counter = omap_dm_timer_read_counter,

	.write_counter = omap_dm_timer_write_counter,

	.read_status = omap_dm_timer_read_status,

	.write_status = omap_dm_timer_write_status,

};

#endif



#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)

static struct lirc_rx51_platform_data rx51_lirc_data = {

	.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,

	.pwm_timer = 9, /* Use GPT 9 for CIR */

#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)

	.dmtimer = &pwm_dmtimer_pdata,

#endif



};



static struct platform_device rx51_lirc_device = {