Commit 5ae13ef4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc 

mvebu register map changes for v3.11

This series removes the hardcoded register base address for mvebu.

Depends:
 - mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
 - mvebu/cleanup (up to tags/cleanup-3.11-3)

* tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux

:
  arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig
  arm: mvebu: add another earlyprintk Kconfig option
  arm: mvebu: don't hardcode the physical address for mvebu-mbus
  arm: mvebu: don't hardcode a physical address in headsmp.S
  arm: mvebu: remove hardcoded static I/O mapping
  arm: mvebu: move cache and mvebu-mbus initialization later
  arm: mvebu: avoid hardcoded virtual address in coherency code
  arm: mvebu: remove dependency of SMP init on static I/O mapping
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi
  arm: mvebu: mark functions of armada-370-xp.c as static
  ARM: mvebu: Remove init_irq declaration in machine description
  ARM: Orion: Remove redundant init_dma_coherent_pool_size()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 01758fe6 5fb2038d

arch/arm/Kconfig.debug

+28 −2
Original line number Diff line number Diff line
@@ -303,12 +303,37 @@ choice 
		  their output to the serial port on MSM 8960 devices.



	config DEBUG_MVEBU_UART

		bool "Kernel low-level debugging messages via MVEBU UART"

		bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"

		depends on ARCH_MVEBU

		help

		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.



		  This option should be used with the old bootloaders

		  that left the internal registers mapped at

		  0xd0000000. As of today, this is the case on

		  platforms such as the Globalscale Mirabox or the

		  Plathome OpenBlocks AX3, when using the original

		  bootloader.



		  If the wrong DEBUG_MVEBU_UART* option is selected,

		  when u-boot hands over to the kernel, the system

		  silently crashes, with no serial output at all.



	config DEBUG_MVEBU_UART_ALTERNATE

		bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"

		depends on ARCH_MVEBU

		help

		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.



		  This option should be used with the new bootloaders

		  that remap the internal registers at 0xf1000000.



		  If the wrong DEBUG_MVEBU_UART* option is selected,

		  when u-boot hands over to the kernel, the system

		  silently crashes, with no serial output at all.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK
@@ -632,7 +657,8 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX51_UART || \

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \

				   DEBUG_MVEBU_UART_ALTERNATE

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART

	default "debug/nomadik.S" if DEBUG_NOMADIK_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

arch/arm/boot/dts/armada-370-xp.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 


			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x2400>;

				reg = <0xa0000 0x5000>;

				interrupts = <55>;

				clocks = <&gateclk 15>, <&gateclk 30>;

				clock-names = "0", "1";
@@ -96,7 +96,7 @@ 


			ethernet@70000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x70000 0x2500>;

				reg = <0x70000 0x4000>;

				interrupts = <8>;

				clocks = <&gateclk 4>;

				status = "disabled";
@@ -104,7 +104,7 @@ 


			ethernet@74000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x74000 0x2500>;

				reg = <0x74000 0x4000>;

				interrupts = <10>;

				clocks = <&gateclk 3>;

				status = "disabled";

arch/arm/boot/dts/armada-xp-mv78460.dtsi

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


			ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x34000 0x2500>;

				reg = <0x34000 0x4000>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				status = "disabled";

arch/arm/boot/dts/armada-xp.dtsi

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


			ethernet@30000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x30000 0x2500>;

				reg = <0x30000 0x4000>;

				interrupts = <12>;

				clocks = <&gateclk 2>;

				status = "disabled";

arch/arm/configs/mvebu_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -100,5 +100,3 @@ CONFIG_TIMER_STATS=y 
# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y
 
CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE