Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
From 72551ba8e0d34167db1e49de86fbefb27aef0859 Mon Sep 17 00:00:00 2001
From ec5e90f1e8a16ee2e4be96f6fe05fec8413972ab Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@bootlin.com>
Date: Thu, 26 Jul 2018 11:39:17 +0200
Subject: [PATCH] Add i2c1 and nunchuk nodes in dts
Subject: [PATCH 2/2] Add i2c1 and nunchuk nodes in dts

Upstream-Status: Inappropriate
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 7 +++++++
arch/arm/boot/dts/am335x-boneblack-common.dtsi | 13 +++++++++++++
arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 7 +++++++
.../boot/dts/ti/omap/am335x-boneblack-common.dtsi | 13 +++++++++++++
2 files changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index ab323df700bb..c6d9eff27319 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
index 8122e34ab82a..98a284c4e802 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
@@ -81,6 +81,13 @@ AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0) /* i2c0_scl.i2c
>;
};
Expand All @@ -27,10 +28,10 @@ index ab323df700bb..c6d9eff27319 100644
i2c2_pins: i2c2-pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3) /* uart1_ctsn.i2c2_sda */
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
index a7a8c61ef9b2..1d72294f61d5 100644
--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-boneblack-common.dtsi
index a7a8c61ef9b2..63dc1e958bd3 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack-common.dtsi
@@ -28,3 +28,16 @@ memory@80000000 {
reg = <0x80000000 0x20000000>; /* 512 MB */
};
Expand All @@ -44,10 +45,10 @@ index a7a8c61ef9b2..1d72294f61d5 100644
+ pinctrl-names = "default";
+
+ nunchuk: nunchuk@52 {
+ compatible = "nintendo,wiimote-extension";
+ compatible = "nintendo,nunchuk";
+ reg = <0x52>;
+ };
+};
--
2.46.1
2.47.3

Loading
Loading