mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'omap-for-v5.17/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Browse Source 
Devicetree changes for omaps for v5.17 merge window

These changes are mostly minor non-urgent fixes for typos and binding checks.
The system-power-controller gets configured for more am3 devices as it's not
am335x-boneblack speicif. For for am437x we add magnetic card reader support.

Note that the asahi-kasei,ak8975 binding changes may produce a new binding
check warning as the binding related change is merged separately.

* tag 'omap-for-v5.17/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x: Use correct vendor prefix for Asahi Kasei Corp.
  ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value
  ARM: dts: am437x-gp-evm: enable ADC1
  ARM: dts: am43xx: Describe the magnetic reader/ADC1 hardware module
  ARM: dts: am437x-cm-t43: Use a correctly spelled DT property
  ARM: dts: am335x-icev2: Add system-power-controller to RTC node
  ARM: dts: am335x-boneblack-common: move system-power-controller
  ARM: dts: elpida_ecb240abacn: Change Elpida compatible

Link: https://lore.kernel.org/r/pull-1639659798-679261@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-12-16 15:00:32 +01:00
parent 4a097f29fb fa0fdb78cb
commit 365ee80331
11 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/am335x-bone-common.dtsi
View File

@@ -399,6 +399,7 @@
&rtc {
clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
clock-names = "ext-clk", "int-clk";
system-power-controller;
};
&pruss_tm {

4
arch/arm/boot/dts/am335x-boneblack-common.dtsi
View File

@@ -22,10 +22,6 @@
non-removable;
};
&rtc {
system-power-controller;
};
/ {
memory@80000000 {
device_type = "memory";

2
arch/arm/boot/dts/am335x-boneblue.dts
View File

@@ -341,7 +341,7 @@
#address-cells = <1>;
#size-cells = <0>;
ax8975@c {
compatible = "ak,ak8975";
compatible = "asahi-kasei,ak8975";
reg = <0x0c>;
};
};

4
arch/arm/boot/dts/am335x-icev2.dts
View File

@@ -512,3 +512,7 @@
&pruss_tm {
status = "okay";
};
&rtc {
system-power-controller;
};

2
arch/arm/boot/dts/am335x-osd3358-sm-red.dts
View File

@@ -84,7 +84,7 @@
#address-cells = <1>;
#size-cells = <0>;
ax8975@c {
compatible = "ak,ak8975";
compatible = "asahi-kasei,ak8975";
reg = <0x0c>;
};
};

2
arch/arm/boot/dts/am437x-cm-t43.dts
View File

@@ -399,7 +399,7 @@
tsc {
ti,wires = <4>;
ti,x-plate-resistance = <200>;
ti,coordiante-readouts = <5>;
ti,coordinate-readouts = <5>;
ti,wire-config = <0x00 0x11 0x22 0x33>;
};

8
arch/arm/boot/dts/am437x-gp-evm.dts
View File

@@ -775,6 +775,14 @@
};
};
&magadc {
status = "okay";
adc {
ti,adc-channels = <0 1 2 3 4 5 6 7>;
};
};
&ecap0 {
status = "okay";
pinctrl-names = "default";

31
arch/arm/boot/dts/am437x-l4.dtsi
View File

@@ -2378,11 +2378,38 @@
};
target-module@4c000 { /* 0x4834c000, ap 114 72.0 */
compatible = "ti,sysc";
status = "disabled";
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x4c000 0x4>,
<0x4c010 0x4>;
reg-names = "rev", "sysc";
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
clocks = <&l3s_clkctrl AM4_L3S_ADC1_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x4c000 0x2000>;
magadc: magadc@0 {
compatible = "ti,am4372-magadc";
reg = <0x0 0x2000>;
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&adc_mag_fck>;
clock-names = "fck";
dmas = <&edma 54 0>, <&edma 55 0>;
dma-names = "fifo0", "fifo1";
status = "disabled";
mag {
compatible = "ti,am4372-mag";
};
adc {
#io-channel-cells = <1>;
compatible ="ti,am4372-adc";
};
};
};
target-module@80000 { /* 0x48380000, ap 123 42.0 */

7
arch/arm/boot/dts/am43xx-clocks.dtsi
View File

@@ -444,6 +444,13 @@
reg = <0x422c>;
};
adc_mag_fck: adc_mag_fck@424c {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&sys_clkin_ck>, <&dpll_per_m2_ck>;
reg = <0x424c>;
};
l3_gclk: l3_gclk {
#clock-cells = <0>;
compatible = "fixed-factor-clock";

2
arch/arm/boot/dts/elpida_ecb240abacn.dtsi
View File

@@ -5,7 +5,7 @@
/ {
elpida_ECB240ABACN: lpddr2 {
compatible = "Elpida,ECB240ABACN","jedec,lpddr2-s4";
compatible = "elpida,ECB240ABACN","jedec,lpddr2-s4";
density = <2048>;
io-width = <32>;

2
arch/arm/boot/dts/motorola-mapphone-common.dtsi
View File

@@ -310,7 +310,7 @@
#address-cells = <1>;
#size-cells = <0>;
wlcore: wlcore@2 {
compatible = "ti,wl1285", "ti,wl1283";
compatible = "ti,wl1285";
reg = <2>;
/* gpio_100 with gpmc_wait2 pad as wakeirq */
interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,