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

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

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

Pull ARM SoC cleanups from Kevin Hilman:
 "A relatively small setup of cleanups this time around, and similar to
  last time the bulk of it is removal of legacy board support:

   - OMAP: removal of legacy (non-DT) booting for several platforms

   - i.MX: remove some legacy board files"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
  ARM: fix EFM32 build breakage caused by cpu_resume_arm
  ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state
  ARM: v7 setup function should invalidate L1 cache
  mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
  ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
  ARM: OMAP2+: Constify irq_domain_ops
  ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers
  ARM: at91: remove useless Makefile.boot
  ARM: at91: remove at91rm9200_sdramc.h
  ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h
  ARM: at91/pm: use the atmel-mc syscon defines
  pcmcia: at91_cf: Use syscon to configure the MC/smc
  ARM: at91: declare the at91rm9200 memory controller as a syscon
  mfd: syscon: Add Atmel MC (Memory Controller) registers definition
  ARM: at91: drop sam9_smc.c
  ata: at91: use syscon to configure the smc
  ARM: ux500: delete static resource defines
  ARM: ux500: rename ux500_map_io
  ARM: ux500: look up PRCMU resource from DT
  ARM: ux500: kill off L2CC static map
  ...
parents 47a46942 e75ea456

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ Example: 
	};



RAMC SDRAM/DDR Controller required properties:

- compatible: Should be "atmel,at91rm9200-sdramc",

- compatible: Should be "atmel,at91rm9200-sdramc", "syscon"

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Example: 


	fuse@7000f800 {

		compatible = "nvidia,tegra20-efuse";

		reg = <0x7000F800 0x400>,

		reg = <0x7000f800 0x400>,

		      <0x70000000 0x400>;

		clocks = <&tegra_car TEGRA20_CLK_FUSE>;

		clock-names = "fuse";

arch/arm/boot/dts/at91rm9200.dtsi

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



			ramc0: ramc@ffffff00 {

				compatible = "atmel,at91rm9200-sdramc";

				compatible = "atmel,at91rm9200-sdramc", "syscon";

				reg = <0xffffff00 0x100>;

			};

arch/arm/boot/dts/exynos5260-xyref5260.dts

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
	broken-cd;

	bypass-smu;

	cap-mmc-highspeed;

	supports-hs200-mode; /* 200 Mhz */

	supports-hs200-mode; /* 200 MHz */

	card-detect-delay = <200>;

	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-sdr-timing = <0 4>;

arch/arm/boot/dts/omap3-cm-t3517.dts

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


	otg_drv_vbus: pinmux_otg_drv_vbus {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50Mhz_clk.usb0_drvvbus */

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50MHz_clk.usb0_drvvbus */

		>;

	};