Commit b71a29d5 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

ARM64: DT: Hisilicon SoCs DT updates for 4.21

* Hi3660 SoC and related boards:
  - Standardize LED labels and triggers for the hikey960 board
  - Add the missing cooling-cells property for the cpu nodes
  - Add all cpus into the cooling maps

* Hi3670 SoC and related boards:
  - Add clock nodes and update the uart clock
  - Add Pinctrl, GPIO and uart nodes
  - Enable uart and add GPIO line names for the hikey970 board

* Hi3798 SoC and related boards:
  - Standardize LED labels and triggers for the poplar board

* Hi6220 SoC and related boards:
  - Standardize LED labels and triggers for the hikey board
  - Add all cpus into the cooling maps

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

:
  ARM64: dts: hisilicon: Add all CPUs in cooling maps
  arm64: dts: hi3660: Add missing cooling device properties for CPUs
  arm64: dts: hisilicon: poplar: Standardize LED labels and triggers
  arm64: dts: hisilicon: hikey960: Standardize LED labels and triggers
  arm64: dts: hisilicon: hikey: Standardize LED labels and triggers
  arm64: dts: hisilicon: hikey970: Add GPIO line names
  arm64: dts: hisilicon: hikey970: Enable on-board UARTs
  arm64: dts: hisilicon: hi3670: Add UART nodes
  arm64: dts: hisilicon: hi3670: Add GPIO controller support
  arm64: dts: hisilicon: Add Pinctrl support for HiKey970 board
  arm64: dts: hisilicon: Source SoC clock for UART6
  arm64: dts: hisilicon: Add clock nodes for Hi3670 SoC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8ef86955 6ad5506e

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

+9 −9
Original line number Diff line number Diff line
@@ -85,36 +85,36 @@ 
		compatible = "gpio-leds";



		user_led1 {

			label = "user_led1";

			label = "green:user1";

			/* gpio_150_user_led1 */

			gpios = <&gpio18 6 0>;

			linux,default-trigger = "heartbeat";

		};



		user_led2 {

			label = "user_led2";

			label = "green:user2";

			/* gpio_151_user_led2 */

			gpios = <&gpio18 7 0>;

			linux,default-trigger = "mmc0";

			linux,default-trigger = "none";

		};



		user_led3 {

			label = "user_led3";

			label = "green:user3";

			/* gpio_189_user_led3 */

			gpios = <&gpio23 5 0>;

			default-state = "off";

			linux,default-trigger = "mmc0";

		};



		user_led4 {

			label = "user_led4";

			label = "green:user4";

			/* gpio_190_user_led4 */

			gpios = <&gpio23 6 0>;

			panic-indicator;

			linux,default-trigger = "cpu0";

			linux,default-trigger = "none";

		};



		wlan_active_led {

			label = "wifi_active";

			label = "yellow:wlan";

			/* gpio_205_wifi_active */

			gpios = <&gpio25 5 0>;

			linux,default-trigger = "phy0tx";
@@ -122,7 +122,7 @@ 
		};



		bt_active_led {

			label = "bt_active";

			label = "blue:bt";

			gpios = <&gpio25 7 0>;

			/* gpio_207_user_led1 */

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

arch/arm64/boot/dts/hisilicon/hi3660.dtsi

+14 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
			capacity-dmips-mhz = <592>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;

			operating-points-v2 = <&cluster0_opp>;

			#cooling-cells = <2>;

		};



		cpu2: cpu@2 {
@@ -91,6 +92,7 @@ 
			capacity-dmips-mhz = <592>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;

			operating-points-v2 = <&cluster0_opp>;

			#cooling-cells = <2>;

		};



		cpu3: cpu@3 {
@@ -103,6 +105,7 @@ 
			capacity-dmips-mhz = <592>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;

			operating-points-v2 = <&cluster0_opp>;

			#cooling-cells = <2>;

		};



		cpu4: cpu@100 {
@@ -129,6 +132,7 @@ 
			capacity-dmips-mhz = <1024>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;

			operating-points-v2 = <&cluster1_opp>;

			#cooling-cells = <2>;

		};



		cpu6: cpu@102 {
@@ -141,6 +145,7 @@ 
			capacity-dmips-mhz = <1024>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;

			operating-points-v2 = <&cluster1_opp>;

			#cooling-cells = <2>;

		};



		cpu7: cpu@103 {
@@ -153,6 +158,7 @@ 
			capacity-dmips-mhz = <1024>;

			clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;

			operating-points-v2 = <&cluster1_opp>;

			#cooling-cells = <2>;

		};



		idle-states {
@@ -1112,12 +1118,18 @@ 
					map0 {

						trip = <&target>;

						contribution = <1024>;

						cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

						cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					};

					map1 {

						trip = <&target>;

						contribution = <512>;

						cooling-device = <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

						cooling-device = <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

								 <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					};

				};

			};

arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts

+338 −0
Original line number Diff line number Diff line
@@ -10,12 +10,19 @@ 
/dts-v1/;



#include "hi3670.dtsi"

#include "hikey970-pinctrl.dtsi"



/ {

	model = "HiKey970";

	compatible = "hisilicon,hi3670-hikey970", "hisilicon,hi3670";



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

		serial4 = &uart4;

		serial5 = &uart5;

		serial6 = &uart6;       /* console UART */

	};
@@ -30,6 +37,337 @@ 
	};

};



/*

 * Legend: proper name = the GPIO line is used as GPIO

 *         NC = not connected (pin out but not routed from the chip to

 *              anything the board)

 *         "[PER]" = pin is muxed for [peripheral] (not GPIO)

 *         "" = no idea, schematic doesn't say, could be

 *              unrouted (not connected to any external pin)

 *         LSEC = Low Speed External Connector

 *         HSEC = High Speed External Connector

 *

 * Line names are taken from "hikey970-schematics.pdf" from HiSilicon.

 *

 * For the lines routed to the external connectors the

 * lines are named after the 96Boards CE Specification 1.0,

 * Appendix "Expansion Connector Signal Description".

 *

 * When the 96Board naming of a line and the schematic name of

 * the same line are in conflict, the 96Board specification

 * takes precedence, which means that the external UART on the

 * LSEC is named UART0 while the schematic and SoC names this

 * UART2. This is only for the informational lines i.e. "[FOO]",

 * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only

 * ones actually used for GPIO.

 */

&gpio0 {

	/* GPIO_000-GPIO_007 */

	gpio-line-names =

		"",

		"TP901", /* TEST_MODE connected to TP901 */

		"",

		"GPIO_003_USB_HUB_RESET_N",

		"NC",

		"[AP_GPS_REF_CLK]",

		"[I2C3_SCL]",

		"[I2C3_SDA]";

};



&gpio1 {

	/* GPIO_008-GPIO_015 */

	gpio-line-names =

		"[UART0_CTS]", /* LSEC pin 3: GPIO_008_UART2_CTS_N */

		"[UART0_RTS]", /* LSEC pin 9: GPIO_009_UART2_RTS_N */

		"[UART0_TXD]", /* LSEC pin 5: GPIO_010_UART2_TXD */

		"[UART0_RXD]", /* LSEC pin 7: GPIO_011_UART2_RXD */

		"[USER_LED5]",

		"GPIO-I", /* LSEC pin 31: GPIO_013_CAM0_RST_N */

		"[USER_LED3]",

		"[USER_LED4]";

};



&gpio2 {

	/* GPIO_016-GPIO_023 */

	gpio-line-names =

		"GPIO-G", /* LSEC pin 29: GPIO_016_LCD_TE0 */

		"[CSI0_MCLK]", /* HSEC pin 15: ISP_CCLK0_MCAM */

		"[CSI1_MCLK]", /* HSEC pin 17: ISP_CCLK1_SCAM */

		"GPIO_019_BT_ACTIVE",

		"[I2C2_SCL]", /* HSEC pin 32: ISP_SCL0 */

		"[I2C2_SDA]", /* HSEC pin 34: ISP_SDA0 */

		"[I2C3_SCL]", /* HSEC pin 36: ISP_SCL1 */

		"[I2C3_SDA]"; /* HSEC pin 38: ISP_SDA1 */

};



&gpio3 {

	/* GPIO_024-GPIO_031 */

	gpio-line-names =

		"GPIO_024_WIFI_ACTIVE",

		"GPIO_025_PERST_M.2",

		"[I2C4_SCL]",

		"[I2C4_SDA]",

		"NC",

		"GPIO-H", /* LSEC pin 30: GPIO_029_LCD_RST_N */

		"[USER_LED1]",

		"GPIO-L"; /* LSEC pin 34: GPIO_031 */

};



&gpio4 {

	/* GPIO_032-GPIO_039 */

	gpio-line-names =

		"GPIO-K", /* LSEC pin 33: GPIO_032_CAM1_RST_N */

		"GPIO_033_PMU1_EN",

		"GPIO_034_USBSW_SEL",

		/*

		 * These two pins should be used for SD(IO) data according

		 * to the 96boards specification but seems to be repurposed

		 * for UART 0. They are however named according to the spec.

		 */

		"[SD_DAT1]", /* HSEC pin 3: GPIO_035_UART0_RXD */

		"[SD_DAT2]", /* HSEC pin 5: GPIO_036_UART0_TXD */

		"[UART1_RXD]", /* LSEC pin 13: DEBUG_UART6_RXD */

		"[UART1_TXD]", /* LSEC pin 11: DEBUG_UART6_TXD */

		"[SOC_GPS_UART3_CTS_N]"; /* TP2304 */

};



&gpio5 {

	/* GPIO_040-GPIO_047 */

	gpio-line-names =

		"[SOC_GPS_UART3_RTS_N]", /* TP2302 */

		"[SOC_GPS_UART3_RXD]", /* TP2303 */

		"[SOC_GPS_UART3_TXD]", /* TP2305 */

		"[SOC_BT_UART4_CTS_N]",

		"[SOC_BT_UART4_RTS_N]",

		"[SOC_BT_UART4_RXD]",

		"[SOC_BT_UART4_TXD]",

		"NC";

};



&gpio6 {

	/* GPIO_048-GPIO_055 */

	gpio-line-names =

		"NC",

		"GPIO_049_USER_LED6",

		"GPIO_050_CAN_RST",

		"GPIO_051_WIFI_EN",

		"GPIO-D", /* LSEC pin 26 */

		"GPIO-J", /* LSEC pin 32 */

		"GPIO_054_BT_EN",

		"[GPIO_055_SEL]";

};



&gpio7 {

	/* GPIO_056-GPIO_063 */

	gpio-line-names =

		"[PCIE_PERST_L]", "NC", "NC", "NC", "NC", "NC", "NC", "NC";

};



&gpio8 {

	/* GPIO_064-GPIO_071 */

	gpio-line-names = "NC", "NC", "NC", "NC", "NC", "NC", "NC", "NC";

};



&gpio9 {

	/* GPIO_072-GPIO_079 */

	gpio-line-names = "NC", "NC", "NC", "NC", "NC", "NC", "NC", "NC";

};



&gpio10 {

	/* GPIO_080-GPIO_087 */

	gpio-line-names = "NC", "NC", "NC", "NC", "NC", "NC", "NC", "NC";

};



&gpio11 {

	/* GPIO_088-GPIO_095 */

	gpio-line-names = "NC", "NC", "NC", "NC", "NC", "NC", "NC", "NC";

};



&gpio12 {

	/* GPIO_096-GPIO_103 */

	gpio-line-names = "NC", "", "", "", "", "", "", "";

};



&gpio13 {

	/* GPIO_104-GPIO_111 */

	gpio-line-names = "", "", "", "", "", "", "", "";

};



&gpio14 {

	/* GPIO_112-GPIO_119 */

	gpio-line-names = "", "", "", "", "", "", "", "";

};



&gpio15 {

	/* GPIO_120-GPIO_127 */

	gpio-line-names = "", "", "", "", "", "", "", "";

};



&gpio16 {

	/* GPIO_128-GPIO_135 */

	gpio-line-names =

		"[WL_SDIO_CLK]",

		"[WL_SDIO_CMD]",

		"[WL_SDIO_DATA0]",

		"[WL_SDIO_DATA1]",

		"[WL_SDIO_DATA2]",

		"[WL_SDIO_DATA3]",

		"[ETH_ISOLATE]",

		"NC";

};



&gpio17 {

	/* GPIO_136-GPIO_143 */

	gpio-line-names =

		"[MINI1CLK_EN]", "NC", "", "", "", "", "", "";

};



&gpio18 {

	/* GPIO_144-GPIO_151 */

	gpio-line-names =

		"[SPI1_SCLK]", /* HSEC pin 9: GPIO_144_SPI3_CLK */

		"[SPI1_DIN]", /* HSEC pin 11: GPIO_145_SPI3_DI */

		"[SPI1_DOUT]", /* HSEC pin 1: GPIO_146_SPI3_DO */

		"[SPI1_CS]", /* HSEC pin 7: GPIO_147_SPI3_CS0_N */

		"[POWER_INT_N]",

		"[CDMA_GPS_SYNC]",

		"GPIO_150_PEX_INTA",

		"GPIO_151_CAN_INT";

};



&gpio19 {

	/* GPIO_152-GPIO_159 */

	gpio-line-names = "", "", "", "", "", "", "", "";

};



&gpio20 {

	/* GPIO_160-GPIO_167 */

	gpio-line-names =

		"[SD_CLK]",

		"[SD_CMD]",

		"[SD_DATA0]",

		"[SD_DATA1]",

		"[SD_DATA2]",

		"[SD_DATA3]",

		"GPIO_166_ETHCLK_EN",

		"GPIO_167_USER_LED2";

};



&gpio21 {

	/* GPIO_168-GPIO_175 */

	gpio-line-names =

		"GPIO_168_GPS_EN",

		"GPIO-C", /* LSEC pin 25: GPIO_169_USIM1_CLK */

		"GPIO-E", /* LSEC pin 27: GPIO_170_USIM1_RST */

		"GPIO-B", /* LSEC pin 24: GPIO_171_USIM1_DATA */

		"", "", "", "", "";

};



