diff options
author | Robert Nelson <robertcnelson@gmail.com> | 2016-12-27 12:58:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-01-02 13:14:27 -0500 |
commit | 2876cc4a773c85dd3a3da3a28b1d4e9d99fb73c8 (patch) | |
tree | 59e867d16b63bf9b2e01704f61bdf38726fde6d4 | |
parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) |
ARM: dts: Move most of am335x-boneblack.dts to am335x-boneblack-common.dtsi
This is going to be shared with the BeagleBone Black Wireless
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/am335x-boneblack-common.dtsi | 163 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-boneblack.dts | 155 |
2 files changed, 164 insertions, 154 deletions
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi new file mode 100644 index 000000000000..325daae40278 --- /dev/null +++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi | |||
@@ -0,0 +1,163 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #include <dt-bindings/display/tda998x.h> | ||
10 | |||
11 | &ldo3_reg { | ||
12 | regulator-min-microvolt = <1800000>; | ||
13 | regulator-max-microvolt = <1800000>; | ||
14 | regulator-always-on; | ||
15 | }; | ||
16 | |||
17 | &mmc1 { | ||
18 | vmmc-supply = <&vmmcsd_fixed>; | ||
19 | }; | ||
20 | |||
21 | &mmc2 { | ||
22 | vmmc-supply = <&vmmcsd_fixed>; | ||
23 | pinctrl-names = "default"; | ||
24 | pinctrl-0 = <&emmc_pins>; | ||
25 | bus-width = <8>; | ||
26 | status = "okay"; | ||
27 | }; | ||
28 | |||
29 | &am33xx_pinmux { | ||
30 | nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { | ||
31 | pinctrl-single,pins = < | ||
32 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ | ||
33 | AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */ | ||
34 | AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */ | ||
35 | AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */ | ||
36 | AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */ | ||
37 | AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */ | ||
38 | AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */ | ||
39 | AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */ | ||
40 | AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */ | ||
41 | AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */ | ||
42 | AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */ | ||
43 | AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */ | ||
44 | AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */ | ||
45 | AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */ | ||
46 | AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */ | ||
47 | AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */ | ||
48 | AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */ | ||
49 | AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */ | ||
50 | AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */ | ||
51 | AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */ | ||
52 | AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */ | ||
53 | >; | ||
54 | }; | ||
55 | |||
56 | nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { | ||
57 | pinctrl-single,pins = < | ||
58 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ | ||
59 | >; | ||
60 | }; | ||
61 | |||
62 | mcasp0_pins: mcasp0_pins { | ||
63 | pinctrl-single,pins = < | ||
64 | AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ | ||
65 | AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ | ||
66 | AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ | ||
67 | AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ | ||
68 | AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */ | ||
69 | >; | ||
70 | }; | ||
71 | }; | ||
72 | |||
73 | &lcdc { | ||
74 | status = "okay"; | ||
75 | |||
76 | /* If you want to get 24 bit RGB and 16 BGR mode instead of | ||
77 | * current 16 bit RGB and 24 BGR modes, set the propety | ||
78 | * below to "crossed" and uncomment the video-ports -property | ||
79 | * in tda19988 node. | ||
80 | */ | ||
81 | blue-and-red-wiring = "straight"; | ||
82 | |||
83 | port { | ||
84 | lcdc_0: endpoint@0 { | ||
85 | remote-endpoint = <&hdmi_0>; | ||
86 | }; | ||
87 | }; | ||
88 | }; | ||
89 | |||
90 | &i2c0 { | ||
91 | tda19988: tda19988 { | ||
92 | compatible = "nxp,tda998x"; | ||
93 | reg = <0x70>; | ||
94 | |||
95 | pinctrl-names = "default", "off"; | ||
96 | pinctrl-0 = <&nxp_hdmi_bonelt_pins>; | ||
97 | pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; | ||
98 | |||
99 | /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */ | ||
100 | /* video-ports = <0x234501>; */ | ||
101 | |||
102 | #sound-dai-cells = <0>; | ||
103 | audio-ports = < TDA998x_I2S 0x03>; | ||
104 | |||
105 | ports { | ||
106 | port@0 { | ||
107 | hdmi_0: endpoint@0 { | ||
108 | remote-endpoint = <&lcdc_0>; | ||
109 | }; | ||
110 | }; | ||
111 | }; | ||
112 | }; | ||
113 | }; | ||
114 | |||
115 | &rtc { | ||
116 | system-power-controller; | ||
117 | }; | ||
118 | |||
119 | &mcasp0 { | ||
120 | #sound-dai-cells = <0>; | ||
121 | pinctrl-names = "default"; | ||
122 | pinctrl-0 = <&mcasp0_pins>; | ||
123 | status = "okay"; | ||
124 | op-mode = <0>; /* MCASP_IIS_MODE */ | ||
125 | tdm-slots = <2>; | ||
126 | serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ | ||
127 | 0 0 1 0 | ||
128 | >; | ||
129 | tx-num-evt = <32>; | ||
130 | rx-num-evt = <32>; | ||
131 | }; | ||
132 | |||
133 | / { | ||
134 | clk_mcasp0_fixed: clk_mcasp0_fixed { | ||
135 | #clock-cells = <0>; | ||
136 | compatible = "fixed-clock"; | ||
137 | clock-frequency = <24576000>; | ||
138 | }; | ||
139 | |||
140 | clk_mcasp0: clk_mcasp0 { | ||
141 | #clock-cells = <0>; | ||
142 | compatible = "gpio-gate-clock"; | ||
143 | clocks = <&clk_mcasp0_fixed>; | ||
144 | enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */ | ||
145 | }; | ||
146 | |||
147 | sound { | ||
148 | compatible = "simple-audio-card"; | ||
149 | simple-audio-card,name = "TI BeagleBone Black"; | ||
150 | simple-audio-card,format = "i2s"; | ||
151 | simple-audio-card,bitclock-master = <&dailink0_master>; | ||
152 | simple-audio-card,frame-master = <&dailink0_master>; | ||
153 | |||
154 | dailink0_master: simple-audio-card,cpu { | ||
155 | sound-dai = <&mcasp0>; | ||
156 | clocks = <&clk_mcasp0>; | ||
157 | }; | ||
158 | |||
159 | simple-audio-card,codec { | ||
160 | sound-dai = <&tda19988>; | ||
161 | }; | ||
162 | }; | ||
163 | }; | ||
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index db00d8ef7b19..77273df1a028 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts | |||
@@ -9,162 +9,9 @@ | |||
9 | 9 | ||
10 | #include "am33xx.dtsi" | 10 | #include "am33xx.dtsi" |
11 | #include "am335x-bone-common.dtsi" | 11 | #include "am335x-bone-common.dtsi" |
12 | #include <dt-bindings/display/tda998x.h> | 12 | #include "am335x-boneblack-common.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "TI AM335x BeagleBone Black"; | 15 | model = "TI AM335x BeagleBone Black"; |
16 | compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; | 16 | compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; |
17 | }; | 17 | }; |
18 | |||
19 | &ldo3_reg { | ||
20 | regulator-min-microvolt = <1800000>; | ||
21 | regulator-max-microvolt = <1800000>; | ||
22 | regulator-always-on; | ||
23 | }; | ||
24 | |||
25 | &mmc1 { | ||
26 | vmmc-supply = <&vmmcsd_fixed>; | ||
27 | }; | ||
28 | |||
29 | &mmc2 { | ||
30 | vmmc-supply = <&vmmcsd_fixed>; | ||
31 | pinctrl-names = "default"; | ||
32 | pinctrl-0 = <&emmc_pins>; | ||
33 | bus-width = <8>; | ||
34 | status = "okay"; | ||
35 | }; | ||
36 | |||
37 | &am33xx_pinmux { | ||
38 | nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { | ||
39 | pinctrl-single,pins = < | ||
40 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ | ||
41 | AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */ | ||
42 | AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */ | ||
43 | AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */ | ||
44 | AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */ | ||
45 | AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */ | ||
46 | AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */ | ||
47 | AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */ | ||
48 | AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */ | ||
49 | AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */ | ||
50 | AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */ | ||
51 | AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */ | ||
52 | AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */ | ||
53 | AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */ | ||
54 | AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */ | ||
55 | AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */ | ||
56 | AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */ | ||
57 | AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */ | ||
58 | AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */ | ||
59 | AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */ | ||
60 | AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */ | ||
61 | >; | ||
62 | }; | ||
63 | nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { | ||
64 | pinctrl-single,pins = < | ||
65 | AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ | ||
66 | >; | ||
67 | }; | ||
68 | |||
69 | mcasp0_pins: mcasp0_pins { | ||
70 | pinctrl-single,pins = < | ||
71 | AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ | ||
72 | AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ | ||
73 | AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ | ||
74 | AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ | ||
75 | AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */ | ||
76 | >; | ||
77 | }; | ||
78 | }; | ||
79 | |||
80 | &lcdc { | ||
81 | status = "okay"; | ||
82 | |||
83 | /* If you want to get 24 bit RGB and 16 BGR mode instead of | ||
84 | * current 16 bit RGB and 24 BGR modes, set the propety | ||
85 | * below to "crossed" and uncomment the video-ports -property | ||
86 | * in tda19988 node. | ||
87 | */ | ||
88 | blue-and-red-wiring = "straight"; | ||
89 | |||
90 | port { | ||
91 | lcdc_0: endpoint@0 { | ||
92 | remote-endpoint = <&hdmi_0>; | ||
93 | }; | ||
94 | }; | ||
95 | }; | ||
96 | |||
97 | &i2c0 { | ||
98 | tda19988: tda19988 { | ||
99 | compatible = "nxp,tda998x"; | ||
100 | reg = <0x70>; | ||
101 | |||
102 | pinctrl-names = "default", "off"; | ||
103 | pinctrl-0 = <&nxp_hdmi_bonelt_pins>; | ||
104 | pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; | ||
105 | |||
106 | /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */ | ||
107 | /* video-ports = <0x234501>; */ | ||
108 | |||
109 | #sound-dai-cells = <0>; | ||
110 | audio-ports = < TDA998x_I2S 0x03>; | ||
111 | |||
112 | ports { | ||
113 | port@0 { | ||
114 | hdmi_0: endpoint@0 { | ||
115 | remote-endpoint = <&lcdc_0>; | ||
116 | }; | ||
117 | }; | ||
118 | }; | ||
119 | }; | ||
120 | }; | ||
121 | |||
122 | &rtc { | ||
123 | system-power-controller; | ||
124 | }; | ||
125 | |||
126 | &mcasp0 { | ||
127 | #sound-dai-cells = <0>; | ||
128 | pinctrl-names = "default"; | ||
129 | pinctrl-0 = <&mcasp0_pins>; | ||
130 | status = "okay"; | ||
131 | op-mode = <0>; /* MCASP_IIS_MODE */ | ||
132 | tdm-slots = <2>; | ||
133 | serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ | ||
134 | 0 0 1 0 | ||
135 | >; | ||
136 | tx-num-evt = <32>; | ||
137 | rx-num-evt = <32>; | ||
138 | }; | ||
139 | |||
140 | / { | ||
141 | clk_mcasp0_fixed: clk_mcasp0_fixed { | ||
142 | #clock-cells = <0>; | ||
143 | compatible = "fixed-clock"; | ||
144 | clock-frequency = <24576000>; | ||
145 | }; | ||
146 | |||
147 | clk_mcasp0: clk_mcasp0 { | ||
148 | #clock-cells = <0>; | ||
149 | compatible = "gpio-gate-clock"; | ||
150 | clocks = <&clk_mcasp0_fixed>; | ||
151 | enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */ | ||
152 | }; | ||
153 | |||
154 | sound { | ||
155 | compatible = "simple-audio-card"; | ||
156 | simple-audio-card,name = "TI BeagleBone Black"; | ||
157 | simple-audio-card,format = "i2s"; | ||
158 | simple-audio-card,bitclock-master = <&dailink0_master>; | ||
159 | simple-audio-card,frame-master = <&dailink0_master>; | ||
160 | |||
161 | dailink0_master: simple-audio-card,cpu { | ||
162 | sound-dai = <&mcasp0>; | ||
163 | clocks = <&clk_mcasp0>; | ||
164 | }; | ||
165 | |||
166 | simple-audio-card,codec { | ||
167 | sound-dai = <&tda19988>; | ||
168 | }; | ||
169 | }; | ||
170 | }; | ||