Commit 4cb0f05d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-5.3-1' of git://git.infradead.org/linux-mvebu into arm/dt 

mvebu dt64 for 5.3 (part 1)

For Armada 7K/8K:
 - enable AP806 thermal throttling with CPUfreq
 - add missing #interrupt-cells property allowing configuring
   interrupt for GPIO

On Armada 8040 based board:
- Fix PCI memory window on Mcbin board
- Set SFP power limit on clearfog GT board
- Disable AP I2C on Armada-8040-DB

On Armada 3720 based board espressobin correct the SPI node used for
NOR flash

On Armada 7040 DB board add USB current regulators

* tag 'mvebu-dt64-5.3-1' of git://git.infradead.org/linux-mvebu

:
  arm64: dts: marvell: add missing #interrupt-cells property
  arm64: dts: marvell: armada-7040-db: Add USB current regulators
  arm64: dts: armada-3720-espressobin: correct spi node
  arm64: dts: marvell: Disable AP I2C on Armada-8040-DB
  arm64: dts: marvell: Enable AP806 thermal throttling with CPUfreq
  arm64: dts: marvell: Change core numbering in AP806 thermal-node
  arm64: dts: marvell: clearfog-gt-8k: set SFP power limit
  arm64: dts: marvell: mcbin: enlarge PCI memory window

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2545de85 200f5c40

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

+1 −17
Original line number Diff line number Diff line
@@ -95,25 +95,9 @@ 


	flash@0 {

		reg = <0>;

		compatible = "winbond,w25q32dw", "jedec,spi-flash";

		compatible = "jedec,spi-nor";

		spi-max-frequency = <104000000>;

		m25p,fast-read;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "uboot";

				reg = <0 0x180000>;

			};



			partition@180000 {

				label = "ubootenv";

				reg = <0x180000 0x10000>;

			};

		};

	};

};

arch/arm64/boot/dts/marvell/armada-7040-db.dts

+28 −0
Original line number Diff line number Diff line
@@ -28,6 +28,32 @@ 
		ethernet2 = &cp0_eth2;

	};



	cp0_exp_usb3_0_current_regulator: gpio-regulator {

		compatible = "regulator-gpio";

		regulator-name = "cp0-usb3-0-current-regulator";

		regulator-type = "current";

		regulator-min-microamp = <500000>;

		regulator-max-microamp = <900000>;

		gpios = <&expander0 4 GPIO_ACTIVE_HIGH>;

		states = <500000 0x0

			  900000 0x1>;

		enable-active-high;

		gpios-states = <0>;

	};



	cp0_exp_usb3_1_current_regulator: gpio-regulator {

		compatible = "regulator-gpio";

		regulator-name = "cp0-usb3-1-current-regulator";

		regulator-type = "current";

		regulator-min-microamp = <500000>;

		regulator-max-microamp = <900000>;

		gpios = <&expander0 5 GPIO_ACTIVE_HIGH>;

		states = <500000 0x0

			  900000 0x1>;

		enable-active-high;

		gpios-states = <0>;

	};



	cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb3h0-vbus";
@@ -35,6 +61,7 @@ 
		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;

		vin-supply = <&cp0_exp_usb3_0_current_regulator>;

	};



	cp0_reg_usb3_1_vbus: cp0-usb3-1-vbus {
@@ -44,6 +71,7 @@ 
		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;

		vin-supply = <&cp0_exp_usb3_1_current_regulator>;

	};



	cp0_usb3_0_phy: cp0-usb3-0-phy {

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
		tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_sfp_present_pins &cp1_sfp_tx_disable_pins>;

		maximum-power-milliwatt = <2000>;

	};



	leds {

arch/arm64/boot/dts/marvell/armada-8040-db.dts

+2 −5
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
		ethernet1 = &cp0_eth2;

		ethernet2 = &cp1_eth0;

		ethernet3 = &cp1_eth1;

		i2c1 = &cp0_i2c0;

		i2c2 = &cp1_i2c0;

	};



	cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {
@@ -72,11 +74,6 @@ 
	};

};



&i2c0 {

	status = "okay";

	clock-frequency = <100000>;

};



&spi0 {

	status = "okay";

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ 
	num-lanes = <4>;

	num-viewport = <8>;

	reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;

	ranges = <0x81000000 0x0 0xf9010000 0x0 0xf9010000 0x0 0x10000

		  0x82000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x20000000>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE