github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Samsung DTS ARM changes for v5.19

Browse Source 
1. Several DT schema related changes to make DTBs passing schema checks:
    EHCI/OHCI/DMA/Ethernet node names, DMA channels order, USB-like
    compatibles.
 2. Add specific compatibles to Multi Core Timer to allow stricter DT
    schema matching.
 3. Cleanup from deprecated bindings:
    - Remove deprecated unit-address workaround for Exynos5422 Odroid XU3
      LPDDR3 memory timings.
    - Do not use unit-address (and SFR region) in Exynos5250 MIPI phy in
      favor of syscon node (unit-address deprecated in 2016).
    - Use standard generic PHYs for EHCI/OHCI device in S5PV210.
 4. Fix inverted SPI CS (thus blank panel) on S5PV210 Aries boards.
 5. Correct Bluetooth interupt name on S5PV210 Aries boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmJfs4gQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD15K5D/92dMu346ZcJ4UFiL67VnaAjIZ3/1m/tOjG
 wua3Gl7KWWv4fLFXBH5Q+HZrGLuvFzXmIbLyA66xDJIg3wDCmoCUwXDRbeEVAxn8
 msNNzMMz5yV6O0SKuoiWOY1fHZZM/Gje3aQCJP3sZuQfhmrNYs1MopVmstXwCRTl
 85dSMF6MescQzdIgF1H59U+Bq1jWRTzoI5Wq8aBLYbcMfjFtUtGtKWMradiC8lHa
 Bm0f9cAc3YLUYYqHN+E8UG7HzQUI0g7ERC7huD/JAUoBnXaMXt6yY8MQOLrwl/fr
 sgTrl2WO27qClmac3cCQvAGEaQ73dkm8eEk63vNoqwLAQ5C79kiN/YWdmSfdRA1X
 qD1SY7iruUT3vcb2LtUOhU/dasyxW4RwUSvGTEwBZd3dCvxr0Gh+OEG6F8si/9tC
 t5r/BaLmIaysxD4u/lL9v+mThmxX+r+4gleQ/bz23vb1DY0mFjLSqLZ4GTdvbcZB
 lcnCLYj7ebm4ncMZpTqQfALDfXOCWntySGDBBuXBAmDJALn6Nt9VERV6szRVFlLk
 homZDZbmGTfl2WOKsP954F3WToCKHuifhEpICxZhXoiWkjYJhy9oDI/DEq/JZz1j
 dflcq+uQrwlb+BIROUhvsxydi7JBYhQwmYqHMZd7dQSmG5QeWrNaUA5IjXSQClDu
 CPHdRsDUzw==
 =DEWZ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJhc8kACgkQmmx57+YA
 GNl6TxAAk7VIRDezULNWEwEbe22FF79WBLxYaUfx5pp+ZvIWLOeNayChiCypwcO6
 DGTtNZFRAUyeU/2RD4kLUH1FLjmdmsiu0nA2dOKoM829wofd+fVC46ZgBJbdLM+V
 +AXUGLLlbKZekUoGt+EP56pgtdB64hlT4AyOiDJ7CXT78I4M+C1rL4N9ux4X3dLT
 b6NQhBxltEPtdZOJ/xi1SeDUwf9hhhHbL5XuUbXVRkXa4aUq/SNrr+4pBVNBNlOk
 2/2Bv87LYBw5Y2LvqVBvL2vAXrq9piM81Pz5nphbFPOCeaCDdBEH5Ig3ghzaAXfs
 gRIjebqOpaDctNG4FE+ZSISbZY9rd1x1RM6s3utpQjF+fNb7gfbN65TGGQCGna0g
 moOS4YIcexLN6tYR6hiT1lqbrqJKQSbm/Jw6n1Ln7cpEGwgyaYLXKuNoH9Wee9A1
 OBXxuq7JdfOfx0ja/mJ+6zN412ZDH2FF/WqbIHtBgxtjP7vbwp1jj8rI8UX1nUsm
 u9ZhSUNYFC1u3lChFJKEkR4v5ZXAmOaLGGJmpxVPjUOsiqv37KPN46PX9wLoTu6C
 H+3+fCFdPhDXlaE3rDGlwFiT0fIYoE2YS/X9rUhDjQk1lNjQqK3+rCPQ3U9KqpY0
 G0OTz5CrhGkqchhaVLYTMN/XcaK7TLo6ZdvQAViZ419TnZNDls8=
 =P83E
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.19

