Commit 563b75d7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'juno-fixes-5.5' of... 

Merge tag 'juno-fixes-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

ARMv8 Juno fixes for v5.5

Couple of fixes:
1. Fix for UART clock frequency on all Juno variants that exist since
   the platform was added. This is mainly due to incorrect Juno SoC
   TRM that was referred during initial development days
2. Drop "dma-ranges" property for now as they are triggering loads of
   warning on boot

* tag 'juno-fixes-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  Revert "arm64: dts: juno: add dma-ranges property"
  arm64: dts: juno: Fix UART frequency
  arm64: dts: juno: add GPU subsystem

Link: https://lore.kernel.org/r/20191202114338.GA20965@bogus


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 680fb087 54fb3fe0

Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ properties: 
          - enum:

             - amlogic,meson-gxm-mali

          - const: arm,mali-t820

      - items:

          - enum:

             - arm,juno-mali

          - const: arm,mali-t624

      - items:

          - enum:

             - rockchip,rk3288-mali
@@ -39,7 +43,6 @@ properties: 
             - samsung,exynos5433-mali

          - const: arm,mali-t760



          # "arm,mali-t624"

          # "arm,mali-t628"

          # "arm,mali-t830"

          # "arm,mali-t880"

arch/arm64/boot/dts/arm/juno-base.dtsi

+27 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ / { 
	/*

	 *  Devices shared by all Juno boards

	 */

	dma-ranges = <0 0 0 0 0x100 0>;



	memtimer: timer@2a810000 {

		compatible = "arm,armv7-timer-mem";
@@ -35,6 +34,18 @@ mailbox: mhu@2b1f0000 { 
		clock-names = "apb_pclk";

	};



	smmu_gpu: iommu@2b400000 {

		compatible = "arm,mmu-400", "arm,smmu-v1";

		reg = <0x0 0x2b400000 0x0 0x10000>;

		interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		power-domains = <&scpi_devpd 1>;

		dma-coherent;

		status = "disabled";

	};



	smmu_pcie: iommu@2b500000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x2b500000 0x0 0x10000>;
@@ -487,6 +498,21 @@ cluster1_etm3_out_port: endpoint { 
		};

	};



	gpu: gpu@2d000000 {

		compatible = "arm,juno-mali", "arm,mali-t624";

		reg = <0 0x2d000000 0 0x10000>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "gpu", "job", "mmu";

		clocks = <&scpi_dvfs 2>;

		power-domains = <&scpi_devpd 1>;

		dma-coherent;

		/* The SMMU is only really of interest to bare-metal hypervisors */

		/* iommus = <&smmu_gpu 0>; */

		status = "disabled";

	};



	sram: sram@2e000000 {

		compatible = "arm,juno-sram-ns", "mmio-sram";

		reg = <0x0 0x2e000000 0x0 0x8000>;

arch/arm64/boot/dts/arm/juno-clocks.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
 */

/ {

	/* SoC fixed clocks */

	soc_uartclk: refclk7273800hz {

	soc_uartclk: refclk7372800hz {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <7273800>;

		clock-frequency = <7372800>;

		clock-output-names = "juno:uartclk";

	};