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

Commit ce39882e authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'amlogic-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Amlogic fixes for v4.15-rc
- GPIO interrupt fixes
- socinfo fix for GX series
- fix typo

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

:
  ARM64: dts: meson-gx: fix UART pclk clock name
  meson-gx-socinfo: Fix package id parsing
  ARM: meson: fix spelling mistake: "Couln't" -> "Couldn't"
  ARM: dts: meson: fix the memory region of the GPIO interrupt controller
  ARM: dts: meson: correct the sort order for the the gpio_intc node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3dda7f63 39005e56

arch/arm/boot/dts/meson.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -85,15 +85,6 @@ 
				reg = <0x7c00 0x200>;

			};



			gpio_intc: interrupt-controller@9880 {

				compatible = "amlogic,meson-gpio-intc";

				reg = <0xc1109880 0x10>;

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

				status = "disabled";

			};



			hwrng: rng@8100 {

				compatible = "amlogic,meson-rng";

				reg = <0x8100 0x8>;
@@ -191,6 +182,15 @@ 
				status = "disabled";

			};



			gpio_intc: interrupt-controller@9880 {

				compatible = "amlogic,meson-gpio-intc";

				reg = <0x9880 0x10>;

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

				status = "disabled";

			};



			wdt: watchdog@9900 {

				compatible = "amlogic,meson6-wdt";

				reg = <0x9900 0x8>;

arch/arm/mach-meson/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, 


	scu_base = of_iomap(node, 0);

	if (!scu_base) {

		pr_err("Couln't map SCU registers\n");

		pr_err("Couldn't map SCU registers\n");

		return;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -753,12 +753,12 @@ 


&uart_B {

	clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;

	clock-names = "xtal", "core", "baud";

	clock-names = "xtal", "pclk", "baud";

};



&uart_C {

	clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;

	clock-names = "xtal", "core", "baud";

	clock-names = "xtal", "pclk", "baud";

};



&vpu {

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

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


&uart_A {

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;

	clock-names = "xtal", "core", "baud";

	clock-names = "xtal", "pclk", "baud";

};



&uart_AO {
@@ -703,12 +703,12 @@ 


&uart_B {

	clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;

	clock-names = "xtal", "core", "baud";

	clock-names = "xtal", "pclk", "baud";

};



&uart_C {

	clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;

	clock-names = "xtal", "core", "baud";

	clock-names = "xtal", "pclk", "baud";

};



&vpu {

drivers/soc/amlogic/meson-gx-socinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#define AO_SEC_SOCINFO_OFFSET	AO_SEC_SD_CFG8



#define SOCINFO_MAJOR	GENMASK(31, 24)

#define SOCINFO_MINOR	GENMASK(23, 16)

#define SOCINFO_PACK	GENMASK(15, 8)

#define SOCINFO_PACK	GENMASK(23, 16)

#define SOCINFO_MINOR	GENMASK(15, 8)

#define SOCINFO_MISC	GENMASK(7, 0)



static const struct meson_gx_soc_id {