1. Several DT schema related changes to make DTBs passing schema checks:
   EHCI/OHCI/DMA/Ethernet node names, DMA channels order, USB-like
   compatibles.
2. Add specific compatibles to Multi Core Timer to allow stricter DT
   schema matching.
3. Cleanup from deprecated bindings:
   - Remove deprecated unit-address workaround for Exynos5422 Odroid XU3
     LPDDR3 memory timings.
   - Do not use unit-address (and SFR region) in Exynos5250 MIPI phy in
     favor of syscon node (unit-address deprecated in 2016).
   - Use standard generic PHYs for EHCI/OHCI device in S5PV210.
4. Fix inverted SPI CS (thus blank panel) on S5PV210 Aries boards.
5. Correct Bluetooth interupt name on S5PV210 Aries boards.

* tag 'samsung-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5pv210: align DMA channels with dtschema
  ARM: dts: s5pv210: Adjust DMA node names to match spec
  ARM: dts: s5pv210: Adjust memory reg entries to match spec
  ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
  ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
  ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device
  ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema
  ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4
  ARM: dts: exynos: drop deprecated SFR region from MIPI phy
  ARM: dts: exynos: add a specific compatible to MCT
  ARM: dts: exynos: remove deprecated unit address for LPDDR3 timings on Odroid
  ARM: dts: exynos: fix compatible strings for Ethernet USB devices
  ARM: dts: exynos: fix ethernet node name for different odroid boards

Link: https://lore.kernel.org/r/20220420072152.11696-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-04-21 17:10:01 +02:00
commit 9423c823e5
15 changed files with 52 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/exynos3250.dtsi
View File

