Merge tag 'arm-soc/for-5.18/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom ARM64-based SoCs Device Tree updates for 5.18, please pull the following: - Krzysztof aligns the PL330 DMA controller node name to the schema - Rafal corrects the TWD (Timer/Watchdog) block, adds the watchdog node, I2C controller node and the pinctrl node for the 4908 SoC - Kuldeep fixes the Northstar 2 SPI properties as well as the PL022 SPI controller clock names - Frank fixes the SATA node names to conform to the AHCI controller schema * tag 'arm-soc/for-5.18/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: stingray: Fix spi clock name arm64: dts: ns2: Fix spi clock name arm64: dts: broadcom: Fix sata nodename arm64: dts: ns2: Fix spi-cpol and spi-cpha property arm64: dts: broadcom: bcm4908: add I2C block arm64: dts: broadcom: bcm4908: add watchdog block arm64: dts: broadcom: bcm4908: add pinctrl binding arm64: dts: broadcom: bcm4908: use proper TWD binding arm64: dts: broadcom: align pl330 node name with dtschema Link: https://lore.kernel.org/r/20220307194817.3754107-3-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
@@ -273,9 +273,18 @@
|
||||
#size-cells = <1>;
|
||||
ranges = <0x00 0x00 0xff800000 0x3000>;
|
||||
|
||||
timer: timer@400 {
|
||||
compatible = "brcm,bcm6328-timer", "syscon";
|
||||
reg = <0x400 0x3c>;
|
||||
twd: timer-mfd@400 {
|
||||
compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon";
|
||||
reg = <0x400 0x4c>;
|
||||
ranges = <0x0 0x400 0x4c>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
watchdog@28 {
|
||||
compatible = "brcm,bcm6345-wdt";
|
||||
reg = <0x28 0x8>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio0: gpio-controller@500 {
|
||||
@@ -287,6 +296,141 @@
|
||||
gpio-controller;
|
||||
};
|
||||
|
||||
pinctrl@560 {
|
||||
compatible = "brcm,bcm4908-pinctrl";
|
||||
reg = <0x560 0x10>;
|
||||
|
||||
pins_led_0_a: led_0-a-pins {
|
||||
function = "led_0";
|
||||
groups = "led_0_grp_a";
|
||||
};
|
||||
|
||||
pins_led_1_a: led_1-a-pins {
|
||||
function = "led_1";
|
||||
groups = "led_1_grp_a";
|
||||
};
|
||||
|
||||
pins_led_2_a: led_2-a-pins {
|
||||
function = "led_2";
|
||||
groups = "led_2_grp_a";
|
||||
};
|
||||
|
||||
pins_led_3_a: led_3-a-pins {
|
||||
function = "led_3";
|
||||
groups = "led_3_grp_a";
|
||||
};
|
||||
|
||||
pins_led_4_a: led_4-a-pins {
|
||||
function = "led_4";
|
||||
groups = "led_4_grp_a";
|
||||
};
|
||||
|
||||
pins_led_5_a: led_5-a-pins {
|
||||
function = "led_5";
|
||||
groups = "led_5_grp_a";
|
||||
};
|
||||
|
||||
pins_led_6_a: led_6-a-pins {
|
||||
function = "led_6";
|
||||
groups = "led_6_grp_a";
|
||||
};
|
||||
|
||||
pins_led_7_a: led_7-a-pins {
|
||||
function = "led_7";
|
||||
groups = "led_7_grp_a";
|
||||
};
|
||||
|
||||
pins_led_8_a: led_8-a-pins {
|
||||
function = "led_8";
|
||||
groups = "led_8_grp_a";
|
||||
};
|
||||
|
||||
pins_led_9_a: led_9-a-pins {
|
||||
function = "led_9";
|
||||
groups = "led_9_grp_a";
|
||||
};
|
||||
|
||||
pins_led_21_a: led_21-a-pins {
|
||||
function = "led_21";
|
||||
groups = "led_21_grp_a";
|
||||
};
|
||||
|
||||
pins_led_22_a: led_22-a-pins {
|
||||
function = "led_22";
|
||||
groups = "led_22_grp_a";
|
||||
};
|
||||
|
||||
pins_led_26_a: led_26-a-pins {
|
||||
function = "led_26";
|
||||
groups = "led_26_grp_a";
|
||||
};
|
||||
|
||||
pins_led_27_a: led_27-a-pins {
|
||||
function = "led_27";
|
||||
groups = "led_27_grp_a";
|
||||
};
|
||||
|
||||
pins_led_28_a: led_28-a-pins {
|
||||
function = "led_28";
|
||||
groups = "led_28_grp_a";
|
||||
};
|
||||
|
||||
pins_led_29_a: led_29-a-pins {
|
||||
function = "led_29";
|
||||
groups = "led_29_grp_a";
|
||||
};
|
||||
|
||||
pins_led_30_a: led_30-a-pins {
|
||||
function = "led_30";
|
||||
groups = "led_30_grp_a";
|
||||
};
|
||||
|
||||
pins_hs_uart: hs_uart-pins {
|
||||
function = "hs_uart";
|
||||
groups = "hs_uart_grp";
|
||||
};
|
||||
|
||||
pins_i2c_a: i2c-a-pins {
|
||||
function = "i2c";
|
||||
groups = "i2c_grp_a";
|
||||
};
|
||||
|
||||
pins_i2c_b: i2c-b-pins {
|
||||
function = "i2c";
|
||||
groups = "i2c_grp_b";
|
||||
};
|
||||
|
||||
pins_i2s: i2s-pins {
|
||||
function = "i2s";
|
||||
groups = "i2s_grp";
|
||||
};
|
||||
|
||||
pins_nand_ctrl: nand_ctrl-pins {
|
||||
function = "nand_ctrl";
|
||||
groups = "nand_ctrl_grp";
|
||||
};
|
||||
|
||||
pins_nand_data: nand_data-pins {
|
||||
function = "nand_data";
|
||||
groups = "nand_data_grp";
|
||||
};
|
||||
|
||||
pins_emmc_ctrl: emmc_ctrl-pins {
|
||||
function = "emmc_ctrl";
|
||||
groups = "emmc_ctrl_grp";
|
||||
};
|
||||
|
||||
pins_usb0_pwr: usb0_pwr-pins {
|
||||
function = "usb0_pwr";
|
||||
groups = "usb0_pwr_grp";
|
||||
};
|
||||
|
||||
pins_usb1_pwr: usb1_pwr-pins {
|
||||
function = "usb1_pwr";
|
||||
groups = "usb1_pwr_grp";
|
||||
};
|
||||
};
|
||||
|
||||
uart0: serial@640 {
|
||||
compatible = "brcm,bcm6345-uart";
|
||||
reg = <0x640 0x18>;
|
||||
@@ -312,6 +456,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
i2c@2100 {
|
||||
compatible = "brcm,brcmper-i2c";
|
||||
reg = <0x2100 0x58>;
|
||||
clock-frequency = <97500>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pins_i2c_a>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
misc@2600 {
|
||||
compatible = "brcm,misc", "simple-mfd";
|
||||
reg = <0x2600 0xe4>;
|
||||
@@ -330,7 +483,7 @@
|
||||
|
||||
reboot {
|
||||
compatible = "syscon-reboot";
|
||||
regmap = <&timer>;
|
||||
regmap = <&twd>;
|
||||
offset = <0x34>;
|
||||
mask = <1>;
|
||||
};
|
||||
|
||||
@@ -111,8 +111,8 @@
|
||||
compatible = "silabs,si3226x";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <5000000>;
|
||||
spi-cpha = <1>;
|
||||
spi-cpol = <1>;
|
||||
spi-cpha;
|
||||
spi-cpol;
|
||||
pl022,hierarchy = <0>;
|
||||
pl022,interface = <0>;
|
||||
pl022,slave-tx-disable = <0>;
|
||||
@@ -135,8 +135,8 @@
|
||||
at25,byte-len = <0x8000>;
|
||||
at25,addr-mode = <2>;
|
||||
at25,page-size = <64>;
|
||||
spi-cpha = <1>;
|
||||
spi-cpol = <1>;
|
||||
spi-cpha;
|
||||
spi-cpol;
|
||||
pl022,hierarchy = <0>;
|
||||
pl022,interface = <0>;
|
||||
pl022,slave-tx-disable = <0>;
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
mboxes = <&pdc3 0>;
|
||||
};
|
||||
|
||||
dma0: dma@61360000 {
|
||||
dma0: dma-controller@61360000 {
|
||||
compatible = "arm,pl330", "arm,primecell";
|
||||
reg = <0x61360000 0x1000>;
|
||||
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@@ -644,7 +644,7 @@
|
||||
reg = <0x66180000 0x1000>;
|
||||
interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&iprocslow>, <&iprocslow>;
|
||||
clock-names = "spiclk", "apb_pclk";
|
||||
clock-names = "sspclk", "apb_pclk";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
status = "disabled";
|
||||
@@ -655,7 +655,7 @@
|
||||
reg = <0x66190000 0x1000>;
|
||||
interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&iprocslow>, <&iprocslow>;
|
||||
clock-names = "spiclk", "apb_pclk";
|
||||
clock-names = "sspclk", "apb_pclk";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
status = "disabled";
|
||||
@@ -687,7 +687,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
sata: ahci@663f2000 {
|
||||
sata: sata@663f2000 {
|
||||
compatible = "brcm,iproc-ahci", "generic-ahci";
|
||||
reg = <0x663f2000 0x1000>;
|
||||
dma-coherent;
|
||||
|
||||
@@ -519,7 +519,7 @@
|
||||
reg = <0x00180000 0x1000>;
|
||||
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&hsls_div2_clk>, <&hsls_div2_clk>;
|
||||
clock-names = "spiclk", "apb_pclk";
|
||||
clock-names = "sspclk", "apb_pclk";
|
||||
num-cs = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -531,7 +531,7 @@
|
||||
reg = <0x00190000 0x1000>;
|
||||
interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&hsls_div2_clk>, <&hsls_div2_clk>;
|
||||
clock-names = "spiclk", "apb_pclk";
|
||||
clock-names = "sspclk", "apb_pclk";
|
||||
num-cs = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -543,7 +543,7 @@
|
||||
reg = <0x00220000 0x28>;
|
||||
};
|
||||
|
||||
dma0: dma@310000 {
|
||||
dma0: dma-controller@310000 {
|
||||
compatible = "arm,pl330", "arm,primecell";
|
||||
reg = <0x00310000 0x1000>;
|
||||
interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
||||
Reference in New Issue
Block a user