Re: [PATCH 1/7] arm64: zynqmp: Add support for Xilinx zcu100-revC

From: Michal Simek
Date: Thu Feb 01 2018 - 12:33:51 EST

Next message: Rob Herring: "[GIT PULL] DeviceTree updates for 4.16"
Previous message: Ozan Alpay: "clang warning: implicit conversion in intel_ddi.c:1481"
In reply to: Rob Herring: "Re: [PATCH 1/7] arm64: zynqmp: Add support for Xilinx zcu100-revC"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 1.2.2018 17:41, Rob Herring wrote:
> On Fri, Jan 19, 2018 at 6:55 AM, Michal Simek <michal.simek@xxxxxxxxxx> wrote:
>> This board has 2GB of memory, i2c, sd, wifi sdio, spis, uarts, display
>> port and usbs.
>> Board is using fixed clocks because clock driver hasn't been merged yet.
>>
>> Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
>> ---
>>
>> arch/arm64/boot/dts/xilinx/Makefile | 1 +
>> arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi | 213 ++++++++++++++++
>> arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 298 ++++++++++++++++++++++
>> 3 files changed, 512 insertions(+)
>> create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
>> create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
>>
>> diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
>> index eba179b23b17..7266a6a9c0cd 100644
>> --- a/arch/arm64/boot/dts/xilinx/Makefile
>> +++ b/arch/arm64/boot/dts/xilinx/Makefile
>> @@ -1,2 +1,3 @@
>> # SPDX-License-Identifier: GPL-2.0
>> dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb
>> +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revC.dtb
>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
>> new file mode 100644
>> index 000000000000..9c09baca7dd7
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
>> @@ -0,0 +1,213 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Clock specification for Xilinx ZynqMP
>> + *
>> + * (C) Copyright 2015 - 2018, Xilinx, Inc.
>> + *
>> + * Michal Simek <michal.simek@xxxxxxxxxx>
>> + */
>> +
>> +/ {
>> + clk100: clk100 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <100000000>;
>> + };
>> +
>> + clk125: clk125 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <125000000>;
>> + };
>> +
>> + clk200: clk200 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <200000000>;
>> + };
>> +
>> + clk250: clk250 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <250000000>;
>> + };
>> +
>> + clk300: clk300 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <300000000>;
>> + };
>> +
>> + clk600: clk600 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <600000000>;
>> + };
>> +
>> + dp_aclk: clock0 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <100000000>;
>> + clock-accuracy = <100>;
>> + };
>> +
>> + dp_aud_clk: clock1 {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <24576000>;
>> + clock-accuracy = <100>;
>> + };
>> +
>> + dpdma_clk: dpdma_clk {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0x0>;
>> + clock-frequency = <533000000>;
>> + };
>> +
>> + drm_clock: drm_clock {
>> + compatible = "fixed-clock";
>> + #clock-cells = <0x0>;
>> + clock-frequency = <262750000>;
>> + clock-accuracy = <0x64>;
>> + };
>> +};
>> +
>> +&can0 {
>> + clocks = <&clk100 &clk100>;
>> +};
>> +
>> +&can1 {
>> + clocks = <&clk100 &clk100>;
>> +};
>> +
>> +&fpd_dma_chan1 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan2 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan3 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan4 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan5 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan6 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan7 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&fpd_dma_chan8 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan1 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan2 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan3 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan4 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan5 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan6 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan7 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&lpd_dma_chan8 {
>> + clocks = <&clk600>, <&clk100>;
>> +};
>> +
>> +&gem0 {
>> + clocks = <&clk125>, <&clk125>, <&clk125>;
>> +};
>> +
>> +&gem1 {
>> + clocks = <&clk125>, <&clk125>, <&clk125>;
>> +};
>> +
>> +&gem2 {
>> + clocks = <&clk125>, <&clk125>, <&clk125>;
>> +};
>> +
>> +&gem3 {
>> + clocks = <&clk125>, <&clk125>, <&clk125>;
>> +};
>> +
>> +&gpio {
>> + clocks = <&clk100>;
>> +};
>> +
>> +&i2c0 {
>> + clocks = <&clk100>;
>> +};
>> +
>> +&i2c1 {
>> + clocks = <&clk100>;
>> +};
>> +
>> +&sata {
>> + clocks = <&clk250>;
>> +};
>> +
>> +&sdhci0 {
>> + clocks = <&clk200 &clk200>;
>> +};
>> +
>> +&sdhci1 {
>> + clocks = <&clk200 &clk200>;
>> +};
>> +
>> +&spi0 {
>> + clocks = <&clk200 &clk200>;
>> +};
>> +
>> +&spi1 {
>> + clocks = <&clk200 &clk200>;
>> +};
>> +
>> +&uart0 {
>> + clocks = <&clk100 &clk100>;
>> +};
>> +
>> +&uart1 {
>> + clocks = <&clk100 &clk100>;
>> +};
>> +
>> +&usb0 {
>> + clocks = <&clk250>, <&clk250>;
>> +};
>> +
>> +&usb1 {
>> + clocks = <&clk250>, <&clk250>;
>> +};
>> +
>> +&watchdog0 {
>> + clocks = <&clk250>;
>> +};
>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
>> new file mode 100644
>> index 000000000000..01f5f95806d3
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
>> @@ -0,0 +1,298 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * dts file for Xilinx ZynqMP ZCU100 revC
>> + *
>> + * (C) Copyright 2016 - 2018, Xilinx, Inc.
>> + *
>> + * Michal Simek <michal.simek@xxxxxxxxxx>
>> + * Nathalie Chan King Choy <nathalie@xxxxxxxxxx>
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "zynqmp.dtsi"
>> +#include "zynqmp-clk.dtsi"
>> +#include <dt-bindings/input/input.h>
>> +#include <dt-bindings/interrupt-controller/irq.h>
>> +#include <dt-bindings/gpio/gpio.h>
>> +
>> +/ {
>> + model = "ZynqMP ZCU100 RevC";
>> + compatible = "xlnx,zynqmp-zcu100-revC", "xlnx,zynqmp-zcu100", "xlnx,zynqmp";
>
> Documented?
>
>> +
>> + aliases {
>> + gpio0 = &gpio;
>
> Drop this.
>
>> + i2c0 = &i2c1;
>> + rtc0 = &rtc;
>
> Is there more than one?

In programmable logic logic there can be plenty of them.

>
>> + serial0 = &uart1;
>> + serial1 = &uart0;
>> + serial2 = &dcc;
>> + spi0 = &spi0;
>> + spi1 = &spi1;
>
>> + usb0 = &usb0;
>> + usb1 = &usb1;
>
> Drop these.
>
>> + mmc0 = &sdhci0;
>> + mmc1 = &sdhci1;
>> + };
>> +
>> + chosen {
>> + bootargs = "earlycon";
>> + stdout-path = "serial0:115200n8";
>> + };
>> +
>> + memory@0 {
>> + device_type = "memory";
>> + reg = <0x0 0x0 0x0 0x80000000>;
>> + };
>> +
>> + gpio-keys {
>> + compatible = "gpio-keys";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + autorepeat;
>> + sw4 {
>> + label = "sw4";
>> + gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
>> + linux,code = <KEY_POWER>;
>> + gpio-key,wakeup;
>> + autorepeat;
>> + };
>> + };
>> +
>> + leds {
>> + compatible = "gpio-leds";
>> + ds2 {
>> + label = "ds2";
>> + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + ds3 {
>> + label = "ds3";
>> + gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "phy0tx"; /* WLAN tx */
>> + default-state = "off";
>> + };
>> +
>> + ds4 {
>> + label = "ds4";
>> + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "phy0rx"; /* WLAN rx */
>> + default-state = "off";
>> + };
>> +
>> + ds5 {
>> + label = "ds5";
>> + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "bluetooth-power";
>> + };
>> +
>> + vbus_det { /* U5 USB5744 VBUS detection via MIO25 */
>> + label = "vbus_det";
>> + gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
>> + default-state = "on";
>> + };
>> +
>> + bt_power {
>> + label = "bt_power";
>> + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
>> + default-state = "on";
>> + };
>> + };
>> +
>> + wmmcsdio_fixed: fixedregulator-mmcsdio {
>> + compatible = "regulator-fixed";
>> + regulator-name = "wmmcsdio_fixed";
>> + regulator-min-microvolt = <3300000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-always-on;
>> + regulator-boot-on;
>> + };
>> +
>> + sdio_pwrseq: sdio_pwrseq {
>> + compatible = "mmc-pwrseq-simple";
>> + reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
>> + };
>> +};
>> +
>> +&dcc {
>> + status = "okay";
>> +};
>> +
>> +&gpio {
>> + status = "okay";
>> + gpio-line-names = "UART1_TX", "UART1_RX", "UART0_RX", "UART0_TX", "I2C1_SCL",
>> + "I2C1_SDA", "SPI1_SCLK", "WLAN_EN", "BT_EN", "SPI1_CS",
>> + "SPI1_MISO", "SPI1_MOSI", "I2C_MUX_RESET", "SD0_DAT0", "SD0_DAT1",
>> + "SD0_DAT2", "SD0_DAT3", "PS_LED3", "PS_LED2", "PS_LED1",
>> + "PS_LED0", "SD0_CMD", "SD0_CLK", "GPIO_PB", "SD0_DETECT",
>> + "VBUS_DET", "POWER_INT", "DP_AUX", "DP_HPD", "DP_OE",
>> + "DP_AUX_IN", "INA226_ALERT", "PS_FP_PWR_EN", "PL_PWR_EN", "POWER_KILL",
>> + "", "GPIO-A", "GPIO-B", "SPI0_SCLK", "GPIO-C",
>> + "GPIO-D", "SPI0_CS", "SPI0_MISO", "SPI_MOSI", "GPIO-E",
>> + "GPIO-F", "SD1_D0", "SD1_D1", "SD1_D2", "SD1_D3",
>> + "SD1_CMD", "SD1_CLK", "USB0_CLK", "USB0_DIR", "USB0_DATA2",
>> + "USB0_NXT", "USB0_DATA0", "USB0_DATA1", "USB0_STP", "USB0_DATA3",
>> + "USB0_DATA4", "USB0_DATA5", "USB0_DATA6", "USB0_DATA7", "USB1_CLK",
>> + "USB1_DIR", "USB1_DATA2", "USB1_NXT", "USB1_DATA0", "USB1_DATA1",
>> + "USB1_STP", "USB1_DATA3", "USB1_DATA4", "USB1_DATA5", "USB1_DATA6",
>> + "USB_DATA7", "WLAN_IRQ", "PMIC_IRQ", /* MIO end and EMIO start */
>> + "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "", "", "", "", "", "", "",
>> + "", "", "", "";
>> +};
>> +
>> +&i2c1 {
>> + status = "okay";
>> + clock-frequency = <100000>;
>> + i2cswitch@75 { /* u11 */
>
> i2c-mux@75
>
>> + compatible = "nxp,pca9548";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + reg = <0x75>;
>> + i2csw_0: i2c@0 { /* i2c mw 75 0 1 */
>
> Linux commands for comments aren't relevant to dts files.

I was removing this from others and forget this one.
Just a note: It is u-boot command.

>
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + reg = <0>;
>> + /*
>> + * LSEXP_I2C0
>
> Is this a 96boards design? If so, using "label" and with defined names
> is somewhat standard for defining low speed connector ports (and for
> LEDs). That should also remove any need for using aliases for I2C and
> SPI. Look at hikey or db410c.

i2c, spi is easy
label = "HS-I2C2";

leds are also fine and fixed.

serial labeling depends on configuration. It means serial0 can be
LS-UART0 or 1 or PL based uart can be connected there.

Thanks,
Michal

Next message: Rob Herring: "[GIT PULL] DeviceTree updates for 4.16"
Previous message: Ozan Alpay: "clang warning: implicit conversion in intel_ddi.c:1481"
In reply to: Rob Herring: "Re: [PATCH 1/7] arm64: zynqmp: Add support for Xilinx zcu100-revC"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]