Commit 87c71dd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "There are only a handful of bugfixes this time, which feels almost too
  small, so I hope we are not missing something important.

   - One more mediatek dts warning fix after the previous larger set,
     this should finally result in a clean defconfig build.

   - TI OMAP dts fixes for a spurious hang on am335x and invalid data on
     DTA7

   - One DTS fix for ethernet on Oriange Pi Zero (Allwinner H616)

   - A regression fix for ti-sysc interconnect target module driver to
     not access registers after reset if srst_udelay quirk is needed

   - Reset controller driver fixes for a crash during error handling and
     a build warning"

* tag 'soc-fixes-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: mediatek: mt8395-genio-1200-evk: add interrupt-parent for mt6360
  ARM: dts: Fix occasional boot hang for am3 usb
  reset: Fix crash when freeing non-existent optional resets
  ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
  ARM: dts: dra7: Fix DRA7 L3 NoC node register size
  bus: ti-sysc: Flush posted write only after srst_udelay
  reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning
  arm64: dts: allwinner: h616: update emac for Orange Pi Zero 3
parents 1bddd45b fa3d6c71

arch/arm/boot/dts/ti/omap/am33xx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ usb: target-module@47400000 { 
					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			ti,sysc-delay-us = <2>;

			clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

arch/arm/boot/dts/ti/omap/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ ocp: ocp { 


		l3-noc@44000000 {

			compatible = "ti,dra7-l3-noc";

			reg = <0x44000000 0x1000>,

			reg = <0x44000000 0x1000000>,

			      <0x45000000 0x1000>;

			interrupts-extended = <&crossbar_mpu GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

					      <&wakeupgen GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/mach-omap2/id.c

+5 −0
Original line number Diff line number Diff line
@@ -793,11 +793,16 @@ void __init omap_soc_device_init(void) 


	soc_dev_attr->machine  = soc_name;

	soc_dev_attr->family   = omap_get_family();

	if (!soc_dev_attr->family) {

		kfree(soc_dev_attr);

		return;

	}

	soc_dev_attr->revision = soc_rev;

	soc_dev_attr->custom_attr_group = omap_soc_groups[0];



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->family);

		kfree(soc_dev_attr);

		return;

	}

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -68,10 +68,7 @@ &ehci1 { 
&emac0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ext_rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	allwinner,rx-delay-ps = <3100>;

	allwinner,tx-delay-ps = <700>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ / { 
};



&emac0 {

	allwinner,rx-delay-ps = <3100>;

	allwinner,tx-delay-ps = <700>;

	phy-mode = "rgmii";

	phy-supply = <&reg_dcdce>;

};