Commit 650052b1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'axxia/soc' into next/soc 



Patches from Anders Berg applied individually:

Here is version 4 of platform support for AXM5516 SoC.

The clk driver is now applied to clk-next. The rest should be ready for
arm-soc. Haven't got any response from the power/reset maintainers... I hope
this driver can be taken via arm-soc as well.

The AXM55xx family consists of devices that may contain up to 16 ARM Cortex-A15
cores (in a 4x4 cluster configuration). The cores within each cluster share an
L2 cache, and the clusters are connected to each other via a CCN-504 cache
coherent interconnect.

This machine requires CONFIG_ARM_LPAE enabled as all peripherals are located
above 4GB in the memory map.

* axxia/soc:
  ARM: dts: axxia: Add reset controller
  power: reset: Add Axxia system reset driver
  ARM: axxia: Adding defconfig for AXM55xx
  ARM: dts: Device tree for AXM55xx.
  ARM: Add platform support for LSI AXM55xx SoC

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9706c077 61d45495

Documentation/devicetree/bindings/arm/axxia.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Axxia AXM55xx device tree bindings



Boards using the AXM55xx SoC need to have the following properties:



Required root node property:



  - compatible = "lsi,axm5516"



Boards:



  LSI AXM5516 Validation board (Amarillo)

	compatible = "lsi,axm5516-amarillo", "lsi,axm5516"

Documentation/devicetree/bindings/power_supply/axxia-reset.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Axxia Restart Driver



This driver can do reset of the Axxia SoC. It uses the registers in the syscon

block to initiate a chip reset.



Required Properties:

  -compatible: "lsi,axm55xx-reset"

  -syscon: phandle to the syscon node.



Example:



	syscon: syscon@2010030000 {

		compatible = "lsi,axxia-syscon", "syscon";

		reg = <0x20 0x10030000 0 0x2000>;

	};



	reset: reset@2010031000 {

		compatible = "lsi,axm55xx-reset";

		syscon = <&syscon>;

	};

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -950,6 +950,8 @@ source "arch/arm/mach-mvebu/Kconfig" 


source "arch/arm/mach-at91/Kconfig"



source "arch/arm/mach-axxia/Kconfig"



source "arch/arm/mach-bcm/Kconfig"



source "arch/arm/mach-berlin/Kconfig"

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -138,10 +138,12 @@ endif 
textofs-$(CONFIG_ARCH_MSM7X30) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000

textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000



# Machine directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

machine-$(CONFIG_ARCH_AT91)		+= at91

machine-$(CONFIG_ARCH_AXXIA)		+= axxia

machine-$(CONFIG_ARCH_BCM)		+= bcm

machine-$(CONFIG_ARCH_BERLIN)		+= berlin

machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb 
dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb



dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb

dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb

dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \

CRA Git | Maintained and supported by SUSTech CRA and CCSE