&gpio22 {

	/* GPIO_176-GPIO_183 */

	gpio-line-names =

		"[PMU_PWR_HOLD]",

		"GPIO_177_WL_WAKEUP_AP",

		"[JTAG_TCK]",

		"[JTAG_TMS]",

		"[JTAG_TDI]",

		"[JTAG_TMS]",

		"GPIO_182_FATAL_ERR",

		"NC";

};



&gpio23 {

	/* GPIO_184-GPIO_191 */

	gpio-line-names =

		"GPIO_184_JTAG_SEL",

		"GPIO-F", /* LSEC pin 28: GPIO_185_LCD_BL_PWM */

		"[I2C0_SCL]", /* LSEC pin 15: GPIO_186_I2C0_SCL */

		"[I2C0_SDA]", /* LSEC pin 17: GPIO_187_I2C0_SDA */

		"[GPIO_188_I2C1_SCL]", /* Actual SoC I2C1_SCL */

		"[GPIO_189_I2C1_SDA]", /* Actual SoC I2C1_SDA */

		"[I2C1_SCL]", /* LSEC pin 19: GPIO_190_I2C2_SCL */

		"[I2C2_SDA]"; /* LSEC pin 21: GPIO_191_I2C2_SDA */

};



&gpio24 {

	/* GPIO_192-GPIO_199 */

	gpio-line-names =

		"[SD_LED]",

		"NC",

		"[PCM_DI]", /* LSEC pin 22: GPIO_194_I2S0_DI */

		"[PCM_DO]", /* LSEC pin 20: GPIO_195_I2S0_DO */

		"[PCM_CLK]", /* LSEC pin 18: GPIO_196_I2S0_XCLK */

		"[PCM_FS]", /* LSEC pin 16: GPIO_197_I2S0_XFS */

		"",

		"[I2S2_DO]";

};



&gpio25 {

	/* GPIO_200-GPIO_207 */

	gpio-line-names =

		"[I2S2_XCLK]",

		"[I2S2_XFS]",

		"GPIO_202_PERST_ETH",

		"GPIO_203_PWRON_DET",

		"GPIO_204_PMU1_IRQ_N",

		"GPIO_205_SD_DET",

		"GPIO_206_GPS_MOTION_INT",

		"GPIO_207_HDMI_SEL";

};



&gpio26 {

	/* GPIO_208-GPIO_215 */

	gpio-line-names =

		"GPIO-A", /* LSEC pin 23: GPIO_208_WAKEUP_SOC */

		"GPIO_209_VBUS_TYPEC",

		"NC",

		"NC",

		"NC",

		"[SPI0_SCLK]", /* LSEC pin 8: GPIO_213_SPI2_CLK */

		"[SPI0_DIN]", /* LSEC pin 10: GPIO_214_SPI2_DI */

		"[SPI0_DOUT]"; /* LSEC pin 14: GPIO_215_SPI2_DO */

};



&gpio27 {

	/* GPIO_216-GPIO_223 */

	gpio-line-names =

		"[SPI0_CS]", /* LSEC pin 12: GPIO_216_SPI2_CS0_N */

		"GPIO_217_HDMI_PD",

		"GPIO_218_GPS_WAKEUP_AP",

		"GPIO_219_M.2CLK_EN",

		"GPIO_220_PERST_MINI",

		"GPIO_221_CC_INT",

		"[PCIE_CLKREQ_L]",

		"NC";

};



&gpio28 {

	/* GPIO_224-GPIO_231 */

	gpio-line-names =

		"[PMU0_INT]",

		"[SPMI_DATA]",

		"[SPMI_CLK]",

		"[CAN_SPI_CLK]",

		"[CAN_SPI_DI]",

		"[CAN_SPI_DO]",

		"[CAN_SPI_CS]",

		"GPIO_231_HDMI_INT";

};



&uart0 {

	/* On High speed expansion header */

	label = "HS-UART0";

	status = "okay";

};



&uart2 {

	/* On Low speed expansion header */

	label = "LS-UART0";

	status = "okay";

};



&uart6 {

	/* On Low speed expansion header */

	label = "LS-UART1";

	status = "okay";

};

arch/arm64/boot/dts/hisilicon/hi3670.dtsi

+494 −5

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts

+7 −6
Original line number Diff line number Diff line
@@ -35,30 +35,31 @@ 
		compatible = "gpio-leds";



		user-led0 {

			label = "USER-LED0";

			label = "green:user1";

			gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		user-led1 {

			label = "USER-LED1";

			label = "green:user2";

			gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		user-led2 {

			label = "USER-LED2";

			label = "green:user3";

			gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

			linux,default-trigger = "mmc1";

			default-state = "off";

		};



		user-led3 {

			label = "USER-LED3";

			label = "green:user4";

			gpios = <&gpio10 6 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "cpu0";

			linux,default-trigger = "none";

			panic-indicator;

			default-state = "off";

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE