Commit aafd0173 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-5.6' of... 

Merge tag 'sunxi-fixes-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Allwinner Fixes for v5.6

A pretty normal set of fixes for v5.6:

  - Fix reversed macros used for A83T EMAC clock and reset
  - Fix camera regulator voltage and USB OTG for TBS-A711
  - 16-bit / 8-bit mixed read fix for our RSB driver
  - Fix SPI controller base address for R40
  - Reorder device nodes based on base address for R40

* tag 'sunxi-fixes-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: r40: Move SPI device nodes based on address order
  ARM: dts: sun8i: r40: Fix register base address for SPI2 and SPI3
  ARM: dts: sun8i: r40: Move AHCI device node based on address order
  bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads
  ARM: dts: sun8i-a83t-tbs-a711: Fix USB OTG mode detection
  ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage
  ARM: dts: sun8i: a83t: Fix incorrect clk and reset macros for EMAC device

Link: https://lore.kernel.org/r/20200313055233.GA19649@wens.csie.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8b45e9d9 d9b553b0

arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts

+4 −3
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ 
};



&reg_dldo3 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "vdd-csi";

};
@@ -498,7 +498,8 @@ 
};



&usbphy {

	usb0_id_det-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */

	usb0_id_det-gpios = <&pio 7 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH11 */

	usb0_vbus_power-supply = <&usb_power_supply>;

	usb0_vbus-supply = <&reg_drivevbus>;

	usb1_vbus-supply = <&reg_vmain>;

	usb2_vbus-supply = <&reg_vmain>;

arch/arm/boot/dts/sun8i-a83t.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1006,10 +1006,10 @@ 
			reg = <0x01c30000 0x104>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			resets = <&ccu CLK_BUS_EMAC>;

			reset-names = "stmmaceth";

			clocks = <&ccu RST_BUS_EMAC>;

			clocks = <&ccu CLK_BUS_EMAC>;

			clock-names = "stmmaceth";

			resets = <&ccu RST_BUS_EMAC>;

			reset-names = "stmmaceth";

			status = "disabled";



			mdio: mdio {

arch/arm/boot/dts/sun8i-r40.dtsi

+62 −63
Original line number Diff line number Diff line
@@ -181,6 +181,32 @@ 
			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

		};



		spi0: spi@1c05000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c05000 0x1000>;

			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI0>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi1: spi@1c06000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c06000 0x1000>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI1>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		csi0: csi@1c09000 {

			compatible = "allwinner,sun8i-r40-csi0",

				     "allwinner,sun7i-a20-csi0";
@@ -290,6 +316,29 @@ 
			resets = <&ccu RST_BUS_CE>;

		};



		spi2: spi@1c17000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c17000 0x1000>;

			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI2>, <&ccu CLK_SPI2>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI2>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		ahci: sata@1c18000 {

			compatible = "allwinner,sun8i-r40-ahci";

			reg = <0x01c18000 0x1000>;

			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;

			resets = <&ccu RST_BUS_SATA>;

			reset-names = "ahci";

			status = "disabled";

		};



		ehci1: usb@1c19000 {

			compatible = "allwinner,sun8i-r40-ehci", "generic-ehci";

			reg = <0x01c19000 0x100>;
@@ -336,6 +385,19 @@ 
			status = "disabled";

		};



		spi3: spi@1c1f000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c1f000 0x1000>;

			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI3>, <&ccu CLK_SPI3>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI3>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		ccu: clock@1c20000 {

			compatible = "allwinner,sun8i-r40-ccu";

			reg = <0x01c20000 0x400>;
@@ -653,69 +715,6 @@ 
			#size-cells = <0>;

		};



		spi0: spi@1c05000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c05000 0x1000>;

			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI0>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi1: spi@1c06000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c06000 0x1000>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI1>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi2: spi@1c07000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c07000 0x1000>;

			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI2>, <&ccu CLK_SPI2>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI2>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi3: spi@1c0f000 {

			compatible = "allwinner,sun8i-r40-spi",

				     "allwinner,sun8i-h3-spi";

			reg = <0x01c0f000 0x1000>;

			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SPI3>, <&ccu CLK_SPI3>;

			clock-names = "ahb", "mod";

			resets = <&ccu RST_BUS_SPI3>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		ahci: sata@1c18000 {

			compatible = "allwinner,sun8i-r40-ahci";

			reg = <0x01c18000 0x1000>;

			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;

			resets = <&ccu RST_BUS_SATA>;

			reset-names = "ahci";

			status = "disabled";



		};



		gmac: ethernet@1c50000 {

			compatible = "allwinner,sun8i-r40-gmac";

			syscon = <&ccu>;

drivers/bus/sunxi-rsb.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr, 
	if (ret)

		goto unlock;



	*buf = readl(rsb->regs + RSB_DATA);

	*buf = readl(rsb->regs + RSB_DATA) & GENMASK(len * 8 - 1, 0);



unlock:

	mutex_unlock(&rsb->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE