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

Commit 6c9e9247 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC cleanups from Arnd Bergmann:
 "The remaining cleanups for 3.19 are to a large part result of
  devicetree conversion nearing completion on two other platforms
  besides AT91:

   - Like AT91, Renesas shmobile is in the process to migrate to DT and
     multiplatform, but using a different approach of doing it one SoC
     at a time.  For 3.19, the r8a7791 platform and associated "Koelsch"
     board are considered complete and we remove the non-DT
     non-multiplatform support for this.

   - The ARM Versatile Express has supported DT and multiplatform for a
     long time, but we have still kept the legacy board files around,
     because not all drivers were fully working before.  We have finally
     taken the last step to remove the board files.

  Other changes in this branch are preparation for the later branches or
  just unrelated to the more interesting changes:

   - The dts files for arm64 get moved into per-vendor directories for a
     clearer structure.

   - Some dead code removal (zynq, exynos, davinci, imx)

   - Using pr_*() macros more consistently instead of printk(KERN_*) in
     some platform code"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (71 commits)
  ARM: zynq: Remove secondary_startup() declaration from header
  ARM: vexpress: Enable regulator framework when MMCI is in use
  ARM: vexpress: Remove non-DT code
  ARM: imx: Remove unneeded .map_io initialization
  ARM: dts: imx6qdl-sabresd: Fix the microphone route
  ARM: imx: refactor mxc_iomux_mode()
  ARM: imx: simplify clk_pllv3_prepare()
  ARM: imx6q: drop unnecessary semicolon
  ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
  ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define
  ARM: at91: remove useless init_time for DT-only SoCs
  ARM: davinci: Remove redundant casts
  ARM: davinci: Use standard logging styles
  ARM: shmobile: r8a7779: Spelling/grammar s/entity/identity/, s/map/mapping/
  ARM: shmobile: sh7372: Spelling/grammar s/entity map/identity mapping/
  ARM: shmobile: sh73a0: Spelling/grammar s/entity map/identity mapping/
  ARM: EXYNOS: Remove unused static iomapping
  ARM: at91: fix build breakage due to legacy board removals
  ...
parents 0563fdc0 ef1dfa73

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1374,7 +1374,6 @@ F: arch/arm/boot/dts/sh* 
F:	arch/arm/configs/ape6evm_defconfig

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/koelsch_defconfig

F:	arch/arm/configs/kzm9g_defconfig

F:	arch/arm/configs/lager_defconfig

F:	arch/arm/configs/mackerel_defconfig

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ config ARCH_REALVIEW 
	select ICST

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	  This enables support for ARM Ltd RealView boards.
@@ -365,6 +366,7 @@ config ARCH_VERSATILE 
	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_SCHED_CLOCK

	select VERSATILE_FPGA_IRQ

	help

	  This enables support for ARM Ltd Versatile board.

arch/arm/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -312,8 +312,12 @@ $(INSTALL_TARGETS): 
	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@



PHONY += dtbs dtbs_install

dtbs dtbs_install: prepare scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@



dtbs: prepare scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

arch/arm/boot/dts/Makefile

+9 −18
Original line number Diff line number Diff line
@@ -376,25 +376,24 @@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \ 
	s5pv210-smdkc110.dtb \

	s5pv210-smdkv210.dtb \

	s5pv210-torbreck.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	sh7372-mackerel.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

	sh73a0-kzm9g-reference.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7779-marzen.dtb \

	r8a7790-lager.dtb \

	r8a7791-henninger.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	r8a7779-marzen.dtb \

	r8a7794-alt.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

	socfpga_cyclone5_socdk.dtb \
@@ -517,15 +516,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ 
	dove-dove-db.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb



targets += dtbs dtbs_install

targets += $(dtb-y)

endif



# *.dtb used to be generated in the directory above. Clean out the

# old build results so people don't accidentally use them.

dtbs: $(addprefix $(obj)/, $(dtb-y))

	$(Q)rm -f $(obj)/../*.dtb



always		:= $(dtb-y)

clean-files	:= *.dtb
 


dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))

arch/arm/boot/dts/emev2-kzm9d.dts

+32 −31
Original line number Diff line number Diff line
@@ -25,37 +25,7 @@ 


	chosen {

		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";

	};



	reg_1p8v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

	};



	reg_3p3v: regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	lan9220@20000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 IRQ_TYPE_EDGE_RISING>;

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

		vddvario-supply = <&reg_1p8v>;

		vdd33a-supply = <&reg_3p3v>;

		stdout-path = &uart1;

	};



	gpio_keys {
@@ -92,4 +62,35 @@ 
			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

		};

	};



	reg_1p8v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

	};



	reg_3p3v: regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	lan9220@20000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 IRQ_TYPE_EDGE_RISING>;

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

		vddvario-supply = <&reg_1p8v>;

		vdd33a-supply = <&reg_3p3v>;

	};

};