Unverified Commit dd5dc191 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes-v7.1-rc' of... 

Merge tag 'amlogic-fixes-v7.1-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/late2

Amlogic DT Fixes for v7.1:
- Fix ethernet PHY interrupt number for P230 reference board
- Add missing cache information to cpu0 for Amlogic AXG
- Fix Khadas VIM4 board model name
- Fix GIC register ranges for Amlogic T7
- Fix Khadas VIM4 memory layout for 8GB RAM
- Drop CPU masks from GICv3 PPI interrupts for Amlogic S6

* tag 'amlogic-fixes-v7.1-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux

:
  arm64: dts: meson-gxl-p230: fix ethernet PHY interrupt number
  arm64: dts: amlogic: meson-axg: Add missing cache information to cpu0
  arm64: dts: amlogic: t7: khadas-vim4: fix board model name
  arm64: dts: amlogic: Fix GIC register ranges for Amlogic T7
  arm64: dts: amlogic: t7: khadas-vim4: fix memory layout for 8GB RAM
  arm64: dts: amlogic: s6: Drop CPU masks from GICv3 PPI interrupts

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d21877ac 174a0ef3

arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ pwrc: power-controller { 


	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;

	};



	psci {
@@ -84,7 +84,7 @@ gic: interrupt-controller@ff200000 { 
			interrupt-controller;

			reg = <0x0 0xff200000 0 0x10000>,

			      <0x0 0xff240000 0 0x80000>;

			interrupts = <GIC_PPI 9 0xf04>;

			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;

		};



		apb: bus@fe000000 {

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "amlogic-t7.dtsi"



/ {

	model = "Khadas vim4";

	model = "Khadas VIM4";

	compatible = "khadas,vim4", "amlogic,a311d2", "amlogic,t7";



	aliases {
@@ -17,7 +17,9 @@ aliases { 


	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x2 0x0>; /* 8 GB */

		reg = <0x0 0x0 0x0 0xE0000000

			0x1 0x0 0x0 0xE0000000

			0x2 0x0 0x0 0x40000000>; /* 8 GB */

	};



	reserved-memory {

arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -213,7 +213,9 @@ gic: interrupt-controller@fff01000 { 
			#address-cells = <0>;

			interrupt-controller;

			reg = <0x0 0xfff01000 0 0x1000>,

			      <0x0 0xfff02000 0 0x0100>;

			      <0x0 0xfff02000 0 0x2000>,

			      <0x0 0xfff04000 0 0x2000>,

			      <0x0 0xfff06000 0 0x2000>;

			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;

		};

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ cpu0: cpu@0 { 
			compatible = "arm,cortex-a53";

			reg = <0x0 0x0>;

			enable-method = "psci";

			d-cache-line-size = <32>;

			d-cache-size = <0x8000>;

			d-cache-sets = <32>;

			i-cache-line-size = <32>;

			i-cache-size = <0x8000>;

			i-cache-sets = <32>;

			next-level-cache = <&l2>;

			clocks = <&scpi_dvfs 0>;

			dynamic-power-coefficient = <140>;

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ external_phy: ethernet-phy@0 { 
		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;



		interrupt-parent = <&gpio_intc>;

		interrupts = <29 IRQ_TYPE_LEVEL_LOW>;

		/* MAC_INTR on GPIOZ_15 */

		interrupts = <25 IRQ_TYPE_LEVEL_LOW>;

		eee-broken-1000t;

	};

};