Commit 010da09e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm64-dt-for-4.13-v2' of git://github.com/hisilicon/linux-hisi into next/dt64 

ARM64: DT: Hisilicon SoC DT updates for 4.13

- Add and update Hi3660-Hikey960 board, Hi3660 PCIe RC, Hi6421v530 MFD and
  Hi3660 MMC binding
- Add and refine devices support for Hi3660-Hikey 960 including clock, reset,
  I2C, GPIO, UART, Bluetooth, RTC, Power Key, LED, SPI, timer, PMIC, regulator,
  sd/sdio and WiFi
- Add k3-dma and i2s/hdmi audio support based on audio-card-graph method for
  Hikey board

* tag 'hisi-arm64-dt-for-4.13-v2' of git://github.com/hisilicon/linux-hisi

: (21 commits)
  arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support
  arm64: dts: hi3660-hikey960: add nodes for WiFi
  arm64: dts: hi3660: add sd/sdio device nodes
  dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc
  arm64: dts: hikey960: add device node for pmic and regulators
  dt-bindings: mfd: hi6421: Add hi6421v530 compatible string
  arm64: dts: hisi: add kirin pcie node
  dt-bindings: PCI: hisi: Add document for PCIe of Kirin SoCs
  arm64: dts: hi3660: add sp804 timer node
  arm64: dts: hi3660: add spi device nodes
  arm64: dts: hikey960: add LED nodes
  arm64: dts: hi3660: add power key dts node
  arm64: dts: hi3660: Add pl031 rtc node
  arm64: dts: hikey960: add WL1837 Bluetooth device node
  arm64: dts: hi3660: Add uarts nodes
  arm64: dts: hi3660: add gpio dtsi file for Hisilicon Hi3660 SOC
  arm64: dts: Add I2C nodes for Hi3660
  arm64: dts: hi3660: add resources for clock and reset
  arm64: dts: hikey960: pinctrl: add more pinmux and pinconfig
  arm64: dts: hisilicon: update compatible string for hikey960
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2003c78b 0cf6a8e2

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ Hi3660 SoC 
Required root node properties:

	- compatible = "hisilicon,hi3660";



HiKey960 Board

Required root node properties:

	- compatible = "hisilicon,hi3660-hikey960", "hisilicon,hi3660";



Hi3798cv200 SoC

Required root node properties:

	- compatible = "hisilicon,hi3798cv200";

Documentation/devicetree/bindings/mfd/hi6421.txt

+3 −1
Original line number Diff line number Diff line 
* HI6421 Multi-Functional Device (MFD), by HiSilicon Ltd.



Required parent device properties:

- compatible	: contains "hisilicon,hi6421-pmic";

- compatible    : One of the following chip-specific strings:

	"hisilicon,hi6421-pmic";

	"hisilicon,hi6421v530-pmic";

- reg		: register range space of hi6421;



Supported Hi6421 sub-devices include:

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller. 
Required Properties:



* compatible: should be one of the following.

  - "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions.

  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions.

  - "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions.

Documentation/devicetree/bindings/pci/kirin-pcie.txt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
HiSilicon Kirin SoCs PCIe host DT description



Kirin PCIe host controller is based on Designware PCI core.

It shares common functions with PCIe Designware core driver

and inherits common properties defined in

Documentation/devicetree/bindings/pci/designware-pci.txt.



Additional properties are described here:



Required properties

- compatible:

	"hisilicon,kirin960-pcie" for PCIe of Kirin960 SoC

- reg: Should contain rc_dbi, apb, phy, config registers location and length.

- reg-names: Must include the following entries:

  "dbi": controller configuration registers;

  "apb": apb Ctrl register defined by Kirin;

  "phy": apb PHY register defined by Kirin;

  "config": PCIe configuration space registers.

- reset-gpios: The gpio to generate PCIe perst assert and deassert signal.



Optional properties:



Example based on kirin960:



	pcie@f4000000 {

		compatible = "hisilicon,kirin-pcie";

		reg = <0x0 0xf4000000 0x0 0x1000>, <0x0 0xff3fe000 0x0 0x1000>,

		      <0x0 0xf3f20000 0x0 0x40000>, <0x0 0xF4000000 0 0x2000>;

		reg-names = "dbi","apb","phy", "config";

		bus-range = <0x0  0x1>;

		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>;

		num-lanes = <1>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xf800 0 0 7>;

		interrupt-map = <0x0 0 0 1 &gic 0 0 0  282 4>,

				<0x0 0 0 2 &gic 0 0 0  283 4>,

				<0x0 0 0 3 &gic 0 0 0  284 4>,

				<0x0 0 0 4 &gic 0 0 0  285 4>;

		clocks = <&crg_ctrl HI3660_PCIEPHY_REF>,

			 <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>,

			 <&crg_ctrl HI3660_PCLK_GATE_PCIE_PHY>,

			 <&crg_ctrl HI3660_PCLK_GATE_PCIE_SYS>,

			 <&crg_ctrl HI3660_ACLK_GATE_PCIE>;

		clock-names = "pcie_phy_ref", "pcie_aux",

			      "pcie_apb_phy", "pcie_apb_sys", "pcie_aclk";

		reset-gpios = <&gpio11 1 0 >;

	};

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

+213 −4
Original line number Diff line number Diff line
@@ -9,17 +9,28 @@ 


#include "hi3660.dtsi"

#include "hikey960-pinctrl.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "HiKey960";

	compatible = "hisilicon,hi3660";

	compatible = "hisilicon,hi3660-hikey960", "hisilicon,hi3660";



	aliases {

		serial5 = &uart5;       /* console UART */

		mshc1 = &dwmmc1;

		mshc2 = &dwmmc2;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

		serial4 = &uart4;

		serial5 = &uart5;

		serial6 = &uart6;

	};



	chosen {

		stdout-path = "serial5:115200n8";

		stdout-path = "serial6:115200n8";

	};



	memory@0 {
@@ -27,8 +38,206 @@ 
		/* rewrite this at bootloader */

		reg = <0x0 0x0 0x0 0x0>;

	};



	keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key_pmx_func &pwr_key_cfg_func>;



		power {

			wakeup-source;

			gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

		};

	};



	leds {

		compatible = "gpio-leds";



		user_led1 {

			label = "user_led1";

			/* gpio_150_user_led1 */

			gpios = <&gpio18 6 0>;

			linux,default-trigger = "heartbeat";

		};



		user_led2 {

			label = "user_led2";

			/* gpio_151_user_led2 */

			gpios = <&gpio18 7 0>;

			linux,default-trigger = "mmc0";

		};



		user_led3 {

			label = "user_led3";

			/* gpio_189_user_led3 */

			gpios = <&gpio23 5 0>;

			default-state = "off";

		};



		user_led4 {

			label = "user_led4";

			/* gpio_190_user_led4 */

			gpios = <&gpio23 6 0>;

			linux,default-trigger = "cpu0";

		};



		wlan_active_led {

			label = "wifi_active";

			/* gpio_205_wifi_active */

			gpios = <&gpio25 5 0>;

			linux,default-trigger = "phy0tx";

			default-state = "off";

		};



		bt_active_led {

			label = "bt_active";

			gpios = <&gpio25 7 0>;

			/* gpio_207_user_led1 */

			linux,default-trigger = "hci0-power";

			default-state = "off";

		};

	};



&uart5 {

	pmic: pmic@fff34000 {

		compatible = "hisilicon,hi6421v530-pmic";

		reg = <0x0 0xfff34000 0x0 0x1000>;

		interrupt-controller;

		#interrupt-cells = <2>;



		regulators {

			ldo3: LDO3 { /* HDMI */

				regulator-name = "VOUT3_1V85";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <2200000>;

				regulator-enable-ramp-delay = <120>;

			};



			ldo9: LDO9 { /* SDCARD I/O */

				regulator-name = "VOUT9_1V8_2V95";

				regulator-min-microvolt = <1750000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <240>;

			};



			ldo11: LDO11 { /* Low Speed Connector */

				regulator-name = "VOUT11_1V8_2V95";

				regulator-min-microvolt = <1750000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <240>;

			};



			ldo15: LDO15 { /* UFS VCC */

				regulator-name = "VOUT15_3V0";

				regulator-min-microvolt = <1750000>;

				regulator-max-microvolt = <3000000>;

				regulator-boot-on;

				regulator-always-on;

				regulator-enable-ramp-delay = <120>;

			};



			ldo16: LDO16 { /* SD VDD */

				regulator-name = "VOUT16_2V95";

				regulator-min-microvolt = <1750000>;

				regulator-max-microvolt = <3000000>;

				regulator-enable-ramp-delay = <360>;

			};

		};

	};



	wlan_en: wlan-en-1-8v {

		compatible = "regulator-fixed";

		regulator-name = "wlan-en-regulator";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;



		/* GPIO_051_WIFI_EN */

		gpio = <&gpio6 3 0>;



		/* WLAN card specific delay */

		startup-delay-us = <70000>;

		enable-active-high;

	};

};



&i2c0 {

	/* On Low speed expansion */

	label = "LS-I2C0";

	status = "okay";

};



&i2c1 {

	status = "okay";



	adv7533: adv7533@39 {

		status = "ok";

		compatible = "adi,adv7533";

		reg = <0x39>;

	};

};



&i2c7 {

	/* On Low speed expansion */

	label = "LS-I2C1";

	status = "okay";

};



&uart3 {

	/* On Low speed expansion */

	label = "LS-UART0";

	status = "okay";

};



&uart4 {

	status = "okay";



	bluetooth {

		compatible = "ti,wl1837-st";

		enable-gpios = <&gpio15 6 GPIO_ACTIVE_HIGH>;

		max-speed = <921600>;

	};

};



&uart6 {

	/* On Low speed expansion */

	label = "LS-UART1";

	status = "okay";

};



&spi2 {

	/* On Low speed expansion */

	label = "LS-SPI0";

	status = "okay";

};



&spi3 {

	/* On High speed expansion */

	label = "HS-SPI1";

	status = "okay";

};



&dwmmc1 {

	vmmc-supply = <&ldo16>;

	vqmmc-supply = <&ldo9>;

	status = "okay";

};



&dwmmc2 { /* WIFI */

	broken-cd;

	/* WL_EN */

	vmmc-supply = <&wlan_en>;

	ti,non-removable;

	non-removable;

	#address-cells = <0x1>;

	#size-cells = <0x0>;

	status = "ok";



	wlcore: wlcore@2 {

		compatible = "ti,wl1837";

		reg = <2>;      /* sdio func num */

		/* WL_IRQ, GPIO_179_WL_WAKEUP_AP */

		interrupt-parent = <&gpio22>;

		interrupts = <3 IRQ_TYPE_EDGE_RISING>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE