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

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

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

Pull ARM SoC fixes from Olof Johansson:
 "We've been sitting on our fixes branch for a while, so this batch is
  unfortunately on the large side.

  A lot of these are tweaks and fixes to device trees, fixing various
  bugs around clocks, reg ranges, etc.  There's also a few defconfig
  updates (which are on the late side, no more of those).

  All in all the diffstat is bigger than ideal at this time, but nothing
  in here seems particularly risky"

* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  reset: sunxi: fix spinlock initialization
  ARM: dts: disable CCI on exynos5420 based arndale-octa
  drivers: bus: check cci device tree node status
  ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288
  ARM: nomadik: fix up leftover device tree pins
  ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
  ARM: at91/dt: sam9263: Add missing clocks to lcdc node
  ARM: at91: sama5d3: dt: correct the sound route
  ARM: at91/dt: sama5d4: fix the timer reg length
  ARM: exynos_defconfig: Enable LM90 driver
  ARM: exynos_defconfig: Enable options for display panel support
  arm: dts: Use pmu_system_controller phandle for dp phy
  ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances
  ARM: dts: berlin: correct BG2Q's SM GPIO location.
  ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
  ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
  ARM: dts: Revert disabling of smc91x for n900
  ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling
  ARM: dts: dra7-evm: fix qspi device tree partition size
  ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
  ...
parents 12ba8571 966903a9

arch/arm/boot/dts/at91sam9263.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -953,6 +953,8 @@ 
			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;

			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_fb>;

			pinctrl-0 = <&pinctrl_fb>;

			clocks = <&lcd_clk>, <&lcd_clk>;

			clock-names = "lcdc_clk", "hclk";

			status = "disabled";

			status = "disabled";

		};

		};

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+2 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ 
};

};





&sdhci2 {

&sdhci2 {

	broken-cd;

	bus-width = <8>;

	non-removable;

	non-removable;

	status = "okay";

	status = "okay";

};

};

arch/arm/boot/dts/berlin2q.dtsi

+32 −31
Original line number Original line Diff line number Diff line
@@ -83,7 +83,8 @@ 
			compatible = "mrvl,pxav3-mmc";

			compatible = "mrvl,pxav3-mmc";

			reg = <0xab1000 0x200>;

			reg = <0xab1000 0x200>;

			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_SDIO1XIN>;

			clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>;

			clock-names = "io", "core";

			status = "disabled";

			status = "disabled";

		};

		};
@@ -348,36 +349,6 @@ 
				interrupt-parent = <&gic>;

				interrupt-parent = <&gic>;

				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

			};

			};



			gpio4: gpio@5000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x5000 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				porte: gpio-port@4 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

				};

			};



			gpio5: gpio@c000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0xc000 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				portf: gpio-port@5 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

				};

			};

		};

		};





		chip: chip-control@ea0000 {

		chip: chip-control@ea0000 {
@@ -466,6 +437,21 @@ 
			ranges = <0 0xfc0000 0x10000>;

			ranges = <0 0xfc0000 0x10000>;

			interrupt-parent = <&sic>;

			interrupt-parent = <&sic>;





			sm_gpio1: gpio@5000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x5000 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				portf: gpio-port@5 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

				};

			};



			i2c2: i2c@7000 {

			i2c2: i2c@7000 {

				compatible = "snps,designware-i2c";

				compatible = "snps,designware-i2c";

				#address-cells = <1>;

				#address-cells = <1>;
@@ -516,6 +502,21 @@ 
				status = "disabled";

				status = "disabled";

			};

			};





			sm_gpio0: gpio@c000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0xc000 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				porte: gpio-port@4 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

				};

			};



			sysctrl: pin-controller@d000 {

			sysctrl: pin-controller@d000 {

				compatible = "marvell,berlin2q-system-ctrl";

				compatible = "marvell,berlin2q-system-ctrl";

				reg = <0xd000 0x100>;

				reg = <0xd000 0x100>;

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -499,23 +499,23 @@ 
		};

		};

		partition@5 {

		partition@5 {

			label = "QSPI.u-boot-spl-os";

			label = "QSPI.u-boot-spl-os";

			reg = <0x00140000 0x00010000>;

			reg = <0x00140000 0x00080000>;

		};

		};

		partition@6 {

		partition@6 {

			label = "QSPI.u-boot-env";

			label = "QSPI.u-boot-env";

			reg = <0x00150000 0x00010000>;

			reg = <0x001c0000 0x00010000>;

		};

		};

		partition@7 {

		partition@7 {

			label = "QSPI.u-boot-env.backup1";

			label = "QSPI.u-boot-env.backup1";

			reg = <0x00160000 0x0010000>;

			reg = <0x001d0000 0x0010000>;

		};

		};

		partition@8 {

		partition@8 {

			label = "QSPI.kernel";

			label = "QSPI.kernel";

			reg = <0x00170000 0x0800000>;

			reg = <0x001e0000 0x0800000>;

		};

		};

		partition@9 {

		partition@9 {

			label = "QSPI.file-system";

			label = "QSPI.file-system";

			reg = <0x00970000 0x01690000>;

			reg = <0x009e0000 0x01620000>;

		};

		};

	};

	};

};

};

arch/arm/boot/dts/exynos5250.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -736,7 +736,7 @@ 




	dp_phy: video-phy@10040720 {

	dp_phy: video-phy@10040720 {

		compatible = "samsung,exynos5250-dp-video-phy";

		compatible = "samsung,exynos5250-dp-video-phy";

		reg = <0x10040720 4>;

		samsung,pmu-syscon = <&pmu_system_controller>;

		#phy-cells = <0>;

		#phy-cells = <0>;

	};

	};