Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: logicpd-torpedo: Add isp1763 support to baseboard

The baseboard has an ISP1763 USB controller acting as a host.
Since the pinmuxing for the corresponding IRQ is different
between OMAP35 and DM37, the pinmux has been placed in the
kit-level files, while the common code is placed into the
baseboard file.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Adam Ford and committed by
Tony Lindgren
e2d54fb6 6e8c8b50

+57 -1
+8
arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts
··· 11 11 model = "LogicPD Zoom OMAP35xx Torpedo Development Kit"; 12 12 compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3"; 13 13 }; 14 + 15 + &omap3_pmx_core { 16 + isp1763_pins: pinmux_isp1763_pins { 17 + pinctrl-single,pins = < 18 + OMAP3_CORE1_IOPAD(0x2154, PIN_INPUT_PULLUP | MUX_MODE4) /* sdmmc1_dat6.gpio_128 */ 19 + >; 20 + }; 21 + };
+9
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
··· 85 85 >; 86 86 }; 87 87 }; 88 + 89 + /* The gpio muxing between omap3530 and dm3730 is different for GPIO_128 */ 90 + &omap3_pmx_wkup { 91 + isp1763_pins: pinmux_isp1763_pins { 92 + pinctrl-single,pins = < 93 + OMAP3_WKUP_IOPAD(0x2a58, PIN_INPUT_PULLUP | MUX_MODE4) /* reserved.gpio_128 */ 94 + >; 95 + }; 96 + };
+40 -1
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
··· 93 93 94 94 &gpmc { 95 95 ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */ 96 - 1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */ 96 + 1 0 0x2c000000 0x1000000 /* CS1: 16MB for LAN9221 */ 97 + 6 0 0x28000000 0x1000000>; /* CS6: 16MB for ISP1763 */ 97 98 98 99 ethernet@gpmc { 99 100 pinctrl-names = "default"; ··· 102 101 interrupt-parent = <&gpio5>; 103 102 interrupts = <1 IRQ_TYPE_LEVEL_LOW>; /* gpio129 */ 104 103 reg = <1 0 0xff>; 104 + }; 105 + 106 + usb@6,0 { 107 + pinctrl-names = "default"; 108 + pinctrl-0 = <&isp1763_pins>; 109 + compatible = "nxp,usb-isp1763"; 110 + reg = <0x6 0x0 0xff>; 111 + interrupt-parent = <&gpio5>; 112 + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; 113 + interrupt-names = "host"; 114 + bus-width = <16>; 115 + dr_mode = "host"; 116 + gpmc,mux-add-data = <0>; 117 + gpmc,device-width = <2>; 118 + gpmc,wait-pin = <0>; 119 + gpmc,burst-length = <4>; 120 + gpmc,cycle2cycle-samecsen = <1>; 121 + gpmc,cycle2cycle-diffcsen = <1>; 122 + gpmc,cs-on-ns = <0>; 123 + gpmc,cs-rd-off-ns = <45>; 124 + gpmc,cs-wr-off-ns = <45>; 125 + gpmc,adv-on-ns = <0>; 126 + gpmc,adv-rd-off-ns = <0>; 127 + gpmc,adv-wr-off-ns = <0>; 128 + gpmc,oe-on-ns = <0>; 129 + gpmc,oe-off-ns = <45>; 130 + gpmc,we-on-ns = <0>; 131 + gpmc,we-off-ns = <25>; 132 + gpmc,rd-cycle-ns = <60>; 133 + gpmc,wr-cycle-ns = <45>; 134 + gpmc,access-ns = <35>; 135 + gpmc,page-burst-access-ns = <0>; 136 + gpmc,bus-turnaround-ns = <0>; 137 + gpmc,cycle2cycle-delay-ns = <60>; 138 + gpmc,wait-monitoring-ns = <0>; 139 + gpmc,clk-activation-ns = <0>; 140 + gpmc,wr-data-mux-bus-ns = <5>; 141 + gpmc,wr-access-ns = <20>; 105 142 }; 106 143 }; 107 144