Skip to content

Commit ae6e459

Browse files
arndbarndb
committed
Merge tag 'omap-for-v5.6/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Few more fixes for omaps Just few dts fixes: - A fix droid4 touchscreen stopping working with lost gpio interrupts - Also limit omap5 dma range similar to what we've recently done for dra7 * tag 'omap-for-v5.6/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap5: Add bus_dma_limit for L3 bus ARM: dts: omap4-droid4: Fix lost touchscreen interrupts ARM: dts: dra7: Add bus_dma_limit for L3 bus ARM: dts: N900: fix onenand timings ARM: dts: Fix dm814x Ethernet by changing to use rgmii-id mode Link: https://lore.kernel.org/r/pull-1584575254-461940@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 05ff1e3 + dfa7ea3 commit ae6e459

8 files changed

Lines changed: 39 additions & 24 deletions

File tree

‎arch/arm/boot/dts/dm8148-evm.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
&cpsw_emac0 {
2626
phy-handle = <&ethphy0>;
27-
phy-mode = "rgmii";
27+
phy-mode = "rgmii-id";
2828
};
2929

3030
&cpsw_emac1 {
3131
phy-handle = <&ethphy1>;
32-
phy-mode = "rgmii";
32+
phy-mode = "rgmii-id";
3333
};
3434

