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

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

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

Pull ARM64 SoC changes from Arnd Bergmann:
 "This adds support for two new ARM64 platforms:

   - ARM Juno
   - AMD Seattle

  We had submissions for a number of additional platforms from Samsung,
  Freescale and Spreadtrum but are still working out the best process
  for getting these merged"

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: amd-seattle: Fix PCI bus range due to SMMU limitation
  arm64: ARM: Fix the Generic Timers interrupt active level description
  arm64: amd-seattle: Adding device tree for AMD Seattle platform
  arm64: Add Juno board device tree.
  arm64: Create link to include/dt-bindings to enable C preprocessor use.
parents 151cd976 70bcc9ba

arch/arm64/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ source "kernel/Kconfig.freezer" 


menu "Platform selection"



config ARCH_SEATTLE

	bool "AMD Seattle SoC Family"

	help

	  This enables support for AMD Seattle SOC Family



config ARCH_THUNDER

	bool "Cavium Inc. Thunder SoC Family"

	help

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line 
dts-dirs += amd

dts-dirs += apm

dts-dirs += arm

dts-dirs += cavium

arch/arm64/boot/dts/amd/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb

arch/arm64/boot/dts/amd/amd-overdrive.dts

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * DTS file for AMD Seattle Overdrive Development Board

 *

 * Copyright (C) 2014 Advanced Micro Devices, Inc.

 */



/dts-v1/;



/include/ "amd-seattle-soc.dtsi"



/ {

	model = "AMD Seattle Development Board (Overdrive)";

	compatible = "amd,seattle-overdrive", "amd,seattle";



	chosen {

		stdout-path = &serial0;

		linux,pci-probe-only;

	};

};



&ccp0 {

	status = "ok";

};



&gpio0 {

	status = "ok";

};



&gpio1 {

	status = "ok";

};



&i2c0 {

	status = "ok";

};



&pcie0 {

	status = "ok";

};



&spi0 {

	status = "ok";

};



&spi1 {

	status = "ok";

	sdcard0: sdcard@0 {

		compatible = "mmc-spi-slot";

		reg = <0>;

		spi-max-frequency = <20000000>;

		voltage-ranges = <3200 3400>;

		gpios = <&gpio0 7 0>;

		interrupt-parent = <&gpio0>;

		interrupts = <7 3>;

		pl022,hierarchy = <0>;

		pl022,interface = <0>;

		pl022,com-mode = <0x0>;

		pl022,rx-level-trig = <0>;

		pl022,tx-level-trig = <0>;

	};

};



&v2m0 {

	arm,msi-base-spi = <64>;

	arm,msi-num-spis = <256>;

};

arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * DTS file for AMD Seattle Clocks

 *

 * Copyright (C) 2014 Advanced Micro Devices, Inc.

 */



	adl3clk_100mhz: clk100mhz_0 {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <100000000>;

		clock-output-names = "adl3clk_100mhz";

	};



	ccpclk_375mhz: clk375mhz {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <375000000>;

		clock-output-names = "ccpclk_375mhz";

	};



	sataclk_333mhz: clk333mhz {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <333000000>;

		clock-output-names = "sataclk_333mhz";

	};



	pcieclk_500mhz: clk500mhz_0 {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <500000000>;

		clock-output-names = "pcieclk_500mhz";

	};



	dmaclk_500mhz: clk500mhz_1 {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <500000000>;

		clock-output-names = "dmaclk_500mhz";

	};



	miscclk_250mhz: clk250mhz_4 {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <250000000>;

		clock-output-names = "miscclk_250mhz";

	};



	uartspiclk_100mhz: clk100mhz_1 {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <100000000>;

		clock-output-names = "uartspiclk_100mhz";

	};