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

Commit 94bbdb63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are the first arm-soc bug fixes.  Most of these are OMAP related
  fixes for regressions or minor bugs.  Aside from that, there are a few
  defconfig changes for various platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  iommu/exynos: Fix arm64 allmodconfig build
  ARM: defconfigs: use CONFIG_CPUFREQ_DT
  ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver
  ARM: dts: am437x-sk-evm.dts: fix LCD timings
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
  ARM: OMAP2+: AM43x: Add ID for ES1.2
  ARM: dts: am437x-sk: fix lcd enable pin mux data
  ARM: dts: Fix gpmc regression for omap 2430sdp smc91x
  Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"
  ARM: dts: dra7: fix DSS PLL clock mux registers
  ARM: dts: DRA7: wdt: Fix compatible property for watchdog node
  ARM: OMAP2+: clock: remove unused function prototype
parents 36c0a48f 5f1b2953

arch/arm/boot/dts/am437x-sk-evm.dts

+7 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
	};



	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "newhaven,nhd-4.3-480272ef-atxl", "panel-dpi";

		label = "lcd";



		pinctrl-names = "default";
@@ -112,11 +112,11 @@ 
			clock-frequency = <9000000>;

			hactive = <480>;

			vactive = <272>;

			hfront-porch = <8>;

			hback-porch = <43>;

			hsync-len = <4>;

			vback-porch = <12>;

			vfront-porch = <4>;

			hfront-porch = <2>;

			hback-porch = <2>;

			hsync-len = <41>;

			vfront-porch = <2>;

			vback-porch = <2>;

			vsync-len = <10>;

			hsync-active = <0>;

			vsync-active = <0>;
@@ -320,8 +320,7 @@ 


	lcd_pins: lcd_pins {

		pinctrl-single,pins = <

			/* GPIO 5_8 to select LCD / HDMI */

			0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)

			0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpcm_ad7.gpio1_7 */

		>;

	};

};

arch/arm/boot/dts/dra7-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ 
					/* VDD_GPU - over VDD_SMPS6 */

					regulator-name = "smps6";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <12500000>;

					regulator-max-microvolt = <1250000>;

					regulator-always-on;

					regulator-boot-on;

				};
@@ -313,7 +313,7 @@ 
					/* CORE_VDD */

					regulator-name = "smps7";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1030000>;

					regulator-max-microvolt = <1060000>;

					regulator-always-on;

					regulator-boot-on;

				};

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ 
		};



		wdt2: wdt@4ae14000 {

			compatible = "ti,omap4-wdt";

			compatible = "ti,omap3-wdt";

			reg = <0x4ae14000 0x80>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "wd_timer2";

arch/arm/boot/dts/dra72-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
					/* VDD_CORE */

					regulator-name = "smps2";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1030000>;

					regulator-max-microvolt = <1060000>;

					regulator-boot-on;

					regulator-always-on;

				};

arch/arm/boot/dts/dra7xx-clocks.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&sys_clkin2>;

		reg = <0x01a4>;

		reg = <0x0164>;

	};



	mlb_clk: mlb_clk {
@@ -1084,14 +1084,14 @@ 
		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&sys_clkin2>;

		reg = <0x01d0>;

		reg = <0x0168>;

	};



	video2_dpll_clk_mux: video2_dpll_clk_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&sys_clkin2>;

		reg = <0x01d4>;

		reg = <0x016c>;

	};



	wkupaon_iclk_mux: wkupaon_iclk_mux {