3535
&davinci_mdio {

‎arch/arm/boot/dts/dm8148-t410.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333

3434
&cpsw_emac0 {
3535
phy-handle = <&ethphy0>;
36-
phy-mode = "rgmii";
36+
phy-mode = "rgmii-id";
3737
};
3838

3939
&cpsw_emac1 {
4040
phy-handle = <&ethphy1>;
41-
phy-mode = "rgmii";
41+
phy-mode = "rgmii-id";
4242
};
4343

4444
&davinci_mdio {

‎arch/arm/boot/dts/dra62x-j5eco-evm.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
&cpsw_emac0 {
2626
phy-handle = <&ethphy0>;
27-
phy-mode = "rgmii";
27+
phy-mode = "rgmii-id";
2828
};
2929

3030
&cpsw_emac1 {
3131
phy-handle = <&ethphy1>;
32-
phy-mode = "rgmii";
32+
phy-mode = "rgmii-id";
3333
};
3434

3535
&davinci_mdio {

‎arch/arm/boot/dts/dra7.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
#address-cells = <1>;
149149
#size-cells = <1>;
150150
ranges = <0x0 0x0 0x0 0xc0000000>;
151+
dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
151152
ti,hwmods = "l3_main_1", "l3_main_2";
152153
reg = <0x0 0x44000000 0x0 0x1000000>,
153154
<0x0 0x45000000 0x0 0x1000>;

‎arch/arm/boot/dts/motorola-mapphone-common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */
430430

431431
/* gpio_183 with sys_nirq2 pad as wakeup */
432-
interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>,
432+
interrupts-extended = <&gpio6 23 IRQ_TYPE_LEVEL_LOW>,
433433
<&omap4_pmx_core 0x160>;
434434
interrupt-names = "irq", "wakeup";
435435
wakeup-source;

‎arch/arm/boot/dts/omap3-n900.dts‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -854,34 +854,46 @@
854854
compatible = "ti,omap2-onenand";
855855
reg = <0 0 0x20000>; /* CS0, offset 0, IO size 128K */
856856

857+
/*
858+
* These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported
859+
* bootloader set values when booted with v5.1
860+
* (OneNAND Manufacturer: Samsung):
861+
*
862+
* cs0 GPMC_CS_CONFIG1: 0xfb001202
863+
* cs0 GPMC_CS_CONFIG2: 0x00111100
864+
* cs0 GPMC_CS_CONFIG3: 0x00020200
865+
* cs0 GPMC_CS_CONFIG4: 0x11001102
866+
* cs0 GPMC_CS_CONFIG5: 0x03101616
867+
* cs0 GPMC_CS_CONFIG6: 0x90060000
868+
*/
857869
gpmc,sync-read;
858870
gpmc,sync-write;
859871
gpmc,burst-length = <16>;
860872
gpmc,burst-read;
861873
gpmc,burst-wrap;
862874
gpmc,burst-write;
863-
gpmc,device-width = <2>; /* GPMC_DEVWIDTH_16BIT */
864-
gpmc,mux-add-data = <2>; /* GPMC_MUX_AD */
875+
gpmc,device-width = <2>;
876+
gpmc,mux-add-data = <2>;
865877
gpmc,cs-on-ns = <0>;
866-
gpmc,cs-rd-off-ns = <87>;
867-
gpmc,cs-wr-off-ns = <87>;
878+
gpmc,cs-rd-off-ns = <102>;
879+
gpmc,cs-wr-off-ns = <102>;
868880
gpmc,adv-on-ns = <0>;
869-
gpmc,adv-rd-off-ns = <10>;
870-
gpmc,adv-wr-off-ns = <10>;
871-
gpmc,oe-on-ns = <15>;
872-
gpmc,oe-off-ns = <87>;
881+
gpmc,adv-rd-off-ns = <12>;
882+
gpmc,adv-wr-off-ns = <12>;
883+
gpmc,oe-on-ns = <12>;
884+
gpmc,oe-off-ns = <102>;
873885
gpmc,we-on-ns = <0>;
874-
gpmc,we-off-ns = <87>;
875-
gpmc,rd-cycle-ns = <112>;
876-
gpmc,wr-cycle-ns = <112>;
877-
gpmc,access-ns = <81>;
878-
gpmc,page-burst-access-ns = <15>;
886+
gpmc,we-off-ns = <102>;
887+
gpmc,rd-cycle-ns = <132>;
888+
gpmc,wr-cycle-ns = <132>;
889+
gpmc,access-ns = <96>;
890+
gpmc,page-burst-access-ns = <18>;
879891
gpmc,bus-turnaround-ns = <0>;
880892
gpmc,cycle2cycle-delay-ns = <0>;
881893
gpmc,wait-monitoring-ns = <0>;
882-
gpmc,clk-activation-ns = <5>;
883-
gpmc,wr-data-mux-bus-ns = <30>;
884-
gpmc,wr-access-ns = <81>;
894+
gpmc,clk-activation-ns = <6>;
895+
gpmc,wr-data-mux-bus-ns = <36>;
896+
gpmc,wr-access-ns = <96>;
885897
gpmc,sync-clk-ps = <15000>;
886898

887899
/*

‎arch/arm/boot/dts/omap5.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
#address-cells = <1>;
144144
#size-cells = <1>;
145145
ranges = <0 0 0 0xc0000000>;
146+
dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
146147
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
147148
reg = <0 0x44000000 0 0x2000>,
148149
<0 0x44800000 0 0x3000>,

‎drivers/bus/ti-sysc.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
12661266
SYSC_QUIRK("gpu", 0x50000000, 0x14, -1, -1, 0x00010201, 0xffffffff, 0),
12671267
SYSC_QUIRK("gpu", 0x50000000, 0xfe00, 0xfe10, -1, 0x40000000 , 0xffffffff,
12681268
SYSC_MODULE_QUIRK_SGX),
1269+
SYSC_QUIRK("lcdc", 0, 0, 0x54, -1, 0x4f201000, 0xffffffff,
1270+
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
12691271
SYSC_QUIRK("usb_otg_hs", 0, 0x400, 0x404, 0x408, 0x00000050,
12701272
0xffffffff, SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),
12711273
SYSC_QUIRK("usb_otg_hs", 0, 0, 0x10, -1, 0x4ea2080d, 0xffffffff,
@@ -1294,7 +1296,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
12941296
SYSC_QUIRK("gpu", 0, 0xfe00, 0xfe10, -1, 0x40000000 , 0xffffffff, 0),
12951297
SYSC_QUIRK("hsi", 0, 0, 0x10, 0x14, 0x50043101, 0xffffffff, 0),
12961298
SYSC_QUIRK("iss", 0, 0, 0x10, -1, 0x40000101, 0xffffffff, 0),
1297-
SYSC_QUIRK("lcdc", 0, 0, 0x54, -1, 0x4f201000, 0xffffffff, 0),
12981299
SYSC_QUIRK("mcasp", 0, 0, 0x4, -1, 0x44306302, 0xffffffff, 0),
12991300
SYSC_QUIRK("mcasp", 0, 0, 0x4, -1, 0x44307b02, 0xffffffff, 0),
13001301
SYSC_QUIRK("mcbsp", 0, -1, 0x8c, -1, 0, 0, 0),

0 commit comments

Comments
 (0)