@ -269,7 +269,8 @@ gic: interrupt-controller@10481000 {
};
timer@10050000 {
compatible = "samsung,exynos4210-mct";
compatible = "samsung,exynos3250-mct",
"samsung,exynos4210-mct";
reg = <0x10050000 0x800>;
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,

4
arch/arm/boot/dts/exynos4.dtsi
View File

@ -373,7 +373,7 @@ hsotg: hsotg@12480000 {
status = "disabled";
};
ehci: ehci@12580000 {
ehci: usb@12580000 {
compatible = "samsung,exynos4210-ehci";
reg = <0x12580000 0x100>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@ -384,7 +384,7 @@ ehci: ehci@12580000 {
phy-names = "host", "hsic0", "hsic1";
};
ohci: ohci@12590000 {
ohci: usb@12590000 {
compatible = "samsung,exynos4210-ohci";
reg = <0x12590000 0x100>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

4
arch/arm/boot/dts/exynos4412-odroidu3.dts
View File

@ -119,8 +119,8 @@ &ehci {
phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
phy-names = "hsic0", "hsic1";
ethernet: usbether@2 {
compatible = "usb0424,9730";
ethernet: ethernet@2 {
compatible = "usb424,9730";
reg = <2>;
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
};

8
arch/arm/boot/dts/exynos4412-odroidx.dts
View File

@ -70,19 +70,19 @@ &ehci {
phy-names = "hsic0";
hub@2 {
compatible = "usb0424,3503";
compatible = "usb424,3503";
reg = <2>;
#address-cells = <1>;
#size-cells = <0>;
hub@1 {
compatible = "usb0424,9514";
compatible = "usb424,9514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@1 {
compatible = "usb0424,ec00";
ethernet: ethernet@1 {
compatible = "usb424,ec00";
reg = <1>;
/* Filled in by a bootloader */
local-mac-address = [00 00 00 00 00 00];

8
arch/arm/boot/dts/exynos5250.dtsi
View File

@ -245,7 +245,8 @@ clock_audss: audss-clock-controller@3810000 {
};
timer@101c0000 {
compatible = "samsung,exynos4210-mct";
compatible = "samsung,exynos5250-mct",
"samsung,exynos4210-mct";
reg = <0x101C0000 0x800>;
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
clock-names = "fin_pll", "mct";
@ -817,15 +818,14 @@ mixer: mixer@14450000 {
status = "disabled";
};
dp_phy: video-phy {
dp_phy: video-phy-0 {
compatible = "samsung,exynos5250-dp-video-phy";
samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <0>;
};
mipi_phy: video-phy@10040710 {
mipi_phy: video-phy-1 {
compatible = "samsung,s5pv210-mipi-video-phy";
reg = <0x10040710 0x100>;
#phy-cells = <1>;
syscon = <&pmu_system_controller>;
};

3
arch/arm/boot/dts/exynos5260.dtsi
View File

@ -333,7 +333,8 @@ chipid: chipid@10000000 {
};
mct: timer@100b0000 {
compatible = "samsung,exynos4210-mct";
compatible = "samsung,exynos5260-mct",
"samsung,exynos4210-mct";
reg = <0x100B0000 0x1000>;
clocks = <&fin_pll>, <&clock_peri PERI_CLK_MCT>;
clock-names = "fin_pll", "mct";

4
arch/arm/boot/dts/exynos5410-odroidxu.dts
View File

@ -655,8 +655,8 @@ &usbhost2 {
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@2 {
compatible = "usb0424,9730";
ethernet: ethernet@2 {
compatible = "usb424,9730";
reg = <2>;
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
};

7
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
View File

@ -333,8 +333,6 @@ samsung_K3QF2F20DB: lpddr3 {
compatible = "samsung,K3QF2F20DB", "jedec,lpddr3";
density = <16384>;
io-width = <32>;
#address-cells = <1>;
#size-cells = <0>;
tRFC-min-tck = <17>;
tRRD-min-tck = <2>;
@ -358,10 +356,9 @@ samsung_K3QF2F20DB: lpddr3 {
tCKESR-min-tck = <2>;
tMRD-min-tck = <5>;
timings_samsung_K3QF2F20DB_800mhz: timings@800000000 {
timings_samsung_K3QF2F20DB_800mhz: timings {
compatible = "jedec,lpddr3-timings";
/* workaround: 'reg' shows max-freq */
reg = <800000000>;
max-freq = <800000000>;
min-freq = <100000000>;
tRFC = <65000>;
tRRD = <6000>;

6
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
View File

@ -113,13 +113,13 @@ &usbhost2 {
#size-cells = <0>;
hub@1 {
compatible = "usb0424,9514";
compatible = "usb424,9514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@1 {
compatible = "usb0424,ec00";
ethernet: ethernet@1 {
compatible = "usb424,ec00";
reg = <1>;
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
};

6
arch/arm/boot/dts/exynos5422-odroidxu3.dts
View File

@ -80,13 +80,13 @@ &usbhost2 {
#size-cells = <0>;
hub@1 {
compatible = "usb0424,9514";
compatible = "usb424,9514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@1 {
compatible = "usb0424,ec00";
ethernet: ethernet@1 {
compatible = "usb424,ec00";
reg = <1>;
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
};

3
arch/arm/boot/dts/exynos54xx.dtsi
View File

@ -74,7 +74,8 @@ smp-sram@53000 {
};
mct: timer@101c0000 {
compatible = "samsung,exynos4210-mct";
compatible = "samsung,exynos5420-mct",
"samsung,exynos4210-mct";
reg = <0x101c0000 0xb00>;
interrupts-extended = <&combiner 23 3>,
<&combiner 23 4>,

3
arch/arm/boot/dts/s5pv210-aquila.dts
View File

@ -29,8 +29,7 @@ chosen {
memory@30000000 {
device_type = "memory";
reg = <0x30000000 0x05000000
0x40000000 0x18000000>;
reg = <0x30000000 0x05000000>, <0x40000000 0x18000000>;
};
pmic_ap_clk: clock-0 {

11
arch/arm/boot/dts/s5pv210-aries.dtsi
View File

@ -24,9 +24,9 @@ aliases: aliases {
memory@30000000 {
device_type = "memory";
reg = <0x30000000 0x05000000
0x40000000 0x10000000
0x50000000 0x08000000>;
reg = <0x30000000 0x05000000>,
<0x40000000 0x10000000>,
<0x50000000 0x08000000>;
};
reserved-memory {
@ -564,7 +564,6 @@ panel@0 {
reset-gpios = <&mp05 5 GPIO_ACTIVE_LOW>;
vdd3-supply = <&ldo7_reg>;
vci-supply = <&ldo17_reg>;
spi-cs-high;
spi-max-frequency = <1200000>;
pinctrl-names = "default";
@ -636,7 +635,7 @@ touchscreen@4a {
};
&i2s0 {
dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
status = "okay";
};
@ -895,7 +894,7 @@ bluetooth {
device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;
interrupt-parent = <&gph2>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
interrupt-names = "host-wakeup";
};
};

6
arch/arm/boot/dts/s5pv210-goni.dts
View File

@ -30,9 +30,9 @@ chosen {
memory@30000000 {
device_type = "memory";
reg = <0x30000000 0x05000000
0x40000000 0x10000000
0x50000000 0x08000000>;
reg = <0x30000000 0x05000000>,
<0x40000000 0x10000000>,
<0x50000000 0x08000000>;
};
pmic_ap_clk: clock-0 {

40
arch/arm/boot/dts/s5pv210.dtsi
View File

@ -117,7 +117,7 @@ wakeup-interrupt-controller {
};
};
pdma0: dma@e0900000 {
pdma0: dma-controller@e0900000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xe0900000 0x1000>;
interrupt-parent = <&vic0>;
@ -129,7 +129,7 @@ pdma0: dma@e0900000 {
#dma-requests = <32>;
};
pdma1: dma@e0a00000 {
pdma1: dma-controller@e0a00000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xe0a00000 0x1000>;
interrupt-parent = <&vic0>;
@ -239,8 +239,8 @@ i2s0: i2s@eee30000 {
reg = <0xeee30000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <16>;
dma-names = "rx", "tx", "tx-sec";
dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
dma-names = "tx", "rx", "tx-sec";
dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
clock-names = "iis",
"i2s_opclk0",
"i2s_opclk1";
@ -259,8 +259,8 @@ i2s1: i2s@e2100000 {
reg = <0xe2100000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <17>;
dma-names = "rx", "tx";
dmas = <&pdma1 12>, <&pdma1 13>;
dma-names = "tx", "rx";
dmas = <&pdma1 13>, <&pdma1 12>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
pinctrl-names = "default";
@ -274,8 +274,8 @@ i2s2: i2s@e2a00000 {
reg = <0xe2a00000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <18>;
dma-names = "rx", "tx";
dmas = <&pdma1 14>, <&pdma1 15>;
dma-names = "tx", "rx";
dmas = <&pdma1 15>, <&pdma1 14>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
pinctrl-names = "default";
@ -427,38 +427,28 @@ usbphy: usbphy@ec100000 {
status = "disabled";
};
ehci: ehci@ec200000 {
ehci: usb@ec200000 {
compatible = "samsung,exynos4210-ehci";
reg = <0xec200000 0x100>;
interrupts = <23>;
interrupt-parent = <&vic1>;
clocks = <&clocks CLK_USB_HOST>;
clock-names = "usbhost";
#address-cells = <1>;
#size-cells = <0>;
phys = <&usbphy 1>;
phy-names = "host";
status = "disabled";
port@0 {
reg = <0>;
phys = <&usbphy 1>;
};
};
ohci: ohci@ec300000 {
ohci: usb@ec300000 {
compatible = "samsung,exynos4210-ohci";
reg = <0xec300000 0x100>;
interrupts = <23>;
interrupt-parent = <&vic1>;
clocks = <&clocks CLK_USB_HOST>;
clock-names = "usbhost";
#address-cells = <1>;
#size-cells = <0>;
phys = <&usbphy 1>;
phy-names = "host";
status = "disabled";
port@0 {
reg = <0>;
phys = <&usbphy 1>;
};
};
mfc: codec@f1700000 {
@ -528,7 +518,7 @@ g2d: g2d@fa000000 {
clock-names = "sclk_fimg2d", "fimg2d";
};
mdma1: mdma@fa200000 {
mdma1: dma-controller@fa200000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xfa200000 0x1000>;
interrupt-parent = <&vic0>;