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

Commit 8be0b988 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' into for-next 

* fixes:
  ARM64: dts: meson-gx: fix UART pclk clock name
  ARM: dts: Fix dm814x missing phy-cells property
  ARM: dts: Fix elm interrupt compiler warning
  bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left.
  bus: arm-cci: Fix use of smp_processor_id() in preemptible context
  bus: arm-ccn: Fix use of smp_processor_id() in preemptible context
  bus: arm-ccn: Simplify code
  bus: arm-ccn: Check memory allocation failure
  bus: arm-ccn: constify attribute_group structures.
  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
parents 8b6eac70 ce39882e

arch/arm/boot/dts/dm814x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ 
					reg = <0x1b00 0x100>;

					reg-names = "phy";

					ti,ctrl_mod = <&usb_ctrl_mod>;

					#phy-cells = <0>;

				};

			};

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/boot/dts/omap4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ 
		elm: elm@48078000 {

			compatible = "ti,am3352-elm";

			reg = <0x48078000 0x2000>;

			interrupts = <4>;

			interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "elm";

			status = "disabled";

		};

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 {