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

Commit 88e23761 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Another week, another small batch of fixes.

  Most of these make zynq, socfpga and sunxi platforms work a bit
  better:

   - due to new requirements for regulators, DWMMC on socfpga broke past
     v3.17
   - SMP spinup fix for socfpga
   - a few DT fixes for zynq
   - another option (FIXED_REGULATOR) for sunxi is needed that used to
     be selected by other options but no longer is.
   - a couple of small DT fixes for at91
   - ...and a couple for i.MX"

* tag 'armsoc-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: imx28-evk: Let i2c0 run at 100kHz
  ARM: i.MX6: Fix "emi" clock name typo
  ARM: multi_v7_defconfig: enable CONFIG_MMC_DW_ROCKCHIP
  ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
  ARM: dts: socfpga: Add a 3.3V fixed regulator node
  ARM: dts: socfpga: Fix SD card detect
  ARM: dts: socfpga: rename gpio nodes
  ARM: at91/dt: sam9263: fix PLLB frequencies
  power: reset: at91-reset: fix power down register
  MAINTAINERS: add atmel ssc driver maintainer entry
  arm: socfpga: fix fetching cpu1start_addr for SMP
  ARM: zynq: DT: trivial: Fix mc node
  ARM: zynq: DT: Add cadence watchdog node
  ARM: zynq: DT: Add missing reference for memory-controller
  ARM: zynq: DT: Add missing reference for ADC
  ARM: zynq: DT: Add missing address for L2 pl310
  ARM: zynq: DT: Remove 222 MHz OPP
  ARM: zynq: DT: Fix GEM register area size
parents d1e14f1d efc176a8

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1749,6 +1749,13 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> 
S:	Supported

F:	drivers/spi/spi-atmel.*



ATMEL SSC DRIVER

M:	Bo Shen <voice.shen@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/misc/atmel-ssc.c

F:	include/linux/atmel-ssc.h



ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/boot/dts/at91sam9263.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -122,9 +122,10 @@ 
					interrupts-extended = <&pmc AT91_PMC_LOCKB>;

					clocks = <&main>;

					reg = <1>;

					atmel,clk-input-range = <1000000 5000000>;

					atmel,clk-input-range = <1000000 32000000>;

					#atmel,pll-clk-output-range-cells = <4>;

					atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;

					atmel,pll-clk-output-ranges = <80000000 200000000 0 1>,

								<190000000 240000000 2 1>;

				};



				mck: masterck {

arch/arm/boot/dts/imx28-evk.dts

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ 
			i2c0: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins_a>;

				clock-frequency = <400000>;

				status = "okay";



				sgtl5000: codec@0a {

arch/arm/boot/dts/socfpga.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ 
			status = "disabled";

		};



		gpio@ff708000 {

		gpio0: gpio@ff708000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -555,7 +555,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio0: gpio-controller@0 {

			porta: gpio-controller@0 {

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

				gpio-controller;

				#gpio-cells = <2>;
@@ -567,7 +567,7 @@ 
			};

		};



		gpio@ff709000 {

		gpio1: gpio@ff709000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -575,7 +575,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio1: gpio-controller@0 {

			portb: gpio-controller@0 {

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

				gpio-controller;

				#gpio-cells = <2>;
@@ -587,7 +587,7 @@ 
			};

		};



		gpio@ff70a000 {

		gpio2: gpio@ff70a000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -595,7 +595,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio2: gpio-controller@0 {

			portc: gpio-controller@0 {

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

				gpio-controller;

				#gpio-cells = <2>;

arch/arm/boot/dts/socfpga_arria5.dtsi

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

		};



		dwmmc0@ff704000 {

		mmc0: dwmmc0@ff704000 {

			num-slots = <1>;

			broken-cd;

			bus-width = <4>;