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

Commit beb5bfe4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC low-priority fixes from Olof Johansson:
 "A set of fixes for various platforms that weren't considered bad
  enough to include in 3.12 (nor -stable).  Mostly simple typo fixes,
  etc"

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP2+: irq, AM33XX add missing register check
  ARM: OMAP2+: wakeupgen: AM43x adaptation
  ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected
  ARM: dts: fix PL330 MDMA1 address in DT for Universal C210 board
  ARM: dts: Work around lack of cpufreq regulator lookup for exynos4210-origen and trats boards
  ARM: dts: Fix typo earlyprintk in exynos5440-sd5v1 and ssdk5440 boards
  ARM: dts: Correct typo in use of samsung,pin-drv for exynos5250
  ARM: rockchip: remove obsolete rockchip,config properties
  ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
  ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations.
  ARM: OMAP1: fix incorrect placement of __initdata tag
  ARM: OMAP: remove deprecated IRQF_DISABLED
  ARM: OMAP2+: throw the die id into the entropy pool
parents 05ad391d 462fb38f

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

+6 −1
Original line number Diff line number Diff line
@@ -192,7 +192,12 @@ 
				};



				buck1_reg: BUCK1 {

					regulator-name = "VDD_ARM_1.2V";

					/*

					* HACK: The real name is VDD_ARM_1.2V,

					* but exynos-cpufreq does not support

					* DT-based regulator lookup yet.

					*/

					regulator-name = "vdd_arm";

					regulator-min-microvolt = <950000>;

					regulator-max-microvolt	= <1350000>;

					regulator-always-on;

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

+6 −1
Original line number Diff line number Diff line
@@ -290,7 +290,12 @@ 
				};



				varm_breg: BUCK1 {

				     regulator-name = "VARM_1.2V_C210";

				     /*

				      * HACK: The real name is VARM_1.2V_C210,

				      * but exynos-cpufreq does not support

				      * DT-based regulator lookup yet.

				      */

				     regulator-name = "vdd_arm";

				     regulator-min-microvolt = <900000>;

				     regulator-max-microvolt = <1350000>;

				     regulator-always-on;

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

+4 −0
Original line number Diff line number Diff line
@@ -350,3 +350,7 @@ 
		status = "okay";

	};

};



&mdma1 {

	reg = <0x12840000 0x1000>;

};

arch/arm/boot/dts/exynos5250-pinctrl.dtsi

+22 −22
Original line number Diff line number Diff line
@@ -210,21 +210,21 @@ 
			samsung,pins = "gpa0-2", "gpa0-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c2_bus: i2c2-bus {

			samsung,pins = "gpa0-6", "gpa0-7";

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c2_hs_bus: i2c2-hs-bus {

			samsung,pins = "gpa0-6", "gpa0-7";

			samsung,pin-function = <4>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		uart2_data: uart2-data {
@@ -238,21 +238,21 @@ 
			samsung,pins = "gpa1-2", "gpa1-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c3_bus: i2c3-bus {

			samsung,pins = "gpa1-2", "gpa1-3";

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c3_hs_bus: i2c3-hs-bus {

			samsung,pins = "gpa1-2", "gpa1-3";

			samsung,pin-function = <4>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		uart3_data: uart3-data {
@@ -273,14 +273,14 @@ 
			samsung,pins = "gpa2-0", "gpa2-1";

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c5_bus: i2c5-bus {

			samsung,pins = "gpa2-2", "gpa2-3";

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		spi1_bus: spi1-bus {
@@ -376,14 +376,14 @@ 
			samsung,pins = "gpb3-0", "gpb3-1";

			samsung,pin-function = <4>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		i2c1_hs_bus: i2c1-hs-bus {

			samsung,pins = "gpb3-2", "gpb3-3";

			samsung,pin-function = <4>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		sd0_clk: sd0-clk {
@@ -551,14 +551,14 @@ 
			samsung,pins = "gpd0-2", "gpd0-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		dp_hpd: dp_hpd {

			samsung,pins = "gpx0-7";

			samsung,pin-function = <3>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};

	};
@@ -649,42 +649,42 @@ 
				       "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";

			samsung,pin-function = <3>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_i2c2_bus: cam-i2c2-bus {

			samsung,pins = "gpe0-6", "gpe1-0";

			samsung,pin-function = <4>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_spi1_bus: cam-spi1-bus {

			samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";

			samsung,pin-function = <4>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_i2c1_bus: cam-i2c1-bus {

			samsung,pins = "gpf0-2", "gpf0-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_i2c0_bus: cam-i2c0-bus {

			samsung,pins = "gpf0-0", "gpf0-1";

			samsung,pin-function = <2>;

			samsung,pin-pud = <3>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_spi0_bus: cam-spi0-bus {

			samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_bayrgb_bus: cam-bayrgb-bus {
@@ -695,7 +695,7 @@ 
				       "gpg2-0", "gpg2-1";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		cam_port_a: cam-port-a {
@@ -704,7 +704,7 @@ 
				       "gph1-4", "gph1-5", "gph1-6", "gph1-7";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};

	};
@@ -756,7 +756,7 @@ 
				       "gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};



		c2c_txd: c2c-txd {
@@ -766,7 +766,7 @@ 
				       "gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};

	};

arch/arm/boot/dts/exynos5440-sd5v1.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	compatible = "samsung,sd5v1", "samsung,exynos5440";



	chosen {

		bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel early_printk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";

		bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";

	};



	fixed-rate-clocks {